Showing the changes to libraries/entities/src/EntityDynamicInterface.cpp (1 of 7 files). Show all
Unified · Split
| @@ -126,6 +126,9 @@ EntityDynamicType EntityDynamicInterface::dynamicTypeFromString(QString dynamicT · 125 unmodified lines | |||
| 126 | if (normalizedDynamicTypeString == "conetwist") { | 126 | if (normalizedDynamicTypeString == "conetwist") { |
| 127 | return DYNAMIC_TYPE_CONE_TWIST; | 127 | return DYNAMIC_TYPE_CONE_TWIST; |
| 128 | } | 128 | } |
| 129 | if (normalizedDynamicTypeString == "motor") { | ||
| 130 | return DYNAMIC_TYPE_MOTOR; | ||
| 131 | } | ||
| 129 | 132 | ||
| 130 | qCDebug(entities) << "Warning -- EntityDynamicInterface::dynamicTypeFromString got unknown dynamic-type name" | 133 | qCDebug(entities) << "Warning -- EntityDynamicInterface::dynamicTypeFromString got unknown dynamic-type name" |
| 131 | << dynamicTypeString; | 134 | << dynamicTypeString; |
| @@ -154,6 +157,8 @@ QString EntityDynamicInterface::dynamicTypeToString(EntityDynamicType dynamicTyp · 22 unmodified lines | |||
| 154 | return "ball-socket"; | 157 | return "ball-socket"; |
| 155 | case DYNAMIC_TYPE_CONE_TWIST: | 158 | case DYNAMIC_TYPE_CONE_TWIST: |
| 156 | return "cone-twist"; | 159 | return "cone-twist"; |
| 160 | case DYNAMIC_TYPE_MOTOR: | ||
| 161 | return "motor"; | ||
| 157 | } | 162 | } |
| 158 | assert(false); | 163 | assert(false); |
| 159 | return "none"; | 164 | return "none"; |