Made dragging slightly less horrific

ArrowTool.cpp

@@ -50,7 +50,7 @@ void ArrowTool::onMouseMoved(Mouse mouse)
 		{
 			if(PartInstance * part = dynamic_cast<PartInstance *>(g_selectedInstances[i]))
 			{
-				part->setPosition(mouse.getPosition());
+				part->setPosition(mouse.getPosition(g_selectedInstances));
 			}
 		}
 		return;

Mouse.cpp

@@ -1,6 +1,7 @@
 #include "Mouse.h"
 #include "Application.h"
 #include "Globals.h"
+#include <algorithm>
 
 Mouse::Mouse(){
 	x = y = 0;
@@ -40,15 +41,17 @@ double getVectorDistance(Vector3 vector1, Vector3 vector2)
 	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);
 }
 
-Vector3 Mouse::getPosition()
+Vector3 Mouse::getPosition(std::vector<Instance *> ignore)
 {
 	testRay = g_usableApp->cameraController.getCamera()->worldRay(x, y, g_usableApp->getRenderDevice()->getViewport());
-	Vector3 pos = testRay.closestPoint(Vector3(0,0,0));
+	Vector3 pos = Vector3(0,0,0);
 	nearest=std::numeric_limits<float>::infinity();
 	//Vector3 camPos = g_usableApp->cameraController.getCamera()->getCoordinateFrame().translation;
 	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())
+			continue;
 		if(G3D::isFinite(testRay.intersectionTime(p->getBox())))
 		{
 
@@ -67,7 +70,7 @@ Vector3 Mouse::getPosition()
 				Vector3 side3;
 				Vector3 side4;
 				p->getBox().getFaceCorners(i, side1, side2, side3, side4);
-				Vector3 inter = testRay.intersection(G3D::Plane(side2, side3, side4));
+				Vector3 inter = testRay.intersection(G3D::Plane(side1, side2, side3));
 				float newdistance = testRay.distance(inter);
 				if(nearest > abs(newdistance))
 				{

Mouse.h

@@ -13,7 +13,7 @@ public:
 	int x, y;
 	int oldx, oldy;
 	PartInstance * getTarget();
-	Vector3 getPosition();
+	Vector3 getPosition(std::vector<Instance *> ignore = std::vector<Instance *>());
 	bool isMouseOnScreen();
 	bool isMouseDown();
 	void setMouseDown(bool mouseDown);