Ragdoll not an Entity. SkeletonModel is a Ragdoll

Andrew Meadows committed 12 years ago

Commit 158c7de1 parent 5bd37ac5 files · +20 −32Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+12−14

 #include "Menu.h"
 #include "SkeletonModel.h"
-SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
+SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) :
+    Model(parent),
+    Ragdoll(),
     _owningAvatar(owningAvatar) {
 }
             parentIndices.push_back(state.getFBXJoint().parentIndex);
             points.push_back(state.getPosition());
         }
-        // ... and feed the results to _ragDoll
+        // ... and feed the results to Ragdoll
-        // It is OK that_jointShapes is probably empty at this stage: _ragDoll keeps a
+        initShapesAndPoints(&_jointShapes, parentIndices, points);
-        // pointer to it and things will start working as soon as the list is populated.
-        _ragDoll.init(&_jointShapes, parentIndices, points);
     }
 }
 }
 void SkeletonModel::simulateRagdoll(float deltaTime) {
-    // move ragdoll points toward joints
+    // move ragdoll _points toward joints
-    QVector<glm::vec3>& points = _ragDoll.getPoints();
     const int numStates = _jointStates.size();
-    assert(numStates == points.size());
+    assert(numStates == _points.size());
     float fraction = 0.1f; // fraction = 0.1f left intentionally low for demo purposes
     float oneMinusFraction = 1.0f - fraction;
     for (int i = 0; i < numStates; ++i) {
-        points[i] = oneMinusFraction * points[i] + fraction * _jointStates[i].getPosition();
+        _points[i] = oneMinusFraction * _points[i] + fraction * _jointStates[i].getPosition();
     }
     // enforce the constraints
     int iterations = 0;
     float delta = 0.0f;
     do {
-        delta = _ragDoll.enforceConstraints();
+        delta = enforceConstraints();
         ++iterations;
     } while (delta > MIN_CONSTRAINT_ERROR && iterations < MAX_ITERATIONS);
 }
 void SkeletonModel::updateShapePositions() {
     if (isActive() && _owningAvatar->isMyAvatar() &&
             Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) {
-        _ragDoll.updateShapes(_rotation, _translation);
+        updateShapes(_rotation, _translation);
     } else {
         Model::updateShapePositions();
     }
     glPushMatrix();
     Application::getInstance()->loadTranslatedViewMatrix(_translation);
-    QVector<glm::vec3> points = _ragDoll.getPoints();
+    int numPoints = _points.size();
-    int numPoints = points.size();
     float alpha = 0.3f;
     float radius1 = 0.008f;
     float radius2 = 0.01f;
     for (int i = 0; i < numPoints; ++i) {
         glPushMatrix();
         // draw each point as a yellow hexagon with black border
-        glm::vec3 position = _rotation * points[i];
+        glm::vec3 position = _rotation * _points[i];
         glTranslatef(position.x, position.y, position.z);
         glColor4f(0.0f, 0.0f, 0.0f, alpha);
         glutSolidSphere(radius2, BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);

Ragdoll not an Entity. SkeletonModel is a Ragdoll

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code