Changeset 528 for cpp/frams/model/model.cpp

Timestamp:

07/18/16 04:14:37 (9 years ago)

Author:

Maciej Komosinski

Message:

• Part.m removed
• Part.h becomes XPROP
• validate more part and joint properties in Model.internalcheck()

File:

• cpp/frams/model/model.cpp (modified) (3 diffs)

cpp/frams/model/model.cpp

@@ -923 +923 @@
                                         p->mass = 0.0;
                         }
-                        //      VALIDMINMAX(p,part,mass);
+                        //VALIDMINMAX(p,part,mass);//mass is very special
+                        // VALIDMINMAX are managed manually when adding part properties in f0-def!
+                        // (could be made dynamic but not really worth the effort)
                         VALIDMINMAX(p, Part, size);
+                        VALIDMINMAX(p, Part, scale.x);
+                        VALIDMINMAX(p, Part, scale.y);
+                        VALIDMINMAX(p, Part, scale.z);
+                        VALIDMINMAX(p, Part, hollow);
                         VALIDMINMAX(p, Part, density);
                         VALIDMINMAX(p, Part, friction);
                         VALIDMINMAX(p, Part, ingest);
                         VALIDMINMAX(p, Part, assim);
+                        VALIDMINMAX(p, Part, vsize);
+                        VALIDMINMAX(p, Part, vcolor.x);
+                        VALIDMINMAX(p, Part, vcolor.y);
+                        VALIDMINMAX(p, Part, vcolor.z);
                         p->flags &= ~LINKFLAG; // for delta joint cycle detection
                         if (p->p.x - p->size < bbmin.x) bbmin.x = p->p.x - p->size;
@@ -951 +961 @@
                 {
                         j = (Joint*)joints(i);
+                        // VALIDMINMAX are managed manually when adding joint properties in f0-def!
+                        // (could be made dynamic but not really worth the effort)
                         VALIDMINMAX(j, Joint, stamina);
                         VALIDMINMAX(j, Joint, stif);
                         VALIDMINMAX(j, Joint, rotstif);
+                        VALIDMINMAX(p, Part, vcolor.x);
+                        VALIDMINMAX(p, Part, vcolor.y);
+                        VALIDMINMAX(p, Part, vcolor.z);
                         j->refno = i;
                         j->owner = this;
@@ -1039 +1054 @@
         {
                 n = (Neuro*)neurons(i);
-                VALIDMINMAX(n, Neuro, state);
 #ifdef MODEL_V1_COMPATIBLE
                 VALIDMINMAX(n,Neuro,inertia);