parabola-overlay and -avatar intersection, handle case where acceleration == 0

SamGondelman committed 8 years ago

Commit 845ddda1 parent ca5ce8841 files · +815 −274Browse files

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

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+6−0

@@ -35,6 +35,12 @@ glm::vec3 HMDScriptingInterface::calculateRayUICollisionPoint(const glm::vec3& p · 34 unmodified lines
35	35	return result;
36	36	}
37	37
	38	+glm::vec3 HMDScriptingInterface::calculateParabolaUICollisionPoint(const glm::vec3& position, const glm::vec3& velocity, const glm::vec3& acceleration, float& parabolicDistance) const {
	39	+ glm::vec3 result;
	40	+ qApp->getApplicationCompositor().calculateParabolaUICollisionPoint(position, velocity, acceleration, result, parabolicDistance);
	41	+ return result;
	42	+}
	43	+
38	44	glm::vec2 HMDScriptingInterface::overlayFromWorldPoint(const glm::vec3& position) const {
39	45	return qApp->getApplicationCompositor().overlayFromSphereSurface(position);
40	46	}