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

Merge branch 'master' of https://github.com/andreja6/G3D-Fun

Browse Source
This commit is contained in:
andreja6
2018-04-29 16:31:14 -07:00
parent 739f116895 f45e8afb37
commit fa3a0f9aa4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.cpp
View File

@@ -17,7 +17,7 @@
#include "TextButtonInstance.h" #include "TextButtonInstance.h"
#include "ImageButtonInstance.h" #include "ImageButtonInstance.h"
#include "AudioPlayer.h" #include "AudioPlayer.h"
#include <limits.h>
#if G3D_VER < 61000 #if G3D_VER < 61000
#error Requires G3D 6.10 #error Requires G3D 6.10
@@ -1107,15 +1107,21 @@ void Demo::onUserInput(UserInput* ui) {
{ {
selectedInstance = NULL; selectedInstance = NULL;
testRay = app->debugCamera.worldRay(mousex, mousey, app->renderDevice->getViewport()); testRay = app->debugCamera.worldRay(mousex, mousey, app->renderDevice->getViewport());
float nearest=std::numeric_limits<float>::infinity();
Vector3 camPos = app->debugCamera.getCoordinateFrame().translation;
for(size_t i = 0; i < instances.size(); i++) for(size_t i = 0; i < instances.size(); i++)
{ {
if(instances.at(i)->className == "Part" && instances.at(i)->parent == dataModel) if(instances.at(i)->className == "Part" && instances.at(i)->parent == dataModel)
{ {
PhysicalInstance* test = (PhysicalInstance*)instances.at(i); PhysicalInstance* test = (PhysicalInstance*)instances.at(i);
if (testRay.intersectionTime(test->getBox()) != inf()) if (testRay.intersectionTime(test->getBox()) != inf())
{ {
selectedInstance = test; float distanceFromPart = (camPos-test->getPosition()).magnitude();
if (nearest>distanceFromPart)
{
nearest=distanceFromPart;
selectedInstance = test;
}
} }
} }
} }