Changeset 1039 for cpp/frams/model

Timestamp:

11/30/20 03:44:14 (4 years ago)

Author:

Maciej Komosinski

Message:

Removed Part's "visual thickness" property

Location:

cpp/frams/model

Files:

• defassign-f0-SDK.h (modified) (1 diff)
• f0-SDK-classes.h (modified) (4 diffs)
• model.cpp (modified) (1 diff)
• modelparts.cpp (modified) (1 diff)
• modelparts.h (modified) (1 diff)

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

@@ -20 +20 @@
 assim=0.25;
 vis_style="part";
-vsize=0.2;
 vcolor.x=1.0;
 vcolor.y=1.0;

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

@@ -24 +24 @@
 ParamEntry f0_part_paramtab[]=
 {
- {"Geometry",3,22,"p",NULL,0,NULL,NULL,"Part"},
+ {"Geometry",3,21,"p",NULL,0,NULL,NULL,"Part"},
  {"Other properties",},
  {"Visual",},
@@ -45 +45 @@
  {"i",1,0,"info","s",FIELD(info),},
  {"Vstyle",2,0,"vis_style","s 0 0 part",FIELD(vis_style),},
- {"vs",2,0,"visual thickness","f 0.05 0.7 0.2",FIELD(vsize),},
  {"vr",2,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
  {"vg",2,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
@@ -53 +52 @@
 ParamEntry f0_part_xtra_paramtab[]=
 {
- {"Extra properties",1,9,"p"},
+ {"Extra properties",1,8,"p"},
  {"h",0,0,"hollow","f 0 1 0",FIELD(hollow),},
  {"dn",0,0,"density","f 0.2 5.0 1.0",FIELD(density),},
@@ -59 +58 @@
  {"ing",0,0,"ingestion","f 0.0 1.0 0.25",FIELD(ingest),},
  {"as",0,0,"assimilation","f 0.0 1.0 0.25",FIELD(assim),},
- {"vs",0,0,"visual thickness","f 0.05 0.7 0.2",FIELD(vsize),},
  {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
  {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},

cpp/frams/model/model.cpp

@@ -920 +920 @@
                         VALIDMINMAX(p, Part, ingest);
                         VALIDMINMAX(p, Part, assim);
-                        VALIDMINMAX(p, Part, vsize);
                         VALIDMINMAX(p, Part, vcolor.x);
                         VALIDMINMAX(p, Part, vcolor.y);

cpp/frams/model/modelparts.cpp

@@ -591 +591 @@
         refno = src.refno;
         vcolor = src.vcolor;
-        vsize = src.vsize;
         vis_style = src.vis_style;
         shape = src.shape;

cpp/frams/model/modelparts.h

@@ -111 +111 @@
 
         Pt3D vcolor;
-        double vsize;
 
         Part(enum Shape s = SHAPE_BALL);