History

bullet cone-twist constraint

Seth Alves committed 9 years ago

Commit 4c4e0df1 parent 66230285 files · +436 −1Browse files

Showing the changes to libraries/entities/src/EntityDynamicInterface.cpp (1 of 5 files). Show all

Unified · Split

libraries/entities/src/EntityDynamicInterface.cpp+5−0
@@ -123,6 +123,9 @@ EntityDynamicType EntityDynamicInterface::dynamicTypeFromString(QString dynamicT · 122 unmodified lines
123123 if (normalizedDynamicTypeString == "ballsocket") {
124124 return DYNAMIC_TYPE_BALL_SOCKET;
125125 }
126+ if (normalizedDynamicTypeString == "conetwist") {
127+ return DYNAMIC_TYPE_CONE_TWIST;
128+ }
126129
127130 qCDebug(entities) << "Warning -- EntityDynamicInterface::dynamicTypeFromString got unknown dynamic-type name"
128131 << dynamicTypeString;
@@ -149,6 +152,8 @@ QString EntityDynamicInterface::dynamicTypeToString(EntityDynamicType dynamicTyp · 20 unmodified lines
149152 return "slider";
150153 case DYNAMIC_TYPE_BALL_SOCKET:
151154 return "ball-socket";
155+ case DYNAMIC_TYPE_CONE_TWIST:
156+ return "cone-twist";
152157 }
153158 assert(false);
154159 return "none";

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t