Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 116 vs 117 for /trunk/Source Code/Managers/SceneManager.cpp

Diff revisions: vs.
  @@ -1,5 +1,4 @@
1 1 #include "Headers/SceneManager.h"
2 - #include "Headers//CameraManager.h"
3 2 #include "Core/Headers/Application.h"
4 3 #include "Rendering/Headers/Frustum.h"
5 4 #include "Geometry/Shapes/Headers/Object3D.h"
  @@ -85,7 +84,7 @@
85 84 }
86 85 }
87 86
88 - void SceneManager::findSelection(U32 x, U32 y){
87 + void SceneManager::findSelection(const vec3<F32>& camOrigin, U32 x, U32 y){
89 88 ParamHandler& par = ParamHandler::getInstance();
90 89 F32 value_fov = 0.7853f; //this is 45 degrees converted to radians
91 90 F32 value_aspect = par.getParam<F32>("aspectRatio");
  @@ -167,7 +166,7 @@
167 166
168 167 final_point = point_xformed + camera_origin;
169 168
170 - vec3<F32> origin(CameraManager::getInstance().getActiveCamera()->getEye());
169 + vec3<F32> origin(camOrigin);
171 170 vec3<F32> dir = origin.direction(final_point);
172 171
173 172 //ToDo: fix this!!!!! -Ionut