History

Improve style/compatibility for default position/direction when creating parabola pick

sabrina-shanman committed 8 years ago

Commit ed987ff1 parent 12a75531 file · +2 −2Browse files

Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/raypick/PickScriptingInterface.cpp+2−2
@@ -207,8 +207,8 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti · 206 unmodified lines
207 scaleWithParent = propMap["scaleWithAvatar"].toBool();207 scaleWithParent = propMap["scaleWithAvatar"].toBool();
208 }208 }
209 209
210 glm::vec3 position = glm::vec3();210 glm::vec3 position = Vectors::ZERO;
211 glm::vec3 direction = -Vectors::FRONT;211 glm::vec3 direction = propMap["joint"].isValid() ? Vectors::UP : -Vectors::FRONT;
212 if (propMap["position"].isValid()) {212 if (propMap["position"].isValid()) {
213 position = vec3FromVariant(propMap["position"]);213 position = vec3FromVariant(propMap["position"]);
214 } else if (propMap["posOffset"].isValid()) {214 } else if (propMap["posOffset"].isValid()) {