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

Current status

Browse Source
This commit is contained in:
Daniel Collin 2012-10-23 10:36:02 +02:00
parent 706db2684c
commit adc3b2b059
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ogl_editor/src/Editor.c
View File

@ -216,14 +216,17 @@ void Editor_update()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Editor_keyDown(int key) bool Editor_keyDown(int key)
{ {
bool handled_key = true;
//printf("callBack %d\n", key); //printf("callBack %d\n", key);
switch (key) switch (key)
{ {
case EMGUI_ARROW_DOWN : start_pos++; break; case EMGUI_ARROW_DOWN : start_pos++; break;
case EMGUI_ARROW_UP : start_pos--; break; case EMGUI_ARROW_UP : start_pos--; break;
default : handled_key = false; break;
} }
if (start_pos < -19) if (start_pos < -19)
@ -238,7 +241,11 @@ void Editor_keyDown(int key)
if (offset > s_testChannel.maxRange) if (offset > s_testChannel.maxRange)
s_testChannel.maxRange = offset; s_testChannel.maxRange = offset;
return true;
} }
return handled_key;
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/src/Editor.h
View File

@ -4,5 +4,5 @@ void Editor_create();
void Editor_destroy(); void Editor_destroy();
void Editor_init(); void Editor_init();
void Editor_update(); void Editor_update();
void Editor_keyDown(int keyCode); bool Editor_keyDown(int keyCode);

6
ogl_editor/src/macosx/RocketView.m
View File

@ -70,10 +70,10 @@
} }
} }
Editor_keyDown(keyCode); if (!Editor_keyDown(keyCode))
Editor_update(); [super keyDown:theEvent];
//[super keyDown:theEvent]; Editor_update();
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

9
test.rocket Executable file
View File

@ -0,0 +1,9 @@
<tracks rows="128">
<track name="intro_image">
<key row="32" value="3.000000" interpolation="0"/>
<key row="96" value="5.000000" interpolation="0"/>
<key row="104" value="5.000000" interpolation="0"/>
<key row="112" value="12346.000000" interpolation="0"/>
<key row="115" value="12.000000" interpolation="0"/>
</track>
</tracks>