History

added faceAvatar and centerEndY, working on updating teleport.js, style fixes

SamGondelman committed 9 years ago

Commit ae99be01 parent af12b5a9 files · +740 −203Browse files

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

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+12−2
@@ -35,6 +35,16 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 34 unmodified lines
35 maxDistance = propertyMap["maxDistance"].toFloat();35 maxDistance = propertyMap["maxDistance"].toFloat();
36 }36 }
37 37
38 bool faceAvatar = false;
39 if (propertyMap["faceAvatar"].isValid()) {
40 faceAvatar = propertyMap["faceAvatar"].toBool();
41 }
42
43 bool centerEndY = true;
44 if (propertyMap["centerEndY"].isValid()) {
45 centerEndY = propertyMap["centerEndY"].toBool();
46 }
47
38 bool enabled = false;48 bool enabled = false;
39 if (propertyMap["enabled"].isValid()) {49 if (propertyMap["enabled"].isValid()) {
40 enabled = propertyMap["enabled"].toBool();50 enabled = propertyMap["enabled"].toBool();
@@ -94,7 +104,7 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 53 unmodified lines
94 dirOffset = vec3FromVariant(propertyMap["dirOffset"]);104 dirOffset = vec3FromVariant(propertyMap["dirOffset"]);
95 }105 }
96 106
97 return LaserPointerManager::getInstance().createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, enabled);107 return LaserPointerManager::getInstance().createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
98 } else if (propertyMap["position"].isValid()) {108 } else if (propertyMap["position"].isValid()) {
99 glm::vec3 position = vec3FromVariant(propertyMap["position"]);109 glm::vec3 position = vec3FromVariant(propertyMap["position"]);
100 110
@@ -103,7 +113,7 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 2 unmodified lines
103 direction = vec3FromVariant(propertyMap["direction"]);113 direction = vec3FromVariant(propertyMap["direction"]);
104 }114 }
105 115
106 return LaserPointerManager::getInstance().createLaserPointer(position, direction, filter, maxDistance, renderStates, enabled);116 return LaserPointerManager::getInstance().createLaserPointer(position, direction, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
107 }117 }
108 118
109 return 0;119 return 0;