Changeset 920 for cpp/frams/model

Timestamp:

05/10/20 01:24:46 (5 years ago)

Author:

Maciej Komosinski

Message:

Hinges and a muscle for solid shapes in f0

Location:

cpp/frams/model

Files:

• f0-SDK-classes.h (modified) (5 diffs)
• modelparts.h (modified) (2 diffs)

cpp/frams/model/f0-SDK-classes.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -30 +30 @@
  {"y",0,1024,"position.y","f",FIELD(p.y),},
  {"z",0,1024,"position.z","f",FIELD(p.z),},
- {"sh",1,0,"shape","d 0 3 0",FIELD(shape),},
- {"s",1,0,"size","f 0.1 10.0 1.0",FIELD(size),},
- {"sx",1,0,"scale.x","f 0.001 1000.0 1.0",FIELD(scale.x),},
- {"sy",1,0,"scale.y","f 0.001 1000.0 1.0",FIELD(scale.y),},
- {"sz",1,0,"scale.z","f 0.001 1000.0 1.0",FIELD(scale.z),},
+ {"sh",0,0,"shape","d 0 3 0",FIELD(shape),},
+ {"s",0,0,"size","f 0.1 10.0 1.0",FIELD(size),},
+ {"sx",0,0,"scale.x","f 0.001 1000.0 1.0",FIELD(scale.x),},
+ {"sy",0,0,"scale.y","f 0.001 1000.0 1.0",FIELD(scale.y),},
+ {"sz",0,0,"scale.z","f 0.001 1000.0 1.0",FIELD(scale.z),},
  {"h",1,0,"hollow","f 0 1 0",FIELD(hollow),},
  {"dn",1,0,"density","f 0.2 5.0 1.0",FIELD(density),},
@@ -83 +83 @@
  {"dy",1,1024,"delta.y","f -2 2 0",FIELD(d.y),},
  {"dz",1,1024,"delta.z","f -2 2 0",FIELD(d.z),},
- {"sh",1,0,"shape","d 0 1 0",FIELD(shape),},
+ {"sh",1,0,"shape","d 0 3 0",FIELD(shape),},
  {"hx",1,0,"hinge position.x","f",FIELD(hinge_pos.x),},
  {"hy",1,1024,"hinge position.y","f",FIELD(hinge_pos.y),},
@@ -126 +126 @@
  {"p1",0,1024,"part1 ref#","d -1 999999 -1",FIELD(p1_refno),},
  {"p2",0,1024,"part2 ref#","d -1 999999 -1",FIELD(p2_refno),},
- {"sh",1,0,"shape","d 0 1 0",FIELD(shape),},
+ {"sh",1,0,"shape","d 0 3 0",FIELD(shape),},
  {"hx",1,0,"hinge position.x","f",FIELD(hinge_pos.x),},
  {"hy",1,1024,"hinge position.y","f",FIELD(hinge_pos.y),},
@@ -223 +223 @@
 
 
+

cpp/frams/model/modelparts.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -283 +283 @@
                 V1BendMuscle = 64,
                 V1RotMuscle = 128,
-                LinearMuscle = 256
+                LinearMuscle = 256,
+                SolidMuscleFlag = 512 // the "Flag" suffix should be unified/made consistent with other enum items
         };