simulator fix tools with zoom etc

openshwprojects · Sep 18, 2024 · 78119a2 · 78119a2
1 parent 49b60e5
commit 78119a2
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 26 deletions.
diff --git a/src/sim/Simulator.cpp b/src/sim/Simulator.cpp
@@ -60,6 +60,22 @@ void CSimulator::setTool(Tool_Base *tb) {
 }
 Coord camera(0, 0);
 float zoomFactor = 1.0f;
+
+Coord GetMousePosWorld() {
+	Coord r;
+	int mx, my;
+	//SDL_GetGlobalMouseState(&mx, &my);
+	SDL_GetMouseState(&mx, &my);
+	// No longer needed after resize event was introduced
+	// BUGFIX FOR MENUBAR OFFSET
+	//my += WINDOWS_MOUSE_MENUBAR_OFFSET;
+	r.set(mx, my);
+	float ndcX = (r.getX() / WinWidth);
+	float ndcY = (r.getY() / WinHeight);
+	r.setX(camera.getX() + (ndcX * WinWidth / (zoomFactor)));
+	r.setY(camera.getY() + (ndcY * WinHeight / (zoomFactor)));
+	return r;
+}
 void CSimulator::drawWindow() {
 	char buffer[256];
 	const char *projectPathDisp = projectPath.c_str();
@@ -102,7 +118,7 @@ void CSimulator::drawWindow() {
 		{
 			//int x = Event.button.x;
 			//int y = Event.button.y;
-			Coord mouse = GetMousePos();
+			Coord mouse = GetMousePosWorld();
 			int which = Event.button.button;
 			if (activeTool) {
 				activeTool->onMouseDown(mouse, which);
@@ -113,7 +129,7 @@ void CSimulator::drawWindow() {
 		{
 			//int x = Event.button.x;
 			//int y = Event.button.y;
-			Coord mouse = GetMousePos();
+			Coord mouse = GetMousePosWorld();
 			int which = Event.button.button;
 			if (activeTool) {
 				activeTool->onMouseUp(mouse, which);
@@ -138,7 +154,7 @@ void CSimulator::drawWindow() {
 		}
 		else if (Event.type == SDL_MOUSEWHEEL)
 		{
-			Coord mouse = GetMousePos();
+			Coord mouse = GetMousePosWorld();
 
 			Coord worldBeforeZoom = camera + (mouse / zoomFactor);
 
@@ -280,7 +296,7 @@ void CSimulator::destroyObject(CShape *s) {
 	sim->destroyObject(s);
 }
 class CShape *CSimulator::getShapeUnderCursor(bool bIncludeDeepText) {
-	Coord p = GetMousePos();
+	Coord p = GetMousePosWorld();
 	return sim->findShapeByBoundsPoint(p,bIncludeDeepText);
 }
 bool CSimulator::createSimulation(bool bDemo) {

diff --git a/src/sim/Tool_Copy.cpp b/src/sim/Tool_Copy.cpp
@@ -37,7 +37,7 @@ void Tool_Copy::onMouseDown(const Coord &pos, int button) {
 }
 void Tool_Copy::drawTool() {
 	sim->getCursorMgr()->setCursor(SDL_SYSTEM_CURSOR_ARROW);
-	Coord nowMousePos = GetMousePos();
+	Coord nowMousePos = GetMousePosWorld();
 	Coord delta = nowMousePos - prevMousePos;
 	if (copyingObject) {
 		copyingObject->translate(delta);

diff --git a/src/sim/Tool_Info.cpp b/src/sim/Tool_Info.cpp
@@ -19,7 +19,7 @@ void Tool_Info::drawTool() {
 	else {
 		sim->getCursorMgr()->setCursor(SDL_SYSTEM_CURSOR_ARROW);
 	}
-	Coord pos = GetMousePos();
+	Coord pos = GetMousePosWorld();
 	int h = pos.getY();
 	if (currentTarget) {
 		h = currentTarget->drawInformation2D(pos.getX(), h);

diff --git a/src/sim/Tool_Move.cpp b/src/sim/Tool_Move.cpp
@@ -33,7 +33,7 @@ void Tool_Move::onMouseDown(const Coord &pos, int button) {
 	if (button == SDL_BUTTON_LEFT) {
 		currentTarget = sim->getShapeUnderCursor();
 		if (currentTarget) {
-			prevPos = GetMousePos();
+			prevPos = GetMousePosWorld();
 			prevPos = roundToGrid(prevPos);
 			//sim->getCursorMgr()->setCursor(SDL_SYSTEM_CURSOR_SIZEALL);
 		}
@@ -53,7 +53,7 @@ void Tool_Move::drawTool() {
 	bMovingButtonHeld = sim->isMouseButtonHold(SDL_BUTTON_LEFT);
 	if (bMovingButtonHeld) {
 		if (currentTarget != 0) {
-			Coord nowPos = GetMousePos();
+			Coord nowPos = GetMousePosWorld();
 			nowPos = roundToGrid(nowPos);
 			Coord delta = nowPos - prevPos;
 			if (delta.isNonZero()) {

diff --git a/src/sim/Tool_Use.cpp b/src/sim/Tool_Use.cpp
@@ -7,10 +7,10 @@
 
 void Tool_Use::onMouseDown(const Coord &pos, int button) {
 	currentTarget = sim->getShapeUnderCursor();
-	prevPos = GetMousePos();
+	prevPos = GetMousePosWorld();
 
 	if (currentTarget != 0) {
-		Coord curPos = GetMousePos();
+		Coord curPos = GetMousePosWorld();
 		Coord delta = curPos - prevPos;
 		prevPos = curPos;
 		CControllerBase *cntrl = currentTarget->getController();
@@ -41,7 +41,7 @@ void Tool_Use::drawTool() {
 		}
 	}
 	if (currentTarget != 0) {
-		Coord curPos = GetMousePos();
+		Coord curPos = GetMousePosWorld();
 		Coord delta = curPos - prevPos;
 		prevPos = curPos;
 		CControllerBase *cntrl = currentTarget->getController();

diff --git a/src/sim/Tool_Wire.cpp b/src/sim/Tool_Wire.cpp
@@ -21,7 +21,7 @@ void Tool_Wire::onMouseDown(const Coord &pos, int button) {
 		bSideness = !bSideness;
 	}
 	if (button == SDL_BUTTON_LEFT) {
-		Coord curPos = roundToGrid(GetMousePos());
+		Coord curPos = roundToGrid(GetMousePosWorld());
 		if (bActive) {
 #if 1				
 			sim->markAsModified();
@@ -62,7 +62,7 @@ void Tool_Wire::onMouseDown(const Coord &pos, int button) {
 void Tool_Wire::drawTool() {
 	Coord m;
 	sim->getCursorMgr()->setCursor(SDL_SYSTEM_CURSOR_CROSSHAIR);
-	m = roundToGrid(GetMousePos());
+	m = roundToGrid(GetMousePosWorld());
 	if (bActive) {
 		if (0) {
 			glBegin(GL_LINES);

diff --git a/src/sim/sim_local.h b/src/sim/sim_local.h
@@ -36,7 +36,7 @@ enum {
 int drawText(class CStyle *style, int x, int y, const char* fmt, ...);
 #include "Coord.h"
 Coord roundToGrid(Coord c);
-Coord GetMousePos();
+Coord GetMousePosWorld();
 void FS_CreateDirectoriesForPath(const char *file_path);
 char *FS_ReadTextFile(const char *fname);
 bool FS_WriteTextFile(const char *data, const char *fname);

diff --git a/src/sim/sim_sdl.cpp b/src/sim/sim_sdl.cpp
@@ -88,18 +88,6 @@ Coord roundToGrid(Coord c) {
 	return Coord(roundToGrid(c.getX()), roundToGrid(c.getY()));
 }
 
-Coord GetMousePos() {
-	Coord r;
-	int mx, my;
-	//SDL_GetGlobalMouseState(&mx, &my);
-	SDL_GetMouseState(&mx, &my);
-	// No longer needed after resize event was introduced
-	// BUGFIX FOR MENUBAR OFFSET
-	//my += WINDOWS_MOUSE_MENUBAR_OFFSET;
-	r.set(mx, my);
-	return r;
-}
-
 
 
 float CEdge::drawInformation2D(float x, float h) {