History

attempt fix for fb-17131

Seth Alves committed 8 years ago

Commit 1a440541 parent be76c431 file · +2 −4Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−4
@@ -132,8 +132,8 @@ EntityItemProperties convertPropertiesToScriptSemantics(const EntityItemProperti · 131 unmodified lines
132132 EntityItemProperties scriptSideProperties = entitySideProperties;
133133 scriptSideProperties.setLocalPosition(entitySideProperties.getPosition());
134134 scriptSideProperties.setLocalRotation(entitySideProperties.getRotation());
135− scriptSideProperties.setLocalVelocity(entitySideProperties.getLocalVelocity());
136− scriptSideProperties.setLocalAngularVelocity(entitySideProperties.getLocalAngularVelocity());
135+ scriptSideProperties.setLocalVelocity(entitySideProperties.getVelocity());
136+ scriptSideProperties.setLocalAngularVelocity(entitySideProperties.getAngularVelocity());
137137 scriptSideProperties.setLocalDimensions(entitySideProperties.getDimensions());
138138
139139 bool success;
@@ -181,8 +181,6 @@ EntityItemProperties convertPropertiesFromScriptSemantics(const EntityItemProper · 41 unmodified lines
181181 EntityItemProperties entitySideProperties = scriptSideProperties;
182182 bool success;
183183
184− // TODO -- handle velocity and angularVelocity
185−
186184 if (scriptSideProperties.localPositionChanged()) {
187185 entitySideProperties.setPosition(scriptSideProperties.getLocalPosition());
188186 } else if (scriptSideProperties.positionChanged()) {