pull qApp spaghetti out of Avatar class

some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer

Andrew Meadows committed 9 years ago

Commit 1137bd11 parent 7505b8213 files · +131 −79Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 13 files). Show all

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+3−3

@@ -105,9 +105,9 @@ QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* conte · 104 unmodified lines
105	}	105	}
106		106
107	bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {	107	bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {
108	Camera* camera = qApp->getCamera();	108	const Camera& camera = qApp->getCamera();
109	glm::vec3 position = camera->getPosition();	109	glm::vec3 position = camera.getPosition();
110	glm::quat orientation = camera->getOrientation();	110	glm::quat orientation = camera.getOrientation();
111		111
112	glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f);	112	glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f);
113		113