Browse Source

fix "standard" word

MonkeyFirst 10 years ago
parent
commit
64e7435eca
2 changed files with 22 additions and 22 deletions
  1. 15 15
      bin/Data/Scripts/Editor/EditorUI.as
  2. 7 7
      bin/Data/Scripts/Editor/EditorView.as

+ 15 - 15
bin/Data/Scripts/Editor/EditorUI.as

@@ -324,17 +324,17 @@ void CreateMenuBar()
         CreateChildDivider(popup);
         CreateChildDivider(popup);
         popup.AddChild(CreateMenuItem("Cut", @Cut, 'X', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Cut", @Cut, 'X', QUAL_CTRL));
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
             popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_CTRL));
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
           popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_SHIFT ));
           popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_SHIFT ));
         
         
         popup.AddChild(CreateMenuItem("Copy", @Copy, 'C', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Copy", @Copy, 'C', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Paste", @Paste, 'V', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Paste", @Paste, 'V', QUAL_CTRL));
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
             popup.AddChild(CreateMenuItem("Delete", @Delete, KEY_DELETE, QUAL_ANY));
             popup.AddChild(CreateMenuItem("Delete", @Delete, KEY_DELETE, QUAL_ANY));
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
             popup.AddChild(CreateMenuItem("Delete", @Delete, 'X', QUAL_ANY));
             popup.AddChild(CreateMenuItem("Delete", @Delete, 'X', QUAL_ANY));
         
         
         popup.AddChild(CreateMenuItem("Select all", @SelectAll, 'A', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Select all", @SelectAll, 'A', QUAL_CTRL));
@@ -344,43 +344,43 @@ void CreateMenuBar()
         popup.AddChild(CreateMenuItem("Reset to default", @ResetToDefault));
         popup.AddChild(CreateMenuItem("Reset to default", @ResetToDefault));
         CreateChildDivider(popup);
         CreateChildDivider(popup);
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )    
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )    
         {
         {
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition));
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition));
             popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation));
             popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale));
         }
         }
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
         { 
         { 
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition, 'G' , QUAL_ALT));
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition, 'G' , QUAL_ALT));
             popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation, 'R', QUAL_ALT ));
             popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation, 'R', QUAL_ALT ));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale, 'S', QUAL_ALT));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale, 'S', QUAL_ALT));
         }
         }
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART ) 
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD ) 
         {
         {
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'E', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'E', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'E', QUAL_ALT));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'E', QUAL_ALT));
         }
         }
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER ) 
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER ) 
         {
         {
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'H'));
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'H'));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'H', QUAL_ALT));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'H', QUAL_ALT));
         }
         }
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'U', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'U', QUAL_CTRL));
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'P', QUAL_ALT));
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'P', QUAL_ALT));
 
 
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'U'));
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'U'));
-        else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'P', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'P', QUAL_CTRL));
 
 
         CreateChildDivider(popup);
         CreateChildDivider(popup);
         
         
-        if ( hotKeyMode == HOT_KEYS_MODE_STANDART )
+        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
             popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
         //else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
         //else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
         //    popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
         //    popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
@@ -1459,11 +1459,11 @@ void HandleHotKeysStandart ( VariantMap& eventData)
 
 
 void HandleKeyDown(StringHash eventType, VariantMap& eventData)
 void HandleKeyDown(StringHash eventType, VariantMap& eventData)
 {
 {
-    if ( hotKeyMode == HOT_KEYS_MODE_STANDART)
+    if ( hotKeyMode == HOTKEYS_MODE_STANDARD)
     {
     {
         HandleHotKeysStandart( eventData );
         HandleHotKeysStandart( eventData );
     }
     }
-    else if( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+    else if( hotKeyMode == HOTKEYS_MODE_BLENDER )
     {
     {
         HandleHotKeysBlender ( eventData );
         HandleHotKeysBlender ( eventData );
     }
     }

+ 7 - 7
bin/Data/Scripts/Editor/EditorView.as

@@ -53,8 +53,8 @@ const uint VIEWPORT_QUAD         = 0x0000f000;
 
 
 enum HotKeysMode
 enum HotKeysMode
 {
 {
-    HOT_KEYS_MODE_STANDART = 0,
-    HOT_KEYS_MODE_BLENDER
+    HOTKEYS_MODE_STANDARD = 0,
+    HOTKEYS_MODE_BLENDER
 }
 }
 
 
 enum EditMode
 enum EditMode
@@ -1133,7 +1133,7 @@ void SetupStatsBarText(Text@ text, Font@ font, int x, int y, HorizontalAlignment
 void UpdateStats(float timeStep)
 void UpdateStats(float timeStep)
 {
 {
     String adding = "";
     String adding = "";
-    if (hotKeyMode == HOT_KEYS_MODE_BLENDER)
+    if (hotKeyMode == HOTKEYS_MODE_BLENDER)
        adding = "  CameraFlyMode: " + (cameraFlyMode ? "True" : "False");
        adding = "  CameraFlyMode: " + (cameraFlyMode ? "True" : "False");
     
     
     editorModeText.text = String(
     editorModeText.text = String(
@@ -1207,7 +1207,7 @@ void UpdateView(float timeStep)
     }
     }
     
     
     // Check for camara fly mode
     // Check for camara fly mode
-    if (hotKeyMode == HOT_KEYS_MODE_BLENDER )
+    if (hotKeyMode == HOTKEYS_MODE_BLENDER )
         if (input.keyDown[KEY_LSHIFT] && input.keyPress[KEY_F])
         if (input.keyDown[KEY_LSHIFT] && input.keyPress[KEY_F])
         {
         {
             cameraFlyMode = !cameraFlyMode;
             cameraFlyMode = !cameraFlyMode;
@@ -1220,7 +1220,7 @@ void UpdateView(float timeStep)
         if (input.keyDown[KEY_LSHIFT])
         if (input.keyDown[KEY_LSHIFT])
             speedMultiplier = cameraShiftSpeedMultiplier;
             speedMultiplier = cameraShiftSpeedMultiplier;
         
         
-        if (cameraFlyMode || hotKeyMode == HOT_KEYS_MODE_STANDART) 
+        if (cameraFlyMode || hotKeyMode == HOTKEYS_MODE_STANDARD) 
         {
         {
         if (input.keyDown['W'] || input.keyDown[KEY_UP])
         if (input.keyDown['W'] || input.keyDown[KEY_UP])
         {
         {
@@ -1255,7 +1255,7 @@ void UpdateView(float timeStep)
         }
         }
         if (input.mouseMoveWheel != 0 && ui.GetElementAt(ui.cursor.position) is null)
         if (input.mouseMoveWheel != 0 && ui.GetElementAt(ui.cursor.position) is null)
         {
         {
-            if ( hotKeyMode == HOT_KEYS_MODE_STANDART) 
+            if ( hotKeyMode == HOTKEYS_MODE_STANDARD) 
             {
             {
                 if (mouseWheelCameraPosition)
                 if (mouseWheelCameraPosition)
                 {
                 {
@@ -1268,7 +1268,7 @@ void UpdateView(float timeStep)
                     camera.zoom = Clamp(zoom, .1, 30);
                     camera.zoom = Clamp(zoom, .1, 30);
                 }
                 }
             }
             }
-            else if (hotKeyMode == HOT_KEYS_MODE_BLENDER) 
+            else if (hotKeyMode == HOTKEYS_MODE_BLENDER) 
             {
             {
                 if (mouseWheelCameraPosition && !camera.orthographic )
                 if (mouseWheelCameraPosition && !camera.orthographic )
                 {
                 {