Changeset 507 for cpp/frams

Timestamp:

05/10/16 23:06:27 (9 years ago)

Author:

Maciej Komosinski

Message:

Default Part and Stick color becomes white, not gray (so that multiplying will not darken textures)

Location:

cpp/frams

Files:

• config/f0-SDK.def (modified) (3 diffs)
• config/f0.def (modified) (3 diffs)
• model/defassign-f0-SDK.h (modified) (3 diffs)
• model/f0-SDK-classes.h (modified) (6 diffs)

cpp/frams/config/f0-SDK.def

@@ -30 +30 @@
 PROP(Vstyle,2,0,vis_style,s,0,-1,part,vis_style)
 XPROP(vs,2,0,visual thickness,f,0.05,0.7,0.2,vsize)
-XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 
@@ -54 +54 @@
 PROP(i,2,0,`info',s,,,,info)
 PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
-XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 
@@ -72 +72 @@
 PROP(i,2,0,`info',s,,,,info)
 PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
-XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 

cpp/frams/config/f0.def

@@ -30 +30 @@
 PROP(Vstyle,2,0,vis_style,s,0,-1,part,vis_style)
 XPROP(vs,2,0,visual thickness,f,0.05,0.7,0.2,vsize)
-XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 
@@ -54 +54 @@
 PROP(i,2,0,`info',s,,,,info)
 PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
-XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 
@@ -72 +72 @@
 PROP(i,2,0,`info',s,,,,info)
 PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
-XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
-XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
-XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
+XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
+XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
+XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
 ENDCLASS
 

cpp/frams/model/defassign-f0-SDK.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-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -22 +22 @@
 vis_style="part";
 vsize=0.2;
-vcolor.x=0.5;
-vcolor.y=0.5;
-vcolor.z=0.5;
+vcolor.x=1.0;
+vcolor.y=1.0;
+vcolor.z=1.0;
 }
 
@@ -71 +71 @@
 stamina=0.25;
 vis_style="joint";
-vcolor.x=0.5;
-vcolor.y=0.5;
-vcolor.z=0.5;
+vcolor.x=1.0;
+vcolor.y=1.0;
+vcolor.z=1.0;
 }
 

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

@@ -47 +47 @@
  {"Vstyle",2,0,"vis_style","s 0 -1 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 0.5",FIELD(vcolor.x),},
- {"vg",2,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",2,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"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),},
+ {"vb",2,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };
@@ -61 +61 @@
  {"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 0.5",FIELD(vcolor.x),},
- {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"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),},
+ {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };
@@ -90 +90 @@
  {"i",2,0,"info","s",FIELD(info),},
  {"Vstyle",3,0,"vis_style","s 0 -1 joint",FIELD(vis_style),},
- {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
- {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
+ {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
+ {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };
@@ -100 +100 @@
  {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
  {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
- {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
- {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"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),},
+ {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };
@@ -123 +123 @@
  {"i",2,0,"info","s",FIELD(info),},
  {"Vstyle",3,0,"vis_style","s 0 -1 joint",FIELD(vis_style),},
- {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
- {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
+ {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
+ {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };
@@ -133 +133 @@
  {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
  {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
- {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
- {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
- {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
+ {"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),},
+ {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
  {0,0,0,}
 };