Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -132,8 +132,8 @@ EntityItemProperties convertPropertiesToScriptSemantics(const EntityItemProperti · 131 unmodified lines | |||
| 132 | EntityItemProperties scriptSideProperties = entitySideProperties; | 132 | EntityItemProperties scriptSideProperties = entitySideProperties; |
| 133 | scriptSideProperties.setLocalPosition(entitySideProperties.getPosition()); | 133 | scriptSideProperties.setLocalPosition(entitySideProperties.getPosition()); |
| 134 | scriptSideProperties.setLocalRotation(entitySideProperties.getRotation()); | 134 | scriptSideProperties.setLocalRotation(entitySideProperties.getRotation()); |
| 135 | scriptSideProperties.setLocalVelocity(entitySideProperties.getLocalVelocity()); | 135 | scriptSideProperties.setLocalVelocity(entitySideProperties.getVelocity()); |
| 136 | scriptSideProperties.setLocalAngularVelocity(entitySideProperties.getLocalAngularVelocity()); | 136 | scriptSideProperties.setLocalAngularVelocity(entitySideProperties.getAngularVelocity()); |
| 137 | scriptSideProperties.setLocalDimensions(entitySideProperties.getDimensions()); | 137 | scriptSideProperties.setLocalDimensions(entitySideProperties.getDimensions()); |
| 138 | 138 | ||
| 139 | bool success; | 139 | bool success; |
| @@ -181,8 +181,6 @@ EntityItemProperties convertPropertiesFromScriptSemantics(const EntityItemProper · 41 unmodified lines | |||
| 181 | EntityItemProperties entitySideProperties = scriptSideProperties; | 181 | EntityItemProperties entitySideProperties = scriptSideProperties; |
| 182 | bool success; | 182 | bool success; |
| 183 | 183 | ||
| 184 | // TODO -- handle velocity and angularVelocity | ||
| 185 | |||
| 186 | if (scriptSideProperties.localPositionChanged()) { | 184 | if (scriptSideProperties.localPositionChanged()) { |
| 187 | entitySideProperties.setPosition(scriptSideProperties.getLocalPosition()); | 185 | entitySideProperties.setPosition(scriptSideProperties.getLocalPosition()); |
| 188 | } else if (scriptSideProperties.positionChanged()) { | 186 | } else if (scriptSideProperties.positionChanged()) { |