Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:08:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more purging of legacy 'Spring' action

Browse source
This commit is contained in:
Andrew Meadows 2017-05-16 08:09:20 -07:00
parent 9b3754c2ee
commit e6accb61b0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityDynamicInterface.cpp
View file

@ -50,7 +50,7 @@
A dynamic is a callback which is registered with bullet. A dynamic is called-back every physics A dynamic is a callback which is registered with bullet. A dynamic is called-back every physics
simulation step and can do whatever it wants with the various datastructures it has available. An simulation step and can do whatever it wants with the various datastructures it has available. A
dynamic, for example, can pull an EntityItem toward a point as if that EntityItem were connected to that dynamic, for example, can pull an EntityItem toward a point as if that EntityItem were connected to that
point by a spring. point by a spring.
@ -103,7 +103,7 @@ EntityDynamicType EntityDynamicInterface::dynamicTypeFromString(QString dynamicT
return DYNAMIC_TYPE_OFFSET; return DYNAMIC_TYPE_OFFSET;
} }
if (normalizedDynamicTypeString == "spring") { if (normalizedDynamicTypeString == "spring") {
return DYNAMIC_TYPE_SPRING; return DYNAMIC_TYPE_TRACTOR;
} }
if (normalizedDynamicTypeString == "tractor") { if (normalizedDynamicTypeString == "tractor") {
return DYNAMIC_TYPE_TRACTOR; return DYNAMIC_TYPE_TRACTOR;
@ -142,7 +142,6 @@ QString EntityDynamicInterface::dynamicTypeToString(EntityDynamicType dynamicTyp
case DYNAMIC_TYPE_OFFSET: case DYNAMIC_TYPE_OFFSET:
return "offset"; return "offset";
case DYNAMIC_TYPE_SPRING: case DYNAMIC_TYPE_SPRING:
return "spring";
case DYNAMIC_TYPE_TRACTOR: case DYNAMIC_TYPE_TRACTOR:
return "tractor"; return "tractor";
case DYNAMIC_TYPE_HOLD: case DYNAMIC_TYPE_HOLD: