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

New scaling values

Browse Source 
As talked about in #100
This commit is contained in:
Daniel Collin 2014-09-14 21:32:06 +02:00
parent 179d76399f
commit a0bea881c1
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ogl_editor/src/Editor.c
View File

@ -1531,13 +1531,20 @@ void Editor_menuEvent(int menuItem)
case EDITOR_MENU_BIAS_N_10: biasSelection(-10.0f); break;
case EDITOR_MENU_BIAS_N_100 : biasSelection(-100.0f); break;
case EDITOR_MENU_BIAS_N_1000: biasSelection(-1000.0f); break;
case EDITOR_MENU_SCALE_001 : scaleSelection(0.01f); break;
case EDITOR_MENU_SCALE_01 : scaleSelection(0.1f); break;
case EDITOR_MENU_SCALE_1: scaleSelection(1.0f); break;
case EDITOR_MENU_SCALE_10: scaleSelection(10.0f); break;
case EDITOR_MENU_SCALE_100: scaleSelection(100.0f); break;
case EDITOR_MENU_SCALE_1000: scaleSelection(1000.0f); break;
case EDITOR_MENU_SCALE_101: scaleSelection(1.01f); break;
case EDITOR_MENU_SCALE_11: scaleSelection(1.1f); break;
case EDITOR_MENU_SCALE_12: scaleSelection(1.2f); break;
case EDITOR_MENU_SCALE_5: scaleSelection(5.0f); break;
case EDITOR_MENU_SCALE_100: scaleSelection(10.01f); break;
case EDITOR_MENU_SCALE_1000: scaleSelection(100.01f); break;
case EDITOR_MENU_SCALE_099: scaleSelection(0.99f); break;
case EDITOR_MENU_SCALE_09: scaleSelection(0.9f); break;
case EDITOR_MENU_SCALE_08: scaleSelection(0.8f); break;
case EDITOR_MENU_SCALE_05: scaleSelection(0.5f); break;
case EDITOR_MENU_SCALE_01: scaleSelection(0.1f); break;
case EDITOR_MENU_SCALE_001: scaleSelection(0.01f); break;
case EDITOR_MENU_INTERPOLATION : onInterpolation(); break;
case EDITOR_MENU_ENTER_CURRENT_V : onEnterCurrentValue(); break;

14
ogl_editor/src/Menu.c
View File

@ -42,12 +42,18 @@ MenuDescriptor g_editMenu[] =
{ _T("Bias -10.0"), EDITOR_MENU_BIAS_N_100, 'g', 0, 0 },
{ _T("Bias -100.0"), EDITOR_MENU_BIAS_N_1000, 'h', 0, 0 },
{ _T(""), EDITOR_MENU_SEPARATOR, 0, 0, 0 },
{ _T("Scale 0.01"), EDITOR_MENU_SCALE_001, 'q', EMGUI_KEY_COMMAND, EMGUI_KEY_SHIFT },
{ _T("Scale 0.1"), EDITOR_MENU_SCALE_01, 'w', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 1.0"), EDITOR_MENU_SCALE_1, 'e', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 10.0"), EDITOR_MENU_SCALE_10, 'r', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 1.01"), EDITOR_MENU_SCALE_101, 'q', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 1.1"), EDITOR_MENU_SCALE_11, 'w', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 1.2"), EDITOR_MENU_SCALE_12, 'e', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 5.0"), EDITOR_MENU_SCALE_5, 'r', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 10.0"), EDITOR_MENU_SCALE_100, 't', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 100.0"), EDITOR_MENU_SCALE_1000, 'y', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.99"), EDITOR_MENU_SCALE_099, 'a', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.9"), EDITOR_MENU_SCALE_09, 's', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.8"), EDITOR_MENU_SCALE_08, 'd', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.5"), EDITOR_MENU_SCALE_05, 'f', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.1"), EDITOR_MENU_SCALE_01, 'g', 0, EMGUI_KEY_SHIFT },
{ _T("Scale 0.01"), EDITOR_MENU_SCALE_001, 'h', 0, EMGUI_KEY_SHIFT },
{ _T(""), EDITOR_MENU_SEPARATOR, 0, 0, 0 },
{ _T("Interpolation"), EDITOR_MENU_INTERPOLATION, 'i', 0, 0 },
{ _T("Insert current value"), EDITOR_MENU_ENTER_CURRENT_V,EMGUI_KEY_ENTER,0, 0 },

20
ogl_editor/src/Menu.h
View File

@ -49,12 +49,20 @@ enum
EDITOR_MENU_BIAS_N_10,
EDITOR_MENU_BIAS_N_100,
EDITOR_MENU_BIAS_N_1000,
EDITOR_MENU_SCALE_001,
EDITOR_MENU_SCALE_01,
EDITOR_MENU_SCALE_1,
EDITOR_MENU_SCALE_10,
EDITOR_MENU_SCALE_100,
EDITOR_MENU_SCALE_1000,
EDITOR_MENU_SCALE_101,
EDITOR_MENU_SCALE_11,
EDITOR_MENU_SCALE_12,
EDITOR_MENU_SCALE_5,
EDITOR_MENU_SCALE_100,
EDITOR_MENU_SCALE_1000,
EDITOR_MENU_SCALE_099,
EDITOR_MENU_SCALE_09,
EDITOR_MENU_SCALE_08,
EDITOR_MENU_SCALE_05,
EDITOR_MENU_SCALE_01,
EDITOR_MENU_SCALE_001,
EDITOR_MENU_INTERPOLATION,
EDITOR_MENU_ENTER_CURRENT_V,

17
ogl_editor/src/windows/RocketWindow.c
View File

@ -530,12 +530,17 @@ LRESULT CALLBACK WndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam
case EDITOR_MENU_BIAS_N_10:
case EDITOR_MENU_BIAS_N_100:
case EDITOR_MENU_BIAS_N_1000:
case EDITOR_MENU_SCALE_001:
case EDITOR_MENU_SCALE_01:
case EDITOR_MENU_SCALE_1:
case EDITOR_MENU_SCALE_10:
case EDITOR_MENU_SCALE_100:
case EDITOR_MENU_SCALE_1000:
case EDITOR_MENU_SCALE_101:
case EDITOR_MENU_SCALE_11:
case EDITOR_MENU_SCALE_12:
case EDITOR_MENU_SCALE_5:
case EDITOR_MENU_SCALE_100:
case EDITOR_MENU_SCALE_1000:
case EDITOR_MENU_SCALE_099:
case EDITOR_MENU_SCALE_09:
case EDITOR_MENU_SCALE_08:
case EDITOR_MENU_SCALE_05:
case EDITOR_MENU_SCALE_01:
case EDITOR_MENU_INTERPOLATION:
case EDITOR_MENU_ENTER_CURRENT_V:
case EDITOR_MENU_TAB: