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

added getPositionAndPart

Browse Source
This commit is contained in:
andreja6
2020-03-14 18:56:49 -07:00
parent 5bdeac2f66
commit 73a6b72c20
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Mouse.cpp
View File

@@ -41,38 +41,36 @@ 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(std::vector<Instance *> ignore) MousePoint Mouse::getPositionAndPart(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 = Vector3(0,0,0); PartInstance * currPart = NULL;
Vector3 pos = testRay.closestPoint(Vector3(0,0,0));
nearest=std::numeric_limits<float>::infinity(); 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++) 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()) if(std::find(ignore.begin(), ignore.end(), p) != ignore.end())
continue; continue;
if(G3D::isFinite(testRay.intersectionTime(p->getBox()))) float newdistance = testRay.intersectionTime(p->getBox()); //testRay.distance(inter);
{ if(G3D::isFinite(newdistance))
for(char i = 0; i < 6; i++) {
{ if(nearest > abs(newdistance))
Vector3 side1; {
Vector3 side2; nearest = newdistance;
Vector3 side3; pos = testRay.origin+(testRay.direction*nearest);
Vector3 side4; currPart = p;
p->getBox().getFaceCorners(i, side1, side2, side3, side4); }
Vector3 inter = testRay.intersection(G3D::Plane(side1, side2, side3)); }
float newdistance = testRay.distance(inter);
if(nearest > abs(newdistance))
{
nearest = newdistance;
pos = inter;
}
}
}
} }
return pos; return MousePoint(pos, currPart);
} }
Vector3 Mouse::getPosition(std::vector<Instance *> ignore)
{
return getPositionAndPart(ignore).position;
}
bool Mouse::isMouseOnScreen() bool Mouse::isMouseOnScreen()
{ {
//hm //hm

12
Mouse.h
View File

@@ -3,8 +3,17 @@
#pragma once #pragma once
#include "WorkspaceInstance.h" #include "WorkspaceInstance.h"
#pragma once struct MousePoint{
Vector3 position;
PartInstance * target;
MousePoint(Vector3 pos, PartInstance * targ)
{
position = pos;
target = targ;
}
};
#pragma once
class Mouse class Mouse
{ {
public: public:
@@ -13,6 +22,7 @@ public:
int x, y; int x, y;
int oldx, oldy; int oldx, oldy;
PartInstance * getTarget(); PartInstance * getTarget();
MousePoint getPositionAndPart(std::vector<Instance *> ignore = std::vector<Instance *>());
Vector3 getPosition(std::vector<Instance *> ignore = std::vector<Instance *>()); Vector3 getPosition(std::vector<Instance *> ignore = std::vector<Instance *>());
bool isMouseOnScreen(); bool isMouseOnScreen();
bool isMouseDown(); bool isMouseDown();