Przeglądaj źródła

tools: remove LevelEditor:mouse_move()

Daniele Bartolini 6 lat temu
rodzic
commit
17b463ab6d

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

@@ -1361,6 +1361,7 @@ function LevelEditor:update(dt)
 	self._camera:mouse_wheel(self._mouse.wheel.delta)
 	self._camera:update(dt, self._mouse.dx, self._mouse.dy, self._keyboard, self._mouse)
 
+	self.tool:mouse_move(self._mouse.x, self._mouse.y)
 	self.tool:update(dt, self._mouse.x, self._mouse.y)
 
 	self._mouse.dx = 0
@@ -1403,13 +1404,6 @@ function LevelEditor:set_mouse_state(x, y, left, middle, right)
 	self._mouse.right = right
 end
 
-function LevelEditor:mouse_move(x, y)
-	self._mouse.x = x
-	self._mouse.y = y
-
-	self.tool:mouse_move(x, y)
-end
-
 function LevelEditor:mouse_wheel(delta)
 	self._mouse.wheel.delta = self._mouse.wheel.delta + delta;
 end

+ 7 - 2
tools-imgui/level_editor.cpp

@@ -1561,11 +1561,16 @@ bool tool_process_events()
 					if (!io.WantCaptureMouse)
 					{
 						ImVec2& cursor = _editor->_scene_view._cursor;
-
 						cursor.x = io.MousePos.x - _editor->_scene_view._origin.x;
 						cursor.y = io.MousePos.y - _editor->_scene_view._origin.y;
 
-						tool::mouse_move(ss, cursor.x, cursor.y);
+						tool::set_mouse_state(ss
+							, cursor.x
+							, cursor.y
+							, io.MouseDown[MouseButton::LEFT]
+							, io.MouseDown[MouseButton::MIDDLE]
+							, io.MouseDown[MouseButton::RIGHT]
+							);
 					}
 					break;
 

+ 0 - 7
tools-imgui/tool_api.cpp

@@ -79,13 +79,6 @@ void mouse_wheel(StringStream& out, f32 delta)
 	out << delta << ")";
 }
 
-void mouse_move(StringStream& out, f32 x, f32 y)
-{
-	out << "LevelEditor:mouse_move(";
-	out << x << ",";
-	out << y << ")";
-}
-
 void key_down(StringStream& out, const char* key)
 {
 	out << "LevelEditor:key_down(";

+ 0 - 2
tools-imgui/tool_api.h

@@ -63,8 +63,6 @@ void mouse_up(StringStream& out, f32 x, f32 y);
 
 void mouse_wheel(StringStream& out, f32 delta);
 
-void mouse_move(StringStream& out, f32 x, f32 y);
-
 void key_down(StringStream& out, const char* key);
 
 void key_up(StringStream& out, const char* key);

+ 0 - 5
tools/api/engine_api.vala

@@ -95,11 +95,6 @@ namespace Crown
 				);
 		}
 
-		public string mouse_move(int x, int y)
-		{
-			return "LevelEditor:mouse_move(%d,%d)".printf(x, y);
-		}
-
 		public string mouse_wheel(double delta)
 		{
 			return "LevelEditor:mouse_wheel(%.17g)".printf(delta);