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

Merge branch 'develop' into modnark

Browse Source
This commit is contained in:
Modnark
2022-10-12 13:51:21 -04:00
committed by GitHub
parent 0ac516618a 57db5511bd
commit 2471abb8dd
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/source/Mouse.cpp
View File

@@ -3,26 +3,26 @@
#include "Globals.h" #include "Globals.h"
#include <math.h> #include <math.h>
Mouse::Mouse(){ Mouse::Mouse()
{
x = y = 0; x = y = 0;
} }
Mouse::~Mouse() {} Mouse::~Mouse() {}
PartInstance * selectedInstance = NULL; PartInstance * selectedInstance = NULL;
Ray testRay; Ray testRay;
float nearest = std::numeric_limits<float>::infinity(); float nearest = std::numeric_limits<float>::infinity();
void eprt(PartInstance * instance) void eprt(PartInstance * instance)
{ {
float time = testRay.intersectionTime(instance->getBox()); float time = testRay.intersectionTime(instance->getBox());
if (time != inf()) if (time != inf() && nearest > time)
{
if (nearest>time)
{ {
nearest = time; nearest = time;
selectedInstance = instance; selectedInstance = instance;
} }
} }
}
PartInstance * Mouse::getTarget() PartInstance * Mouse::getTarget()
{ {
@@ -46,6 +46,7 @@ G3D::Ray Mouse::getLastRay()
double getVectorDistance(Vector3 vector1, Vector3 vector2) 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); 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);
} }
@@ -55,22 +56,22 @@ MousePoint Mouse::getPositionAndPart(std::vector<Instance *> ignore)
PartInstance * currPart = NULL; PartInstance * currPart = NULL;
Vector3 pos = testRay.closestPoint(Vector3(0, 0, 0)); Vector3 pos = testRay.closestPoint(Vector3(0, 0, 0));
nearest = std::numeric_limits<float>::infinity(); nearest = std::numeric_limits<float>::infinity();
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;
float newdistance = testRay.intersectionTime(p->getBox()); //testRay.distance(inter); float newdistance = testRay.intersectionTime(p->getBox()); //testRay.distance(inter);
if(G3D::isFinite(newdistance)) if (G3D::isFinite(newdistance) && nearest > abs(newdistance))
{
if(nearest > abs(newdistance))
{ {
nearest = newdistance; nearest = newdistance;
pos = testRay.origin + (testRay.direction * nearest); pos = testRay.origin + (testRay.direction * nearest);
currPart = p; currPart = p;
} }
} }
}
// A scuffed fix for moving // A scuffed fix for moving
if (currPart == NULL) { if (currPart == NULL) {
@@ -83,9 +84,9 @@ MousePoint Mouse::getPositionAndPart(std::vector<Instance *> ignore)
// A crude implementation of stud snapping // A crude implementation of stud snapping
Vector3 pSz = currPart->getSize(); Vector3 pSz = currPart->getSize();
pos.x = (ceil(pos.x / 1) * 1); pos.x = ceil(pos.x);
pos.y = (ceil(pos.y / 1) * 1); pos.y = ceil(pos.y);
pos.z = (ceil(pos.z / 1) * 1); pos.z = ceil(pos.z);
return MousePoint(pos, currPart); return MousePoint(pos, currPart);
} }