History

update jointraypicks from joints, dirOffset needs work

SamGondelman committed 9 years ago

Commit 783750a1 parent 916a99c7 files · +43 −12Browse files

Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 7 files). Show all

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+2−1
@@ -26,12 +26,13 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 25 unmodified lines
26 if (propertyMap["joint"].isValid()) {26 if (propertyMap["joint"].isValid()) {
27 QString jointName = propertyMap["joint"].toString();27 QString jointName = propertyMap["joint"].toString();
28 28
29 // x = upward, y = forward, z = lateral
29 glm::vec3 posOffset = Vectors::ZERO;30 glm::vec3 posOffset = Vectors::ZERO;
30 if (propertyMap["posOffset"].isValid()) {31 if (propertyMap["posOffset"].isValid()) {
31 posOffset = vec3FromVariant(propertyMap["posOffset"]);32 posOffset = vec3FromVariant(propertyMap["posOffset"]);
32 }33 }
33 34
34 glm::vec3 dirOffset = Vectors::FRONT;35 glm::vec3 dirOffset = Vectors::UP;
35 if (propertyMap["dirOffset"].isValid()) {36 if (propertyMap["dirOffset"].isValid()) {
36 posOffset = vec3FromVariant(propertyMap["dirOffset"]);37 posOffset = vec3FromVariant(propertyMap["dirOffset"]);
37 }38 }