CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made dragging slightly less horrific

Browse Source
This commit is contained in:
andreja6
2020-03-14 13:13:59 -07:00
parent 520e7f1bef
commit 24a4aed4f1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ArrowTool.cpp
View File

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

9
Mouse.cpp
View File

@@ -1,6 +1,7 @@
#include "Mouse.h" #include "Mouse.h"
#include "Application.h" #include "Application.h"
#include "Globals.h" #include "Globals.h"
#include <algorithm>
Mouse::Mouse(){ Mouse::Mouse(){
x = y = 0; 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); 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()); 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(); nearest=std::numeric_limits<float>::infinity();
//Vector3 camPos = g_usableApp->cameraController.getCamera()->getCoordinateFrame().translation; //Vector3 camPos = g_usableApp->cameraController.getCamera()->getCoordinateFrame().translation;
for(size_t i = 0; i < g_dataModel->getWorkspace()->partObjects.size(); i++) for(size_t i = 0; i < g_dataModel->getWorkspace()->partObjects.size(); i++)
{ {
PartInstance * p = g_dataModel->getWorkspace()->partObjects[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()))) if(G3D::isFinite(testRay.intersectionTime(p->getBox())))
{ {
@@ -67,7 +70,7 @@ Vector3 Mouse::getPosition()
Vector3 side3; Vector3 side3;
Vector3 side4; Vector3 side4;
p->getBox().getFaceCorners(i, side1, side2, side3, 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); float newdistance = testRay.distance(inter);
if(nearest > abs(newdistance)) if(nearest > abs(newdistance))
{ {

2
Mouse.h
View File

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