Showing the changes to interface/src/InterfaceDynamicFactory.cpp (1 of 5 files). Show all
Unified · Split
| @@ -14,7 +14,6 @@ · 13 unmodified lines | |||
| 14 | #include <avatar/AvatarActionHold.h> | 14 | #include <avatar/AvatarActionHold.h> |
| 15 | #include <avatar/AvatarActionFarGrab.h> | 15 | #include <avatar/AvatarActionFarGrab.h> |
| 16 | #include <ObjectActionOffset.h> | 16 | #include <ObjectActionOffset.h> |
| 17 | #include <ObjectActionSpring.h> | ||
| 18 | #include <ObjectActionTractor.h> | 17 | #include <ObjectActionTractor.h> |
| 19 | #include <ObjectActionTravelOriented.h> | 18 | #include <ObjectActionTravelOriented.h> |
| 20 | #include <ObjectConstraintHinge.h> | 19 | #include <ObjectConstraintHinge.h> |
| @@ -33,7 +32,8 @@ EntityDynamicPointer interfaceDynamicFactory(EntityDynamicType type, const QUuid · 12 unmodified lines | |||
| 33 | case DYNAMIC_TYPE_OFFSET: | 32 | case DYNAMIC_TYPE_OFFSET: |
| 34 | return std::make_shared<ObjectActionOffset>(id, ownerEntity); | 33 | return std::make_shared<ObjectActionOffset>(id, ownerEntity); |
| 35 | case DYNAMIC_TYPE_SPRING: | 34 | case DYNAMIC_TYPE_SPRING: |
| 36 | return std::make_shared<ObjectActionSpring>(id, ownerEntity); | 35 | // the old "Spring" action moved to "Tractor" |
| 36 | return std::make_shared<ObjectActionTractor>(id, ownerEntity); | ||
| 37 | case DYNAMIC_TYPE_TRACTOR: | 37 | case DYNAMIC_TYPE_TRACTOR: |
| 38 | return std::make_shared<ObjectActionTractor>(id, ownerEntity); | 38 | return std::make_shared<ObjectActionTractor>(id, ownerEntity); |
| 39 | case DYNAMIC_TYPE_HOLD: | 39 | case DYNAMIC_TYPE_HOLD: |