vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Can now use arrow keys during playback

Browse Source 
Also fixed that selection was reset when doing jump prev/next keyframe.

Closes #41
This commit is contained in:
Daniel Collin 2012-12-30 11:04:02 +01:00
parent 8c1aba73a4
commit 77799725e8
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ogl_editor/src/Editor.c
View File

@ -559,19 +559,6 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
const int selectTop = mini(viewInfo->selectStartRow, viewInfo->selectStopRow); const int selectTop = mini(viewInfo->selectStartRow, viewInfo->selectStopRow);
const int selectBottom = maxi(viewInfo->selectStartRow, viewInfo->selectStopRow); const int selectBottom = maxi(viewInfo->selectStartRow, viewInfo->selectStopRow);
if (key == ' ')
{
// TODO: Don't start playing if we are in edit mode (but space shouldn't be added in edit mode but we still
// shouldn't start playing if we do
RemoteConnection_sendPauseCommand(!paused);
Editor_update();
return true;
}
if (!paused)
return false;
// If some emgui control has focus let it do its thing until its done // If some emgui control has focus let it do its thing until its done
if (Emgui_hasKeyboardFocus()) if (Emgui_hasKeyboardFocus())
@ -617,7 +604,8 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
row = t->keys[idx + 1].row; row = t->keys[idx + 1].row;
viewInfo->rowPos = row; viewInfo->rowPos = row;
viewInfo->selectStartRow = viewInfo->selectStopRow = row; viewInfo->selectStopRow = row;
RemoteConnection_sendSetRowCommand(row);
} }
break; break;
@ -658,7 +646,9 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
if (idx < 0) if (idx < 0)
idx = -idx - 1; idx = -idx - 1;
viewInfo->rowPos = t->keys[emaxi(idx - 1, 0)].row; viewInfo->rowPos = row = t->keys[emaxi(idx - 1, 0)].row;
viewInfo->selectStartRow = row;
RemoteConnection_sendSetRowCommand(row);
} }
break; break;
@ -801,6 +791,19 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
default : handled_key = false; break; default : handled_key = false; break;
} }
if (key == ' ')
{
// TODO: Don't start playing if we are in edit mode (but space shouldn't be added in edit mode but we still
// shouldn't start playing if we do
RemoteConnection_sendPauseCommand(!paused);
Editor_update();
return true;
}
if (!paused)
return true;
// handle copy of tracks/values // handle copy of tracks/values
if (key == 'c' && (modifiers & EMGUI_KEY_COMMAND)) if (key == 'c' && (modifiers & EMGUI_KEY_COMMAND))