Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

some CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-02-12 16:13:12 -08:00
parent 1c2096bc30
commit df6437236e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/controllers/handControllerGrab.js
View file

@ -1886,7 +1886,7 @@ function cleanup() {
rightController.cleanup(); rightController.cleanup();
leftController.cleanup(); leftController.cleanup();
Controller.disableMapping(MAPPING_NAME); Controller.disableMapping(MAPPING_NAME);
Controller.setReticleVisible(true);
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
Script.update.connect(update); Script.update.connect(update);

2
interface/src/scripting/HMDScriptingInterface.cpp
View file

@ -21,7 +21,7 @@ HMDScriptingInterface::HMDScriptingInterface() {
} }
glm::vec3 HMDScriptingInterface::calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction) const { glm::vec3 HMDScriptingInterface::calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction) const {
glm::vec3 result { position }; glm::vec3 result;
qApp->getApplicationCompositor().calculateRayUICollisionPoint(position, direction, result); qApp->getApplicationCompositor().calculateRayUICollisionPoint(position, direction, result);
return result; return result;
} }