From 8f3d12c516fc7fde5f2077118d1a4187792cda66 Mon Sep 17 00:00:00 2001
From: pinksub <114634497+pinksub@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:54:55 -0400
Subject: [PATCH 1/3] Stud snapping is confusing

Anything divided by 1 and anything multiplied by 1 is itself. Not sure if that was intentional,
---
 src/source/Mouse.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/source/Mouse.cpp b/src/source/Mouse.cpp
index faf1cd8..b613a75 100644
--- a/src/source/Mouse.cpp
+++ b/src/source/Mouse.cpp
@@ -83,9 +83,9 @@ MousePoint Mouse::getPositionAndPart(std::vector<Instance *> ignore)
 		
 	// A crude implementation of stud snapping
 	Vector3 pSz = currPart->getSize();
-	pos.x = (ceil(pos.x / 1) * 1);
-	pos.y = (ceil(pos.y / 1) * 1);
-	pos.z = (ceil(pos.z / 1) * 1);
+	pos.x = ceil(pos.x);
+	pos.y = ceil(pos.y);
+	pos.z = ceil(pos.z);
 
 	return MousePoint(pos, currPart);
 }

From 9d62380df9c5a5bd54b5c1ac4d10b422ff2517b3 Mon Sep 17 00:00:00 2001
From: pinksub <114634497+pinksub@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:58:21 -0400
Subject: [PATCH 2/3] cleanup mouse.cpp code a bit more

---
 src/source/Mouse.cpp | 56 ++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/source/Mouse.cpp b/src/source/Mouse.cpp
index b613a75..0f39add 100644
--- a/src/source/Mouse.cpp
+++ b/src/source/Mouse.cpp
@@ -3,25 +3,28 @@
 #include "Globals.h"
 #include <math.h>
 
-Mouse::Mouse(){
+Mouse::Mouse()
+{
 	x = y = 0;
 }
-Mouse::~Mouse(){}
+
+Mouse::~Mouse() 
+{
+
+}
 
 PartInstance * selectedInstance = NULL;
 Ray testRay;
-float nearest=std::numeric_limits<float>::infinity();
+float nearest = std::numeric_limits<float>::infinity();
+
 void eprt(PartInstance * instance)
 {
-		float time = testRay.intersectionTime(instance->getBox());
-		if (time != inf()) 
-		{
-			if (nearest>time)
-			{
-				nearest=time;
-				selectedInstance = instance;
-			}
-		}
+	float time = testRay.intersectionTime(instance->getBox());
+	if (time != inf() && nearest > time) 
+	{
+		nearest = time;
+		selectedInstance = instance;
+	}
 }
 
 PartInstance * Mouse::getTarget()
@@ -46,6 +49,7 @@ G3D::Ray Mouse::getLastRay()
 
 double getVectorDistance(Vector3 vector1, Vector3 vector2)
 {
+	// what the
 	return pow(pow((double)vector1.x - (double)vector2.x, 2) + pow((double)vector1.y - (double)vector2.y, 2) + pow((double)vector1.z - (double)vector2.z, 2), 0.5);
 }
 
@@ -53,28 +57,28 @@ MousePoint Mouse::getPositionAndPart(std::vector<Instance *> ignore)
 {
 	testRay = g_usableApp->cameraController.getCamera()->worldRay(x, y, g_usableApp->getRenderDevice()->getViewport());
 	PartInstance * currPart = NULL;
-	Vector3 pos = testRay.closestPoint(Vector3(0,0,0));
-	nearest=std::numeric_limits<float>::infinity();
+	Vector3 pos = testRay.closestPoint(Vector3(0, 0, 0));
+	nearest = std::numeric_limits<float>::infinity();
+	
 	for(size_t i = 0; i < g_dataModel->getWorkspace()->partObjects.size(); i++)
 	{
 		PartInstance * p = g_dataModel->getWorkspace()->partObjects[i];
-		if(std::find(ignore.begin(), ignore.end(), p) != ignore.end())
+		
+		if (std::find(ignore.begin(), ignore.end(), p) != ignore.end())
 			continue;
+		
 		float newdistance = testRay.intersectionTime(p->getBox()); //testRay.distance(inter);
-		if(G3D::isFinite(newdistance))
-        {
-			if(nearest > abs(newdistance))
-            {
-                nearest = newdistance;
-                pos = testRay.origin+(testRay.direction*nearest);
-				currPart = p;
-            }
-        }
+		if (G3D::isFinite(newdistance) && nearest > abs(newdistance))
+        	{
+			nearest = newdistance;
+                	pos = testRay.origin + (testRay.direction * nearest);
+			currPart = p;
+        	}
 	}
 
 	// A scuffed fix for moving
-	if(currPart == NULL) {
-		if(PartInstance * part = dynamic_cast<PartInstance *>(ignore[0]))
+	if (currPart == NULL) {
+		if (PartInstance * part = dynamic_cast<PartInstance *>(ignore[0]))
 		{
 			return MousePoint(part->getPosition(), part);
 		}

From d2dd05b6200e98b1c8f24cacfe5c518308868d44 Mon Sep 17 00:00:00 2001
From: pinksub <114634497+pinksub@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:58:38 -0400
Subject: [PATCH 3/3] Update Mouse.cpp

---
 src/source/Mouse.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/source/Mouse.cpp b/src/source/Mouse.cpp
index 0f39add..53ac108 100644
--- a/src/source/Mouse.cpp
+++ b/src/source/Mouse.cpp
@@ -8,10 +8,7 @@ Mouse::Mouse()
 	x = y = 0;
 }
 
-Mouse::~Mouse() 
-{
-
-}
+Mouse::~Mouse() {}
 
 PartInstance * selectedInstance = NULL;
 Ray testRay;