Fixed a few parentheses

[lugaru.git] / Source / Animation / Muscle.cpp

diff --git a/Source/Animation/Muscle.cpp b/Source/Animation/Muscle.cpp
index 4a5a04762a5101fc6f1f1a60ad5f2bdb82fbacab..6ccad1816c6574423fd9b5025924f097fefaee02 100644 (file)
--- a/Source/Animation/Muscle.cpp
+++ b/Source/Animation/Muscle.cpp
@@ -18,41 +18,83 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Animation/Muscle.h"
+#include "Animation/Muscle.hpp"
+
+#include "Utils/binio.h"
 
 extern float multiplier;
 extern bool freeze;
 
-Muscle::Muscle()
+Muscle::Muscle() :
+    length(0),
+    targetlength(0),
+    parent1(0),
+    parent2(0),
+    maxlength(0),
+    minlength(0),
+    type(boneconnect),
+    visible(false),
+    rotate1(0), rotate2(0), rotate3(0),
+    lastrotate1(0), lastrotate2(0), lastrotate3(0),
+    oldrotate1(0), oldrotate2(0), oldrotate3(0),
+    newrotate1(0), newrotate2(0), newrotate3(0),
+
+    strength(0)
 {
-    vertices = 0;
-    verticeslow = 0;
-    verticesclothes = 0;
-
-    numvertices = 0;
-    numverticeslow = 0;
-    numverticesclothes = 0;
-    length = 0;
-    targetlength = 0;
-    parent1 = 0;
-    parent2 = 0;
-    maxlength = 0;
-    minlength = 0;
-    type = boneconnect;
-    visible = 0;
-    rotate1 = 0, rotate2 = 0, rotate3 = 0;
-    lastrotate1 = 0, lastrotate2 = 0, lastrotate3 = 0;
-    oldrotate1 = 0, oldrotate2 = 0, oldrotate3 = 0;
-    newrotate1 = 0, newrotate2 = 0, newrotate3 = 0;
-
-    strength = 0;
 }
 
-Muscle::~Muscle()
+void Muscle::load(FILE* tfile, int vertexNum, std::vector<Joint>& joints)
 {
-    free(vertices);
-    free(verticeslow);
-    free(verticesclothes);
+    int numvertices, vertice, parentID;
+
+    // read info
+    funpackf(tfile, "Bf Bf Bf Bf Bf Bi Bi", &length, &targetlength, &minlength, &maxlength, &strength, &type, &numvertices);
+
+    // read vertices
+    for (int j = 0; j < numvertices; j++) {
+        funpackf(tfile, "Bi", &vertice);
+        if (vertice < vertexNum) {
+            vertices.push_back(vertice);
+        }
+    }
+
+    // read more info
+    funpackf(tfile, "Bb Bi", &visible, &parentID);
+    parent1 = &joints[parentID];
+    funpackf(tfile, "Bi", &parentID);
+    parent2 = &joints[parentID];
+}
+
+void Muscle::loadVerticesLow(FILE* tfile, int vertexNum)
+{
+    int numvertices, vertice;
+
+    // read numvertices
+    funpackf(tfile, "Bi", &numvertices);
+
+    // read vertices
+    for (int j = 0; j < numvertices; j++) {
+        funpackf(tfile, "Bi", &vertice);
+        if (vertice < vertexNum) {
+            verticeslow.push_back(vertice);
+        }
+    }
+}
+
+void Muscle::loadVerticesClothes(FILE* tfile, int vertexNum)
+{
+    int numvertices, vertice;
+
+    // read numvertices
+    funpackf(tfile, "Bi", &numvertices);
+
+    // read vertices
+    for (int j = 0; j < numvertices; j++) {
+        funpackf(tfile, "Bi", &vertice);
+        if (vertice < vertexNum) {
+            verticesclothes.push_back(vertice);
+        }
+    }
 }
 
 
@@ -91,7 +133,7 @@ void Muscle::DoConstraint(bool spinny)
         strength = 1;
 
     length -= (length - relaxlength) * (1 - strength) * multiplier * 10000;
-    length -= (length - targetlength) * (strength) * multiplier * 10000;
+    length -= (length - targetlength) * strength * multiplier * 10000;
     if (strength == 0)
         length = relaxlength;