Просмотр исходного кода

tools: use <modifier>_<side> notation

Daniele Bartolini 7 лет назад
Родитель
Сommit
f160f09e6a
2 измененных файлов с 15 добавлено и 9 удалено
  1. 7 5
      samples/core/editors/level_editor/level_editor.lua
  2. 8 4
      tools/level_editor/level_editor.vala

+ 7 - 5
samples/core/editors/level_editor/level_editor.lua

@@ -1315,7 +1315,7 @@ function LevelEditor:init()
 	self._lines = World.create_debug_line(self._world, true)
 	self._lines = World.create_debug_line(self._world, true)
 	self._fpscamera = FPSCamera(self._world, World.spawn_unit(self._world, "core/units/camera"))
 	self._fpscamera = FPSCamera(self._world, World.spawn_unit(self._world, "core/units/camera"))
 	self._mouse = { x = 0, y = 0, dx = 0, dy = 0, button = { left = false, middle = false, right = false }, wheel = { delta = 0 }}
 	self._mouse = { x = 0, y = 0, dx = 0, dy = 0, button = { left = false, middle = false, right = false }, wheel = { delta = 0 }}
-	self._keyboard = { ctrl = false, shift = false }
+	self._keyboard = { ctrl = false, shift = false, alt = false }
 	self._grid = { size = 1 }
 	self._grid = { size = 1 }
 	self._rotation_snap = 15.0 * math.pi / 180.0
 	self._rotation_snap = 15.0 * math.pi / 180.0
 	self._objects = {}
 	self._objects = {}
@@ -1427,8 +1427,9 @@ function LevelEditor:key_down(key)
 	if (key == "a") then self._keyboard.akey = true end
 	if (key == "a") then self._keyboard.akey = true end
 	if (key == "s") then self._keyboard.skey = true end
 	if (key == "s") then self._keyboard.skey = true end
 	if (key == "d") then self._keyboard.dkey = true end
 	if (key == "d") then self._keyboard.dkey = true end
-	if (key == "left_ctrl") then self._keyboard.ctrl = true end
-	if (key == "left_shift") then self._keyboard.shift = true end
+	if (key == "ctrl_left") then self._keyboard.ctrl = true end
+	if (key == "shift_left") then self._keyboard.shift = true end
+	if (key == "alt_left") then self._keyboard.alt = true end
 end
 end
 
 
 function LevelEditor:key_up(key)
 function LevelEditor:key_up(key)
@@ -1436,8 +1437,9 @@ function LevelEditor:key_up(key)
 	if (key == "a") then self._keyboard.akey = false end
 	if (key == "a") then self._keyboard.akey = false end
 	if (key == "s") then self._keyboard.skey = false end
 	if (key == "s") then self._keyboard.skey = false end
 	if (key == "d") then self._keyboard.dkey = false end
 	if (key == "d") then self._keyboard.dkey = false end
-	if (key == "left_ctrl") then self._keyboard.ctrl = false end
-	if (key == "left_shift") then self._keyboard.shift = false end
+	if (key == "ctrl_left") then self._keyboard.ctrl = false end
+	if (key == "shift_left") then self._keyboard.shift = false end
+	if (key == "alt_left") then self._keyboard.alt = false end
 end
 end
 
 
 function LevelEditor:camera()
 function LevelEditor:camera()

+ 8 - 4
tools/level_editor/level_editor.vala

@@ -332,9 +332,11 @@ namespace Crown
 		private bool on_key_press(Gdk.EventKey ev)
 		private bool on_key_press(Gdk.EventKey ev)
 		{
 		{
 			if (ev.keyval == Gdk.Key.Control_L)
 			if (ev.keyval == Gdk.Key.Control_L)
-				_engine.send_script(LevelEditorApi.key_down("left_ctrl"));
+				_engine.send_script(LevelEditorApi.key_down("ctrl_left"));
 			else if (ev.keyval == Gdk.Key.Shift_L)
 			else if (ev.keyval == Gdk.Key.Shift_L)
-				_engine.send_script(LevelEditorApi.key_down("left_shift"));
+				_engine.send_script(LevelEditorApi.key_down("shift_left"));
+			else if (ev.keyval == Gdk.Key.Alt_L)
+				_engine.send_script(LevelEditorApi.key_down("alt_left"));
 
 
 			return false;
 			return false;
 		}
 		}
@@ -342,9 +344,11 @@ namespace Crown
 		private bool on_key_release(Gdk.EventKey ev)
 		private bool on_key_release(Gdk.EventKey ev)
 		{
 		{
 			if (ev.keyval == Gdk.Key.Control_L)
 			if (ev.keyval == Gdk.Key.Control_L)
-				_engine.send_script(LevelEditorApi.key_up("left_ctrl"));
+				_engine.send_script(LevelEditorApi.key_up("ctrl_left"));
 			else if (ev.keyval == Gdk.Key.Shift_L)
 			else if (ev.keyval == Gdk.Key.Shift_L)
-				_engine.send_script(LevelEditorApi.key_up("left_shift"));
+				_engine.send_script(LevelEditorApi.key_up("shift_left"));
+			else if (ev.keyval == Gdk.Key.Alt_L)
+				_engine.send_script(LevelEditorApi.key_up("alt_left"));
 
 
 			return false;
 			return false;
 		}
 		}