Changeset 507


Ignore:
Timestamp:
05/10/16 23:06:27 (8 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:
4 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/config/f0-SDK.def

    r419 r507  
    3030PROP(Vstyle,2,0,vis_style,s,0,-1,part,vis_style)
    3131XPROP(vs,2,0,visual thickness,f,0.05,0.7,0.2,vsize)
    32 XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
    33 XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    34 XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     32XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
     33XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     34XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    3535ENDCLASS
    3636
     
    5454PROP(i,2,0,`info',s,,,,info)
    5555PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
    56 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    57 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    58 XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     56XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
     57XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     58XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    5959ENDCLASS
    6060
     
    7272PROP(i,2,0,`info',s,,,,info)
    7373PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
    74 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    75 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    76 XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     74XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
     75XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     76XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    7777ENDCLASS
    7878
  • cpp/frams/config/f0.def

    r419 r507  
    3030PROP(Vstyle,2,0,vis_style,s,0,-1,part,vis_style)
    3131XPROP(vs,2,0,visual thickness,f,0.05,0.7,0.2,vsize)
    32 XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
    33 XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    34 XPROP(vb,2,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     32XPROP(vr,2,0,red component,f,0.0,1.0,1.0,vcolor.x)
     33XPROP(vg,2,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     34XPROP(vb,2,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    3535ENDCLASS
    3636
     
    5454PROP(i,2,0,`info',s,,,,info)
    5555PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
    56 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    57 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    58 XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     56XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
     57XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     58XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    5959ENDCLASS
    6060
     
    7272PROP(i,2,0,`info',s,,,,info)
    7373PROP(Vstyle,3,0,vis_style,s,0,-1,joint,vis_style)
    74 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    75 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
    76 XPROP(vb,3,1024,blue component,f,0.0,1.0,0.5,vcolor.z)
     74XPROP(vr,3,0,red component,f,0.0,1.0,1.0,vcolor.x)
     75XPROP(vg,3,1024,green component,f,0.0,1.0,1.0,vcolor.y)
     76XPROP(vb,3,1024,blue component,f,0.0,1.0,1.0,vcolor.z)
    7777ENDCLASS
    7878
  • cpp/frams/model/defassign-f0-SDK.h

    r288 r507  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    2222vis_style="part";
    2323vsize=0.2;
    24 vcolor.x=0.5;
    25 vcolor.y=0.5;
    26 vcolor.z=0.5;
     24vcolor.x=1.0;
     25vcolor.y=1.0;
     26vcolor.z=1.0;
    2727}
    2828
     
    7171stamina=0.25;
    7272vis_style="joint";
    73 vcolor.x=0.5;
    74 vcolor.y=0.5;
    75 vcolor.z=0.5;
     73vcolor.x=1.0;
     74vcolor.y=1.0;
     75vcolor.z=1.0;
    7676}
    7777
  • cpp/frams/model/f0-SDK-classes.h

    r289 r507  
    4747 {"Vstyle",2,0,"vis_style","s 0 -1 part",FIELD(vis_style),},
    4848 {"vs",2,0,"visual thickness","f 0.05 0.7 0.2",FIELD(vsize),},
    49  {"vr",2,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    50  {"vg",2,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    51  {"vb",2,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     49 {"vr",2,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     50 {"vg",2,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     51 {"vb",2,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    5252 {0,0,0,}
    5353};
     
    6161 {"as",0,0,"assimilation","f 0.0 1.0 0.25",FIELD(assim),},
    6262 {"vs",0,0,"visual thickness","f 0.05 0.7 0.2",FIELD(vsize),},
    63  {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    64  {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    65  {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     63 {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     64 {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     65 {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    6666 {0,0,0,}
    6767};
     
    9090 {"i",2,0,"info","s",FIELD(info),},
    9191 {"Vstyle",3,0,"vis_style","s 0 -1 joint",FIELD(vis_style),},
    92  {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    93  {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    94  {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     92 {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     93 {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     94 {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    9595 {0,0,0,}
    9696};
     
    100100 {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
    101101 {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
    102  {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    103  {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    104  {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     102 {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     103 {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     104 {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    105105 {0,0,0,}
    106106};
     
    123123 {"i",2,0,"info","s",FIELD(info),},
    124124 {"Vstyle",3,0,"vis_style","s 0 -1 joint",FIELD(vis_style),},
    125  {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    126  {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    127  {"vb",3,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     125 {"vr",3,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     126 {"vg",3,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     127 {"vb",3,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    128128 {0,0,0,}
    129129};
     
    133133 {"stif",0,0,"stiffness","f 0.0 1.0 1.0",FIELD(stif),},
    134134 {"rotstif",0,0,"rotation stiffness","f 0.0 1.0 1.0",FIELD(rotstif),},
    135  {"vr",0,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    136  {"vg",0,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
    137  {"vb",0,1024,"blue component","f 0.0 1.0 0.5",FIELD(vcolor.z),},
     135 {"vr",0,0,"red component","f 0.0 1.0 1.0",FIELD(vcolor.x),},
     136 {"vg",0,1024,"green component","f 0.0 1.0 1.0",FIELD(vcolor.y),},
     137 {"vb",0,1024,"blue component","f 0.0 1.0 1.0",FIELD(vcolor.z),},
    138138 {0,0,0,}
    139139};
Note: See TracChangeset for help on using the changeset viewer.