ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Taseditor: no more row_last_clicked 

* Taseditor: drawing patterns with Alt held
This commit is contained in:
ansstuff 2012-06-16 15:40:46 +00:00
parent c34df4b81b
commit f3debc89dc
4 changed files with 100 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/win/taseditor/editor.cpp
View File

@ -198,18 +198,26 @@ void EDITOR::InputSetPattern(int start, int end, int joy, int button, int consec
return; return;
int pattern_offset = 0, current_pattern = taseditor_config.current_pattern; int pattern_offset = 0, current_pattern = taseditor_config.current_pattern;
bool changes_made = false;
bool value;
for (int i = start; i <= end; ++i) for (int i = start; i <= end; ++i)
{ {
// skip lag frames // skip lag frames
if (taseditor_config.pattern_skips_lag && greenzone.GetLagHistoryAtFrame(i)) if (taseditor_config.pattern_skips_lag && greenzone.GetLagHistoryAtFrame(i))
continue; continue;
currMovieData.records[i].setBitValue(joy, button, autofire_patterns[current_pattern][pattern_offset] != 0); value = (autofire_patterns[current_pattern][pattern_offset] != 0);
if (currMovieData.records[i].checkBit(joy, button) != value)
{
changes_made = true;
currMovieData.records[i].setBitValue(joy, button, value);
}
pattern_offset++; pattern_offset++;
if (pattern_offset >= (int)autofire_patterns[current_pattern].size()) if (pattern_offset >= (int)autofire_patterns[current_pattern].size())
pattern_offset -= autofire_patterns[current_pattern].size(); pattern_offset -= autofire_patterns[current_pattern].size();
} }
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_PATTERN, start, end, autofire_patterns_names[current_pattern].c_str(), consecutive_tag)); if (changes_made)
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_PATTERN, start, end, autofire_patterns_names[current_pattern].c_str(), consecutive_tag));
} }
// following functions use current Selection to determine range of frames // following functions use current Selection to determine range of frames

2
src/drivers/win/taseditor/history.cpp
View File

@ -534,6 +534,8 @@ int HISTORY::RegisterChanges(int mod_type, int start, int end, const char* comme
// add "consecutive_tag" to description // add "consecutive_tag" to description
char framenum[11]; char framenum[11];
strcat(snap.description, " ["); strcat(snap.description, " [");
if (snap.consecutive_tag > 0)
strcat(snap.description, "+");
_itoa(snap.consecutive_tag, framenum, 10); _itoa(snap.consecutive_tag, framenum, 10);
strcat(snap.description, framenum); strcat(snap.description, framenum);
strcat(snap.description, "] "); strcat(snap.description, "] ");

162
src/drivers/win/taseditor/piano_roll.cpp
View File

@ -417,7 +417,6 @@ void PIANO_ROLL::free()
void PIANO_ROLL::reset() void PIANO_ROLL::reset()
{ {
must_redraw_list = must_check_item_under_mouse = true; must_redraw_list = must_check_item_under_mouse = true;
row_last_clicked = 0;
shift_held = ctrl_held = alt_held = false; shift_held = ctrl_held = alt_held = false;
shift_timer = ctrl_timer = shift_count = ctrl_count = 0; shift_timer = ctrl_timer = shift_count = ctrl_count = 0;
next_header_update_time = header_item_under_mouse = 0; next_header_update_time = header_item_under_mouse = 0;
@ -522,23 +521,6 @@ void PIANO_ROLL::update()
} }
ctrl_timer = clock(); ctrl_timer = clock();
} }
// show/hide "focused" rectangle on row_last_clicked
if (shift_held || alt_held)
{
if ((shift_held && !last_shift_held) || (alt_held && !last_alt_held))
row_last_clicked_blinking_phase_shift = ROW_LAST_CLICKED_BLINKING_PERIOD + (clock() % (2 * ROW_LAST_CLICKED_BLINKING_PERIOD));
bool show_row_last_clicked = (((clock() - row_last_clicked_blinking_phase_shift) / ROW_LAST_CLICKED_BLINKING_PERIOD) & 1) != 0;
if (show_row_last_clicked)
{
ListView_SetItemState(hwndList, row_last_clicked, LVIS_FOCUSED, LVIS_FOCUSED);
} else
{
ListView_SetItemState(hwndList, row_last_clicked, 0, LVIS_FOCUSED);
}
} else if (last_shift_held || last_alt_held)
{
ListView_SetItemState(hwndList, row_last_clicked, 0, LVIS_FOCUSED);
}
// update dragging // update dragging
if (drag_mode != DRAG_MODE_NONE) if (drag_mode != DRAG_MODE_NONE)
@ -614,50 +596,77 @@ void PIANO_ROLL::update()
drawing_current_x = drawing_last_x; drawing_current_x = drawing_last_x;
p.x = drawing_current_x - GetScrollPos(hwndList, SB_HORZ); p.x = drawing_current_x - GetScrollPos(hwndList, SB_HORZ);
} }
double total_len = sqrt((double)(total_dx * total_dx + total_dy * total_dy));
LVHITTESTINFO info; LVHITTESTINFO info;
int row_index, column_index, joy, bit; int row_index, column_index, joy, bit;
int min_row_index = currMovieData.getNumRecords(), max_row_index = -1; int min_row_index = currMovieData.getNumRecords(), max_row_index = -1;
bool changes_made = false; bool changes_made = false;
int drawing_min_line_len = list_row_height; // = min(list_row_width, list_row_height) in pixels if (alt_held)
for (double len = 0; len < total_len; len += drawing_min_line_len)
{ {
// perform hit test // special mode: draw pattern
info.pt.x = p.x + (len / total_len) * total_dx; int selection_beginning = selection.GetCurrentSelectionBeginning();
info.pt.y = p.y + (len / total_len) * total_dy; if (selection_beginning >= 0)
ListView_SubItemHitTest(hwndList, &info);
row_index = info.iItem;
if (row_index < 0)
row_index = ListView_GetTopIndex(hwndList) + (info.pt.y - list_row_top) / list_row_height;
// pad movie size if user tries to draw below Piano Roll limit
if (row_index >= currMovieData.getNumRecords())
currMovieData.insertEmpty(-1, row_index + 1 - currMovieData.getNumRecords());
column_index = info.iSubItem;
if (row_index >= 0 && column_index >= COLUMN_JOYPAD1_A && column_index <= COLUMN_JOYPAD4_R)
{ {
joy = (column_index - COLUMN_JOYPAD1_A) / NUM_JOYPAD_BUTTONS; // perform hit test
bit = (column_index - COLUMN_JOYPAD1_A) % NUM_JOYPAD_BUTTONS; info.pt.x = p.x;
if (drag_mode == DRAG_MODE_SET && !currMovieData.records[row_index].checkBit(joy, bit)) info.pt.y = p.y;
ListView_SubItemHitTest(hwndList, &info);
row_index = info.iItem;
if (row_index < 0)
row_index = ListView_GetTopIndex(hwndList) + (info.pt.y - list_row_top) / list_row_height;
// pad movie size if user tries to draw pattern below Piano Roll limit
if (row_index >= currMovieData.getNumRecords())
currMovieData.insertEmpty(-1, row_index + 1 - currMovieData.getNumRecords());
column_index = info.iSubItem;
if (row_index >= 0 && column_index >= COLUMN_JOYPAD1_A && column_index <= COLUMN_JOYPAD4_R)
{ {
currMovieData.records[row_index].setBit(joy, bit); joy = (column_index - COLUMN_JOYPAD1_A) / NUM_JOYPAD_BUTTONS;
changes_made = true; bit = (column_index - COLUMN_JOYPAD1_A) % NUM_JOYPAD_BUTTONS;
if (min_row_index > row_index) min_row_index = row_index; editor.InputSetPattern(selection_beginning, row_index, joy, bit, drawing_start_time);
if (max_row_index < row_index) max_row_index = row_index;
} else if (drag_mode == DRAG_MODE_UNSET && currMovieData.records[row_index].checkBit(joy, bit))
{
currMovieData.records[row_index].clearBit(joy, bit);
changes_made = true;
if (min_row_index > row_index) min_row_index = row_index;
if (max_row_index < row_index) max_row_index = row_index;
} }
} }
} } else
if (changes_made)
{ {
if (drag_mode == DRAG_MODE_SET) double total_len = sqrt((double)(total_dx * total_dx + total_dy * total_dy));
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_SET, min_row_index, max_row_index, NULL, drawing_start_time)); int drawing_min_line_len = list_row_height; // = min(list_row_width, list_row_height) in pixels
else for (double len = 0; len < total_len; len += drawing_min_line_len)
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_UNSET, min_row_index, max_row_index, NULL, drawing_start_time)); {
// perform hit test
info.pt.x = p.x + (len / total_len) * total_dx;
info.pt.y = p.y + (len / total_len) * total_dy;
ListView_SubItemHitTest(hwndList, &info);
row_index = info.iItem;
if (row_index < 0)
row_index = ListView_GetTopIndex(hwndList) + (info.pt.y - list_row_top) / list_row_height;
// pad movie size if user tries to draw below Piano Roll limit
if (row_index >= currMovieData.getNumRecords())
currMovieData.insertEmpty(-1, row_index + 1 - currMovieData.getNumRecords());
column_index = info.iSubItem;
if (row_index >= 0 && column_index >= COLUMN_JOYPAD1_A && column_index <= COLUMN_JOYPAD4_R)
{
joy = (column_index - COLUMN_JOYPAD1_A) / NUM_JOYPAD_BUTTONS;
bit = (column_index - COLUMN_JOYPAD1_A) % NUM_JOYPAD_BUTTONS;
if (drag_mode == DRAG_MODE_SET && !currMovieData.records[row_index].checkBit(joy, bit))
{
currMovieData.records[row_index].setBit(joy, bit);
changes_made = true;
if (min_row_index > row_index) min_row_index = row_index;
if (max_row_index < row_index) max_row_index = row_index;
} else if (drag_mode == DRAG_MODE_UNSET && currMovieData.records[row_index].checkBit(joy, bit))
{
currMovieData.records[row_index].clearBit(joy, bit);
changes_made = true;
if (min_row_index > row_index) min_row_index = row_index;
if (max_row_index < row_index) max_row_index = row_index;
}
}
}
if (changes_made)
{
if (drag_mode == DRAG_MODE_SET)
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_SET, min_row_index, max_row_index, NULL, drawing_start_time));
else
greenzone.InvalidateAndCheck(history.RegisterChanges(MODTYPE_UNSET, min_row_index, max_row_index, NULL, drawing_start_time));
}
} }
drawing_last_x = drawing_current_x; drawing_last_x = drawing_current_x;
drawing_last_y = drawing_current_y; drawing_last_y = drawing_current_y;
@ -1736,30 +1745,37 @@ LRESULT APIENTRY ListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
if (fwKeys & MK_SHIFT) if (fwKeys & MK_SHIFT)
{ {
// select region from row_last_clicked to row_index // select region from selection_beginning to row_index
if (piano_roll.row_last_clicked < row_index) int selection_beginning = selection.GetCurrentSelectionBeginning();
selection.SetRegionSelection(piano_roll.row_last_clicked, row_index + 1); if (selection_beginning >= 0)
else {
selection.SetRegionSelection(row_index, piano_roll.row_last_clicked + 1); if (selection_beginning < row_index)
selection.SetRegionSelection(selection_beginning, row_index + 1);
else
selection.SetRegionSelection(row_index, selection_beginning + 1);
}
} else if (alt_pressed) } else if (alt_pressed)
{ {
// make selection by Pattern // make selection by Pattern
if (piano_roll.row_last_clicked < row_index) int selection_beginning = selection.GetCurrentSelectionBeginning();
selection.SetRegionSelectionPattern(piano_roll.row_last_clicked, row_index); if (selection_beginning >= 0)
else {
selection.SetRegionSelectionPattern(row_index, piano_roll.row_last_clicked); selection.ClearSelection();
if (selection_beginning < row_index)
selection.SetRegionSelectionPattern(selection_beginning, row_index);
else
selection.SetRegionSelectionPattern(row_index, selection_beginning);
}
} else if (fwKeys & MK_CONTROL) } else if (fwKeys & MK_CONTROL)
{ {
if (selection.GetRowSelection(row_index)) if (selection.GetRowSelection(row_index))
selection.ClearRowSelection(row_index); selection.ClearRowSelection(row_index);
else else
selection.SetRowSelection(row_index); selection.SetRowSelection(row_index);
piano_roll.row_last_clicked = row_index;
} else // just click } else // just click
{ {
selection.ClearSelection(); selection.ClearSelection();
selection.SetRowSelection(row_index); selection.SetRowSelection(row_index);
piano_roll.row_last_clicked = row_index;
} }
piano_roll.StartSelectingDrag(row_index); piano_roll.StartSelectingDrag(row_index);
} }
@ -1771,23 +1787,21 @@ LRESULT APIENTRY ListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
if (!alt_pressed && !(fwKeys & MK_SHIFT)) if (!alt_pressed && !(fwKeys & MK_SHIFT))
{ {
// clicked without Shift/Alt - set "row_last_clicked" here // clicked without Shift/Alt - bring Selection cursor to this row
piano_roll.row_last_clicked = row_index; selection.ClearSelection();
if (!(fwKeys & MK_CONTROL)) selection.SetRowSelection(row_index);
{
// change Selection to this row
selection.ClearSelection();
selection.SetRowSelection(row_index);
}
} }
// toggle input // toggle input
piano_roll.drawing_start_time = clock(); piano_roll.drawing_start_time = clock();
int joy = (column_index - COLUMN_JOYPAD1_A) / NUM_JOYPAD_BUTTONS; int joy = (column_index - COLUMN_JOYPAD1_A) / NUM_JOYPAD_BUTTONS;
int button = (column_index - COLUMN_JOYPAD1_A) % NUM_JOYPAD_BUTTONS; int button = (column_index - COLUMN_JOYPAD1_A) % NUM_JOYPAD_BUTTONS;
if (alt_pressed) int selection_beginning = selection.GetCurrentSelectionBeginning();
editor.InputSetPattern(piano_roll.row_last_clicked, row_index, joy, button, piano_roll.drawing_start_time); if (alt_pressed && selection_beginning >= 0)
editor.InputSetPattern(selection_beginning, row_index, joy, button, piano_roll.drawing_start_time);
else if ((fwKeys & MK_SHIFT) && selection_beginning >= 0)
editor.InputToggle(selection_beginning, row_index, joy, button, piano_roll.drawing_start_time);
else else
editor.InputToggle(piano_roll.row_last_clicked, row_index, joy, button, piano_roll.drawing_start_time); editor.InputToggle(row_index, row_index, joy, button, piano_roll.drawing_start_time);
// and start dragging/drawing // and start dragging/drawing
if (piano_roll.drag_mode == DRAG_MODE_NONE) if (piano_roll.drag_mode == DRAG_MODE_NONE)
{ {

3
src/drivers/win/taseditor/piano_roll.h
View File

@ -210,9 +210,6 @@ public:
int drag_selection_starting_frame; int drag_selection_starting_frame;
int drag_selection_ending_frame; int drag_selection_ending_frame;
int row_last_clicked;
int row_last_clicked_blinking_phase_shift;
bool shift_held, ctrl_held, alt_held; bool shift_held, ctrl_held, alt_held;
int shift_timer, ctrl_timer; int shift_timer, ctrl_timer;
int shift_count, ctrl_count; int shift_count, ctrl_count;