Changeset 1142


Ignore:
Timestamp:
05/24/21 13:59:44 (4 years ago)
Author:
Maciej Komosinski
Message:

Default RGB color of Parts and Joints becomes 0.5,0.5,0.5 again (undo r507) and potential brightening will be performed during visualization, not on a genetic level

Location:
cpp/frams
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/config/f0-SDK.def

    r1107 r1142  
    2828PROP(i,1,0,`info',s,,,,info)
    2929PROP(Vstyle,2,0,vis_style,s,0,0,part,vis_style)
    30 XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
    31 XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    32 XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     30XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
     31XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     32XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    3333ENDCLASS
    3434
    … …  
    6767PROP(i,2,0,`info',s,,,,info)
    6868PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
    69 XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
    70 XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    71 XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     69XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
     70XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     71XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    7272ENDCLASS
    7373
    … …  
    9595PROP(i,2,0,`info',s,,,,info)
    9696PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
    97 XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
    98 XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    99 XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     97XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
     98XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     99XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    100100ENDCLASS
    101101

  • cpp/frams/config/f0.def

    r1134 r1142  
    2828PROP(i,1,0,`info',s,,,,info)
    2929PROP(Vstyle,2,0,vis_style,s,0,0,part,vis_style)
    30 XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
    31 XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    32 XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     30XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
     31XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     32XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    3333ENDCLASS
    3434
    … …  
    6767PROP(i,2,0,`info',s,,,,info)
    6868PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
    69 XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
    70 XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    71 XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     69XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
     70XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     71XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    7272ENDCLASS
    7373
    … …  
    9595PROP(i,2,0,`info',s,,,,info)
    9696PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
    97 XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
    98 XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
    99 XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
     97XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
     98XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     99XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
    100100ENDCLASS
    101101

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

    r1039 r1142  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    2020assim=0.25;
    2121vis_style="part";
    22 vcolor.x=1.0;
    23 vcolor.y=1.0;
    24 vcolor.z=1.0;
     22vcolor.x=0.5;
     23vcolor.y=0.5;
     24vcolor.z=0.5;
    2525}
    2626
    … …  
    128128stamina=0.25;
    129129vis_style="joint";
    130 vcolor.x=1.0;
    131 vcolor.y=1.0;
    132 vcolor.z=1.0;
     130vcolor.x=0.5;
     131vcolor.y=0.5;
     132vcolor.z=0.5;
    133133}
    134134

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

    r1039 r1142  
    4545 {"i",1,0,"info","s",FIELD(info),},
    4646 {"Vstyle",2,0,"vis_style","s 0 0 part",FIELD(vis_style),},
    47  {"vr",2,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    48  {"vg",2,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    49  {"vb",2,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     47 {"vr",2,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     48 {"vg",2,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     49 {"vb",2,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    5050 {0,0,0,}
    5151};
    … …  
    5858 {"ing",0,0,"ingestion","f 0.0 1.0 0.25",FIELD(ingest),},
    5959 {"as",0,0,"assimilation","f 0.0 1.0 0.25",FIELD(assim),},
    60  {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    61  {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    62  {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     60 {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     61 {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     62 {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    6363 {0,0,0,}
    6464};
    … …  
    112112 {"i",2,0,"info","s",FIELD(info),},
    113113 {"Vstyle",3,0,"vis_style","s 0 0 joint",FIELD(vis_style),},
    114  {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    115  {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    116  {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     114 {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     115 {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     116 {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    117117 {0,0,0,}
    118118};
    … …  
    122122 {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
    123123 {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
    124  {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    125  {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    126  {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     124 {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     125 {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     126 {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    127127 {0,0,0,}
    128128};
    … …  
    155155 {"i",2,0,"info","s",FIELD(info),},
    156156 {"Vstyle",3,0,"vis_style","s 0 0 joint",FIELD(vis_style),},
    157  {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    158  {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    159  {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     157 {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     158 {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     159 {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    160160 {0,0,0,}
    161161};
    … …  
    165165 {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
    166166 {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
    167  {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
    168  {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
    169  {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
     167 {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
     168 {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     169 {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
    170170 {0,0,0,}
    171171};
Note: See TracChangeset for help on using the changeset viewer.