History

clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring

Seth Alves committed 9 years ago

Commit de589a31 parent 1346ce29 files · +454 −11Browse files

Showing the changes to interface/src/InterfaceDynamicFactory.cpp (1 of 9 files). Show all

Unified · Split

interface/src/InterfaceDynamicFactory.cpp+3−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15#include <avatar/AvatarActionFarGrab.h>15#include <avatar/AvatarActionFarGrab.h>
16#include <ObjectActionOffset.h>16#include <ObjectActionOffset.h>
17#include <ObjectActionSpring.h>17#include <ObjectActionSpring.h>
18#include <ObjectActionTractor.h>
18#include <ObjectActionTravelOriented.h>19#include <ObjectActionTravelOriented.h>
19#include <ObjectConstraintHinge.h>20#include <ObjectConstraintHinge.h>
20#include <ObjectConstraintSlider.h>21#include <ObjectConstraintSlider.h>
@@ -34,6 +35,8 @@ EntityDynamicPointer interfaceDynamicFactory(EntityDynamicType type, const QUuid · 13 unmodified lines
34 return std::make_shared<ObjectActionOffset>(id, ownerEntity);35 return std::make_shared<ObjectActionOffset>(id, ownerEntity);
35 case DYNAMIC_TYPE_SPRING:36 case DYNAMIC_TYPE_SPRING:
36 return std::make_shared<ObjectActionSpring>(id, ownerEntity);37 return std::make_shared<ObjectActionSpring>(id, ownerEntity);
38 case DYNAMIC_TYPE_TRACTOR:
39 return std::make_shared<ObjectActionTractor>(id, ownerEntity);
37 case DYNAMIC_TYPE_HOLD:40 case DYNAMIC_TYPE_HOLD:
38 return std::make_shared<AvatarActionHold>(id, ownerEntity);41 return std::make_shared<AvatarActionHold>(id, ownerEntity);
39 case DYNAMIC_TYPE_TRAVEL_ORIENTED:42 case DYNAMIC_TYPE_TRAVEL_ORIENTED: