History

make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar

Seth Alves committed 9 years ago

Commit b1dc5be1 parent 2dab3068 files · +143 −25Browse files

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

Unified · Split

interface/src/InterfaceDynamicFactory.cpp+3−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
12 12
13 13
14#include <avatar/AvatarActionHold.h>14#include <avatar/AvatarActionHold.h>
15#include <avatar/AvatarActionFarGrab.h>
15#include <ObjectActionOffset.h>16#include <ObjectActionOffset.h>
16#include <ObjectActionSpring.h>17#include <ObjectActionSpring.h>
17#include <ObjectActionTravelOriented.h>18#include <ObjectActionTravelOriented.h>
@@ -35,6 +36,8 @@ EntityDynamicPointer interfaceDynamicFactory(EntityDynamicType type, const QUuid · 17 unmodified lines
35 return std::make_shared<ObjectActionTravelOriented>(id, ownerEntity);36 return std::make_shared<ObjectActionTravelOriented>(id, ownerEntity);
36 case DYNAMIC_TYPE_HINGE:37 case DYNAMIC_TYPE_HINGE:
37 return std::make_shared<ObjectConstraintHinge>(id, ownerEntity);38 return std::make_shared<ObjectConstraintHinge>(id, ownerEntity);
39 case DYNAMIC_TYPE_FAR_GRAB:
40 return std::make_shared<AvatarActionFarGrab>(id, ownerEntity);
38 }41 }
39 42
40 Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown entity dynamic type");43 Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown entity dynamic type");