History

improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot

SamGondelman committed 8 years ago

Commit 9b41cb51 parent fbcddf118 files · +94 −88Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+2−2
@@ -132,7 +132,7 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 131 unmodified lines
132 scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();132 scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();
133 }133 }
134 134
135 bool followNormal = true;135 bool followNormal = false;
136 if (propertyMap["followNormal"].isValid()) {136 if (propertyMap["followNormal"].isValid()) {
137 followNormal = propertyMap["followNormal"].toBool();137 followNormal = propertyMap["followNormal"].toBool();
138 }138 }
@@ -275,7 +275,7 @@ unsigned int PointerScriptingInterface::createParabolaPointer(const QVariant& pr · 136 unmodified lines
275 scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();275 scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();
276 }276 }
277 277
278 bool followNormal = true;278 bool followNormal = false;
279 if (propertyMap["followNormal"].isValid()) {279 if (propertyMap["followNormal"].isValid()) {
280 followNormal = propertyMap["followNormal"].toBool();280 followNormal = propertyMap["followNormal"].toBool();
281 }281 }