first try at angular-velocity setting action

Seth Alves committed 9 years ago

Commit 7f69bde1 parent 6808cf67 files · +49 −40Browse files

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

Unified · Split

libraries/entities/src/EntityDynamicInterface.cpp+5−0

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