History

Make scaleWithParent true by default for parabola picks

sabrina-shanman committed 8 years ago

Commit e1761431 parent 2dd81401 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
@@ -158,7 +158,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties · 157 unmodified lines
158158 * @property {Vec3} [accelerationAxis=-Vec3.UP] The acceleration of the parabola, i.e. the acceleration of the projectile whose trajectory defines the parabola, both magnitude and direction.
159159 * @property {boolean} [rotateAccelerationWithAvatar=true] Whether or not the acceleration axis should rotate with the avatar's local Y axis.
160160 * @property {boolean} [rotateAccelerationWithParent=false] Whether or not the acceleration axis should rotate with the parent's local Y axis, if available.
161− * @property {boolean} [scaleWithParent=false] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available.
161+ * @property {boolean} [scaleWithParent=true] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available.
162162 * @property {boolean} [scaleWithAvatar] Alias for scaleWithParent. <em>Deprecated.</em>
163163 */
164164 unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properties) {
@@ -199,7 +199,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti · 34 unmodified lines
199199 rotateAccelerationWithParent = propMap["rotateAccelerationWithParent"].toBool();
200200 }
201201
202− bool scaleWithParent = false;
202+ bool scaleWithParent = true;
203203 if (propMap["scaleWithParent"].isValid()) {
204204 scaleWithParent = propMap["scaleWithParent"].toBool();
205205 } else if (propMap["scaleWithAvatar"].isValid()) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t