History

kinematic grab

Seth Alves committed 11 years ago

Commit cf8955a1 parent f6665a45 files · +213 −1Browse files

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

Unified · Split

interface/src/InterfaceActionFactory.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/AvatarActionKinematicHold.h>
15#include <ObjectActionOffset.h>16#include <ObjectActionOffset.h>
16#include <ObjectActionSpring.h>17#include <ObjectActionSpring.h>
17 18
@@ -28,6 +29,8 @@ EntityActionPointer interfaceActionFactory(EntityActionType type, const QUuid& i · 10 unmodified lines
28 return (EntityActionPointer) new ObjectActionSpring(id, ownerEntity);29 return (EntityActionPointer) new ObjectActionSpring(id, ownerEntity);
29 case ACTION_TYPE_HOLD:30 case ACTION_TYPE_HOLD:
30 return (EntityActionPointer) new AvatarActionHold(id, ownerEntity);31 return (EntityActionPointer) new AvatarActionHold(id, ownerEntity);
32 case ACTION_TYPE_KINEMATIC_HOLD:
33 return (EntityActionPointer) new AvatarActionKinematicHold(id, ownerEntity);
31 }34 }
32 35
33 assert(false);36 assert(false);