Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cube selection: OK.

Browse Source
This commit is contained in:
Quentin BAZIN 2013-02-25 14:51:11 +01:00
parent 9921c8afe3
commit 1b8e8d1f6a
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/scene.cpp
View File

@ -36,7 +36,7 @@ bool Scene::intersectionLinePlane(vect3D normal, vect3D planePoint, vect3D lineO
float p2 = u.x * normal.x + u.y * normal.y + u.z * normal.z; // Second point to be tested float p2 = u.x * normal.x + u.y * normal.y + u.z * normal.z; // Second point to be tested
float k = p1 / p2; float k = p2 / p1;
vect3D i; // Intersection point vect3D i; // Intersection point
@ -50,9 +50,6 @@ bool Scene::intersectionLinePlane(vect3D normal, vect3D planePoint, vect3D lineO
v.y = i.y - planePoint.y; v.y = i.y - planePoint.y;
v.z = i.z - planePoint.z; v.z = i.z - planePoint.z;
//if(normal.z == 1)
// cout << "p1(" << p1 << ")" << " | u(" << u.x << ";" << u.y << ";" << u.z << ") | p2(" << p2 << ") | i(" << i.x << ";" << i.y << ";" << i.z << ") | v(" << v.x << ";" << v.y << ";" << v.z << ") | ";
float size = 0.5; float size = 0.5;
if(v.x >= -size && v.x <= size && v.y >= -size && v.y <= size && v.z >= -size && v.z <= size) { if(v.x >= -size && v.x <= size && v.y >= -size && v.y <= size && v.z >= -size && v.z <= size) {
@ -163,29 +160,25 @@ void Scene::testCubes(std::vector<Cube*> cubes) {
float distance = FAR; float distance = FAR;
Cube *cube = cubes[0]; Cube *cube = cubes[0];
for(std::vector<Cube*>::iterator it = cubes.begin() ; it != cubes.end() ; it++) { for(std::vector<Cube*>::iterator it = cubes.begin() ; it != cubes.end() ; it++) {
/*vect3D center; vect3D center;
center.x = (*it)->x() + sqrt(3) / 2; center.x = (*it)->x() + sqrt(3) / 2;
center.y = (*it)->y() + sqrt(3) / 2; center.y = (*it)->y() + sqrt(3) / 2;
center.z = (*it)->z() + sqrt(3) / 2;*/ center.z = (*it)->z() + sqrt(3) / 2;
if(intersectionLineCube((*it)->x(), (*it)->y(), (*it)->z(), linePoint, directionVector)) { if(intersectionLineCube((*it)->x(), (*it)->y(), (*it)->z(), linePoint, directionVector)) {
/*float d = sqrt(pow(linePoint.x - center.x, 2) + pow(linePoint.y - center.y, 2) + pow(linePoint.z - center.z, 2)); float d = sqrt(pow(linePoint.x - center.x, 2) + pow(linePoint.y - center.y, 2) + pow(linePoint.z - center.z, 2));
if(d < distance) { if(d < distance) {
distance = d; distance = d;
cube = (*it); cube = (*it);
}*/ }
(*it)->setSelected(true);
} else {
(*it)->setSelected(false);
} }
//(*it)->setSelected(false); (*it)->setSelected(false);
} }
//cube->setSelected(true); cube->setSelected(true);
} }
Scene::Scene() { Scene::Scene() {