Changeset 2045


Ignore:
Timestamp:
Oct 26, 2012, 3:02:37 AM (7 years ago)
Author:
rez
Message:

neercs: theme support again (not really working yet)

Location:
trunk/tools/neercs/video
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/neercs/video/render.cpp

    r2043 r2045  
    102102vec2 buffer(1.0f,0.0f);         // [new frame mix,old frame mix]
    103103vec2 remanence(0.0f,0.0f);      // remanence [source mix,buffer mix]
    104 vec2 glow_mix(0.7f,0.3f);       // glow mix [source mix,glow mix]
    105 vec2 glow_large(3.0f,0.0f);     // large glow radius [center,corner]
    106 vec2 glow_small(1.5f,0.0f);     // small glow radius [center,corner]
    107 vec2 blur(0.5f,0.0f);           // blur radius [center,corner]
     104vec2 glow_mix(0.5f,0.0f);       // glow mix [source mix,glow mix]
     105vec2 glow_large(0.0f,0.0f);     // large glow radius [center,corner]
     106vec2 glow_small(0.0f,0.0f);     // small glow radius [center,corner]
     107vec2 blur(0.0f,0.0f);           // blur radius [center,corner]
    108108vec4 copper_copper(0.75f,0.25f,0.42f,4.0f);     // copper [base,variable,repeat,color cycle]
    109109vec3 copper_mask_color(4.0f,4.0f,4.0f);         // color [red,green,blue]
    110 vec3 color_filter(0.9f,0.95f,0.85f);            // color filter [red,green,blue]
    111 vec4 color_color(1.0f,1.25f,0.1f,0.4f);         // color modifier [brightness,contrast,level,grayscale]
    112 vec2 noise_offset(1.0f,1.0f);                   // random line [horizontal,vertical]
    113 float noise_noise = 0.15f;                      // noise
    114 vec3 noise_retrace(1.0f,1.0f,0.5f);             // retrace [strength,length,speed]
    115 vec2 postfx_deform(0.8f,0.48f);                 // deformation [ratio,zoom]
    116 float postfx_vignetting = 0.5f;                 // vignetting strength
    117 float postfx_aberration = 4.0f;                 // chromatic aberration
    118 vec4 postfx_ghost1(1.0f,0.0f,0.0f,-0.25f);      // ghost picture 1 [position x,position y,position z,strength]
    119 vec4 postfx_ghost2(1.5f,0.0f,0.0f,0.25f);       // ghost picture 2 [position x,position y,position z,strength]
    120 vec4 postfx_glass(8.0f,0.25f,0.75f,0.2f);       // glass [depth,thickness,strength,deform ratio]
    121 vec4 postfx_moire_h(0.75f,-0.25f,0.0f,1.0f);    // vertical moire [base,variable,repeat,shift]
    122 vec4 postfx_moire_v(0.75f,-0.25f,1.0f,2.0f);    // horizontal moire [base,variable,repeat,shift]
     110vec3 color_filter(1.0f,1.0f,1.0f);              // color filter [red,green,blue]
     111vec4 color_color(1.0f,1.0f,0.0f,0.0f);          // color modifier [brightness,contrast,level,grayscale]
     112vec2 noise_offset(0.0f,0.0f);                   // random line [horizontal,vertical]
     113float noise_noise = 0.0f;                       // noise
     114vec3 noise_retrace(0.0f,0.0f,0.0f);             // retrace [strength,length,speed]
     115vec2 postfx_deform(0.0f,0.5f);                  // deformation [ratio,zoom]
     116float postfx_vignetting = 0.0f;                 // vignetting strength
     117float postfx_aberration = 0.0f;                 // chromatic aberration
     118vec4 postfx_ghost1(0.0f,0.0f,0.0f,0.0f);        // ghost picture 1 [position x,position y,position z,strength]
     119vec4 postfx_ghost2(0.0f,0.0f,0.0f,0.0f);        // ghost picture 2 [position x,position y,position z,strength]
     120vec4 postfx_glass(8.0f,0.0f,0.0f,0.0f);         // glass [depth,thickness,strength,deform ratio]
     121vec4 postfx_moire_h(1.0f,0.0f,0.0f,0.0f);       // vertical moire [base,variable,repeat,shift]
     122vec4 postfx_moire_v(1.0f,0.0f,0.0f,0.0f);       // horizontal moire [base,variable,repeat,shift]
    123123vec4 postfx_scanline_h(1.0f,0.0f,0.0f,0.0f);    // vertical scanline [base,variable,repeat,shift]
    124 vec4 postfx_scanline_v(0.75f,-0.25f,2.0f,0.0f); // horizontal scanline [base,variable,repeat,shift]
    125 vec3 postfx_corner(0.0f,0.8f,0.96f);            // corner [width,radius,blur]
    126 vec4 mirror(0.95f,0.9f,0.4f,4.0f);              // mirror [width,height,strength,ratio]
    127 vec4 radial(4.0f,0.9f,16,0.25f);                // radial [distance,fade ratio,iteration,strength]
     124vec4 postfx_scanline_v(1.0f,0.0f,0.0f,0.0f);    // horizontal scanline [base,variable,repeat,shift]
     125vec3 postfx_corner(0.0f,1.0f,1.0f);             // corner [width,radius,blur]
     126vec4 mirror(0.0f,0.0f,0.0f,1.0f);               // mirror [width,height,strength,ratio]
     127vec4 radial(4.0f,0.9f,16,0.0f);                 // radial [distance,fade ratio,iteration,strength]
    128128/* theme variable */
    129 int theme_i = 0;                // current theme
    130 int theme_n = 2;                // theme number
    131 int theme_var_n = 79;           // var number
     129int theme_i = 1;                // current theme
     130const int theme_n = 2;          // theme number
     131const int theme_var_n = 79;     // var number
    132132/* setup variable */
    133133bool setup_switch = false;      // switch [option/item]
    … …  
    274274    };
    275275
     276vec4 setup_var[]={ // setup variable [start,end,step,value]
     277vec4(0), /* main */
     278    vec4(1,  8, 1, ratio_2d.x),
     279    vec4(1,  8, 1, ratio_2d.y),
     280    vec4(0, 16, 1, border.x),
     281    vec4(0, 16, 1, border.y),
     282    vec4(0),
     283    vec4(0),
     284    vec4(0),
     285    vec4(0),
     286vec4(0), /* remanence */
     287    vec4(0, 1, 1, 1),
     288    vec4(0.0f, 1.0f, 0.1f, buffer.x),
     289    vec4(0.0f, 1.0f, 0.1f, buffer.y),
     290    vec4(0.0f, 1.0f, 0.1f, remanence.x),
     291    vec4(0.0f, 1.0f, 0.1f, remanence.y),
     292    vec4(0),
     293    vec4(0),
     294    vec4(0),
     295vec4(0), /* glow */
     296    vec4(0, 1, 1, 1),
     297    vec4(0.0f, 1.0f, 0.1f, glow_mix.x),
     298    vec4(0.0f, 1.0f, 0.1f, glow_mix.y),
     299    vec4(0.0f, 4.0f, 0.1f, glow_large.x),
     300    vec4(0.0f, 4.0f, 0.1f, glow_large.y),
     301    vec4(0.0f, 2.0f, 0.1f, glow_small.x),
     302    vec4(0.0f, 2.0f, 0.1f, glow_small.y),
     303    vec4(0),
     304vec4(0), /* blur */
     305    vec4(0, 1, 1, 1),
     306    vec4(0, 2, 0.05f, blur.x),
     307    vec4(0, 2, 0.05f, blur.y),
     308    vec4(0),
     309    vec4(0),
     310    vec4(0),
     311    vec4(0),
     312    vec4(0),
     313vec4(0), /* screen */
     314    vec4(0, 1, 1, 1),
     315    vec4(0.0f, 1.0f, 0.05f, postfx_deform.x),
     316    vec4(0.2f, 0.7f, 0.01f, postfx_deform.y),
     317    vec4(0.0f, 4.0f, 0.10f, postfx_corner.x),
     318    vec4(0.0f, 1.0f, 0.05f, postfx_corner.y),
     319    vec4(0.8f, 1.0f, 0.01f, postfx_corner.z),
     320    vec4(0.0f, 1.0f, 0.10f, postfx_vignetting),
     321    vec4(0),
     322vec4(0), /* copper */
     323    vec4(0, 1, 1, 1),
     324    vec4(0.0f, 1.0f, 0.05f, copper_copper.x),
     325    vec4(0.0f, 1.0f, 0.05f, copper_copper.y),
     326    vec4(0.0f, 1.0f, 0.02f, copper_copper.z),
     327    vec4(1.0f, 8.0f, 0.25f, copper_copper.w),
     328    vec4(0.0f, 4.0f, 0.25f, copper_mask_color.x),
     329    vec4(0.0f, 4.0f, 0.25f, copper_mask_color.y),
     330    vec4(0.0f, 4.0f, 0.25f, copper_mask_color.z),
     331vec4(0), /* color */
     332    vec4( 0.0f, 1.0f, 0.05f, color_filter.x),
     333    vec4( 0.0f, 1.0f, 0.05f, color_filter.y),
     334    vec4( 0.0f, 1.0f, 0.05f, color_filter.z),
     335    vec4( 0.0f, 2.0f, 0.05f, color_color.x),
     336    vec4( 0.0f, 2.0f, 0.05f, color_color.y),
     337    vec4(-1.0f, 1.0f, 0.05f, color_color.z),
     338    vec4( 0.0f, 1.0f, 0.05f, color_color.w),
     339    vec4( 0.0f, 8.0f, 0.50f, postfx_aberration),
     340vec4(0), /* noise */
     341    vec4(0, 1, 1, 1),
     342    vec4(0.0f, 4.0f, 0.50f, noise_offset.x),
     343    vec4(0.0f, 4.0f, 0.50f, noise_offset.y),
     344    vec4(0.0f, 0.5f, 0.05f, noise_noise),
     345    vec4(0.0f, 4.0f, 0.25f, noise_retrace.x),
     346    vec4(0.0f, 8.0f, 0.50f, noise_retrace.y),
     347    vec4(0.0f, 4.0f, 0.25f, noise_retrace.z),
     348    vec4(0),
     349vec4(0), /* ghost */
     350    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.x),
     351    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.y),
     352    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.z),
     353    vec4(-1.0f, 1.0f, 0.05f, postfx_ghost1.w),
     354    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.x),
     355    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.y),
     356    vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.z),
     357    vec4(-1.0f, 1.0f, 0.05f, postfx_ghost2.w),
     358vec4(0), /* glass */
     359    vec4(0.0f, 16.0f, 0.50f, postfx_glass.x),
     360    vec4(0.0f,  1.0f, 0.05f, postfx_glass.y),
     361    vec4(0.0f,  2.0f, 0.05f, postfx_glass.z),
     362    vec4(0.0f,  1.0f, 0.05f, postfx_glass.w),
     363    vec4(0),
     364    vec4(0),
     365    vec4(0),
     366    vec4(0),
     367vec4(0), /* moire */
     368    vec4( 0.5f, 1.0f, 0.05f, postfx_moire_h.x),
     369    vec4(-0.5f, 0.5f, 0.05f, postfx_moire_h.y),
     370    vec4( 0.0f, 4.0f, 0.50f, postfx_moire_h.z),
     371    vec4( 0.0f, 4.0f, 0.50f, postfx_moire_h.w),
     372    vec4( 0.5f, 1.0f, 0.05f, postfx_moire_v.x),
     373    vec4(-0.5f, 0.5f, 0.05f, postfx_moire_v.y),
     374    vec4( 0.0f, 4.0f, 0.50f, postfx_moire_v.z),
     375    vec4( 0.0f, 4.0f, 0.50f, postfx_moire_v.w),
     376vec4(0), /* scanline */
     377    vec4( 0.5f, 1.0f, 0.05f, postfx_scanline_h.x),
     378    vec4(-0.5f, 0.5f, 0.05f, postfx_scanline_h.y),
     379    vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_h.z),
     380    vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_h.w),
     381    vec4( 0.5f, 1.0f, 0.05f, postfx_scanline_v.x),
     382    vec4(-0.5f, 0.5f, 0.05f, postfx_scanline_v.y),
     383    vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.z),
     384    vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.w),
     385vec4(0), /* mirror */
     386    vec4(0, 1, 1, 1),
     387    vec4(0.0f, 2.0f, 0.05f, mirror.x),
     388    vec4(0.0f, 2.0f, 0.05f, mirror.y),
     389    vec4(0.0f, 1.0f, 0.05f, mirror.z),
     390    vec4(1.0f, 8.0f, 1.00f, mirror.w),
     391    vec4(0),
     392    vec4(0),
     393    vec4(0),
     394vec4(0), /* radial blur */
     395    vec4(0, 1, 1, 1),
     396    vec4(2.0f, 8.0f, 0.25f, radial.x),
     397    vec4(0.8f, 1.0f, 0.01f, radial.y),
     398    vec4(2.0f,32.0f, 2.00f, radial.z),
     399    vec4(0.0f, 1.0f, 0.05f, radial.w),
     400    vec4(0),
     401    vec4(0),
     402    vec4(0),
     403vec4(0) /* ? */
     404};
     405
    276406float theme_var[]={
     407    // DO LIKE SETUP TO KEEP KEY
    277408    /* default */
     409    1,1,                      // ratio_2d
     410    0,0,                      // border
     411    1.0f,0.8f,                // buffer
     412    0.0f,0.0f,                // remanence
     413    0.5f,0.0f,                // glow_mix
     414    0.0f,0.0f,                // glow_large
     415    0.0f,0.0f,                // glow_small
     416    0.0f,0.0f,                // blur
     417    0.0f,0.5f,                // postfx_deform
     418    0.0f,1.0f,1.0f,           // postfx_corner
     419    0.0f,                     // postfx_vignetting
     420    0.75f,0.25f,0.42f,4.0f,   // copper_copper
     421    4.0f,4.0f,4.0f,           // copper_mask_color
     422    1.0f,1.0f,1.0f,           // color_filter
     423    1.0f,1.0f,0.0f,0.0f,      // color_color
     424    0.0f,                     // postfx_aberration
     425    0.0f,0.0f,                // noise_offset
     426    0.0f,                     // noise_noise
     427    0.0f,0.0f,0.0f,           // noise_retrace
     428    0.0f,0.0f,0.0f,0.0f,      // postfx_ghost1
     429    0.0f,0.0f,0.0f,0.0f,      // postfx_ghost2
     430    8.0f,0.0f,0.0f,0.0f,      // postfx_glass
     431    1.0f,0.0f,0.0f,0.0f,      // postfx_moire_h
     432    1.0f,0.0f,0.0f,0.0f,      // postfx_moire_v
     433    1.0f,0.0f,0.0f,0.0f,      // postfx_scanline_h
     434    1.0f,0.0f,0.0f,0.0f,      // postfx_scanline_v
     435    0.0f,0.0f,0.0f,1.0f,      // mirror
     436    4.0f,0.9f,16,0.0f,        // radial
     437    /* crt */
    278438    2,3,                      // ratio_2d
    279439    2,1,                      // border
    … …  
    304464    0.95f,0.9f,0.4f,4.0f,     // mirror
    305465    4.0f,0.9f,16,0.25f,       // radial
    306     /* crt */
    307466    /* green screen */
    308467    /* granpa tv */
    … …  
    343502}
    344503
    345 vec4 setup_var[]={ // setup variable [start,end,step,value]
    346     vec4(0), /* main */
    347         vec4(1,  8, 1, ratio_2d.x),
    348         vec4(1,  8, 1, ratio_2d.y),
    349         vec4(0, 16, 1, border.x),
    350         vec4(0, 16, 1, border.y),
    351         vec4(0),
    352         vec4(0),
    353         vec4(0),
    354         vec4(0),
    355     vec4(0), /* remanence */
    356         vec4(0, 1, 1, 1),
    357         vec4(0.0f, 1.0f, 0.1f, buffer.x),
    358         vec4(0.0f, 1.0f, 0.1f, buffer.y),
    359         vec4(0.0f, 1.0f, 0.1f, remanence.x),
    360         vec4(0.0f, 1.0f, 0.1f, remanence.y),
    361         vec4(0),
    362         vec4(0),
    363         vec4(0),
    364     vec4(0), /* glow */
    365         vec4(0, 1, 1, 1),
    366         vec4(0.0f, 1.0f, 0.1f, glow_mix.x),
    367         vec4(0.0f, 1.0f, 0.1f, glow_mix.y),
    368         vec4(0.0f, 4.0f, 0.1f, glow_large.x),
    369         vec4(0.0f, 4.0f, 0.1f, glow_large.y),
    370         vec4(0.0f, 2.0f, 0.1f, glow_small.x),
    371         vec4(0.0f, 2.0f, 0.1f, glow_small.y),
    372         vec4(0),
    373     vec4(0), /* blur */
    374         vec4(0, 1, 1, 1),
    375         vec4(0, 2, 0.05f, blur.x),
    376         vec4(0, 2, 0.05f, blur.y),
    377         vec4(0),
    378         vec4(0),
    379         vec4(0),
    380         vec4(0),
    381         vec4(0),
    382     vec4(0), /* screen */
    383         vec4(0, 1, 1, 1),
    384         vec4(0.0f, 1.0f, 0.05f, postfx_deform.x),
    385         vec4(0.2f, 0.7f, 0.01f, postfx_deform.y),
    386         vec4(0.0f, 4.0f, 0.10f, postfx_corner.x),
    387         vec4(0.0f, 1.0f, 0.05f, postfx_corner.y),
    388         vec4(0.8f, 1.0f, 0.01f, postfx_corner.z),
    389         vec4(0.0f, 1.0f, 0.10f, postfx_vignetting),
    390         vec4(0),
    391     vec4(0), /* copper */
    392         vec4(0, 1, 1, 1),
    393         vec4(0.0f, 1.0f, 0.05f, copper_copper.x),
    394         vec4(0.0f, 1.0f, 0.05f, copper_copper.y),
    395         vec4(0.0f, 1.0f, 0.02f, copper_copper.z),
    396         vec4(1.0f, 8.0f, 0.25f, copper_copper.w),
    397         vec4(0.0f, 4.0f, 0.25f, copper_mask_color.x),
    398         vec4(0.0f, 4.0f, 0.25f, copper_mask_color.y),
    399         vec4(0.0f, 4.0f, 0.25f, copper_mask_color.z),
    400     vec4(0), /* color */
    401         vec4( 0.0f, 1.0f, 0.05f, color_filter.x),
    402         vec4( 0.0f, 1.0f, 0.05f, color_filter.y),
    403         vec4( 0.0f, 1.0f, 0.05f, color_filter.z),
    404         vec4( 0.0f, 2.0f, 0.05f, color_color.x),
    405         vec4( 0.0f, 2.0f, 0.05f, color_color.y),
    406         vec4(-1.0f, 1.0f, 0.05f, color_color.z),
    407         vec4( 0.0f, 1.0f, 0.05f, color_color.w),
    408         vec4( 0.0f, 8.0f, 0.50f, postfx_aberration),
    409     vec4(0), /* noise */
    410         vec4(0, 1, 1, 1),
    411         vec4(0.0f, 4.0f, 0.50f, noise_offset.x),
    412         vec4(0.0f, 4.0f, 0.50f, noise_offset.y),
    413         vec4(0.0f, 0.5f, 0.05f, noise_noise),
    414         vec4(0.0f, 4.0f, 0.25f, noise_retrace.x),
    415         vec4(0.0f, 8.0f, 0.50f, noise_retrace.y),
    416         vec4(0.0f, 4.0f, 0.25f, noise_retrace.z),
    417         vec4(0),
    418     vec4(0), /* ghost */
    419         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.x),
    420         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.y),
    421         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost1.z),
    422         vec4(-1.0f, 1.0f, 0.05f, postfx_ghost1.w),
    423         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.x),
    424         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.y),
    425         vec4(-2.0f, 2.0f, 0.10f, postfx_ghost2.z),
    426         vec4(-1.0f, 1.0f, 0.05f, postfx_ghost2.w),
    427     vec4(0), /* glass */
    428         vec4(0.0f, 16.0f, 0.50f, postfx_glass.x),
    429         vec4(0.0f,  1.0f, 0.05f, postfx_glass.y),
    430         vec4(0.0f,  2.0f, 0.05f, postfx_glass.z),
    431         vec4(0.0f,  1.0f, 0.05f, postfx_glass.w),
    432         vec4(0),
    433         vec4(0),
    434         vec4(0),
    435         vec4(0),
    436     vec4(0), /* moire */
    437         vec4( 0.5f, 1.0f, 0.05f, postfx_moire_h.x),
    438         vec4(-0.5f, 0.5f, 0.05f, postfx_moire_h.y),
    439         vec4( 0.0f, 4.0f, 0.50f, postfx_moire_h.z),
    440         vec4( 0.0f, 4.0f, 0.50f, postfx_moire_h.w),
    441         vec4( 0.5f, 1.0f, 0.05f, postfx_moire_v.x),
    442         vec4(-0.5f, 0.5f, 0.05f, postfx_moire_v.y),
    443         vec4( 0.0f, 4.0f, 0.50f, postfx_moire_v.z),
    444         vec4( 0.0f, 4.0f, 0.50f, postfx_moire_v.w),
    445     vec4(0), /* scanline */
    446         vec4( 0.5f, 1.0f, 0.05f, postfx_scanline_h.x),
    447         vec4(-0.5f, 0.5f, 0.05f, postfx_scanline_h.y),
    448         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_h.z),
    449         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_h.w),
    450         vec4( 0.5f, 1.0f, 0.05f, postfx_scanline_v.x),
    451         vec4(-0.5f, 0.5f, 0.05f, postfx_scanline_v.y),
    452         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.z),
    453         vec4( 0.0f, 4.0f, 0.50f, postfx_scanline_v.w),
    454     vec4(0), /* mirror */
    455         vec4(0, 1, 1, 1),
    456         vec4(0.0f, 2.0f, 0.05f, mirror.x),
    457         vec4(0.0f, 2.0f, 0.05f, mirror.y),
    458         vec4(0.0f, 1.0f, 0.05f, mirror.z),
    459         vec4(1.0f, 8.0f, 1.00f, mirror.w),
    460         vec4(0),
    461         vec4(0),
    462         vec4(0),
    463     vec4(0), /* radial blur */
    464         vec4(0, 1, 1, 1),
    465         vec4(2.0f, 8.0f, 0.25f, radial.x),
    466         vec4(0.8f, 1.0f, 0.01f, radial.y),
    467         vec4(2.0f,32.0f, 2.00f, radial.z),
    468         vec4(0.0f, 1.0f, 0.05f, radial.w),
    469         vec4(0),
    470         vec4(0),
    471         vec4(0),
    472     vec4(0) /* ? */
    473     };
     504void Render::SetupVar()
     505{
     506}
    474507
    475508void Render::UpdateVar()
    … …  
    525558    m_shader_radial = (setup_var[k].w == 1) ? true : false; k++;
    526559    radial = vec4(setup_var[k].w, setup_var[k + 1].w, setup_var[k + 2].w, setup_var[k + 3].w); k += 4;
    527     UpdateSize();
    528560}
    529561
    … …  
    720752int Render::CreateGLWindow()
    721753{
     754    InitVar();
     755    SetupVar();
     756    UpdateVar();
    722757    UpdateSize();
    723758    InitDraw();
    724     InitVar();
    725     UpdateSize();
    726759    return true;
    727760}
    … …  
    851884        sync_flag = true;
    852885        sync_angle = main_angle;
    853 
    854886        if (m_fps_debug)
    855887        {
    … …  
    857889            m_fps_debug = NULL;
    858890        }
    859 
    860891        if (g_setup)
    861892        {
    … …  
    876907        m_shader_radial = !m_shader_radial;
    877908    }
    878    if (Input::WasPressed(Key::Tab))
     909    if (Input::WasPressed(Key::F4))
     910    {
     911        theme_i--;
     912        if(theme_i < 0) theme_i = theme_n - 1;
     913        InitVar();
     914        SetupVar();
     915        UpdateVar();
     916        UpdateSize();
     917    }
     918    if (Input::WasPressed(Key::F5))
     919    {
     920        theme_i++;
     921        if(theme_i > theme_n) theme_i = 0;
     922        InitVar();
     923        SetupVar();
     924        UpdateVar();
     925        UpdateSize();
     926    }
     927    if (Input::WasPressed(Key::Tab))
    879928    {
    880929        if (g_setup)
    … …  
    10901139            if (setup_var[setup_item_key].w < setup_var[setup_item_key].x) setup_var[setup_item_key].w = setup_var[setup_item_key].x;
    10911140            UpdateVar();
     1141            UpdateSize();
    10921142        }
    10931143    }
    … …  
    10991149            if (setup_var[setup_item_key].w > setup_var[setup_item_key].y) setup_var[setup_item_key].w = setup_var[setup_item_key].y;
    11001150            UpdateVar();
     1151            UpdateSize();
    11011152        }
    11021153    }
    … …  
    11071158            setup_var[setup_item_key].w = setup_var[setup_item_key].x;
    11081159            UpdateVar();
     1160            UpdateSize();
    11091161        }
    11101162    }
    … …  
    11151167            setup_var[setup_item_key].w = setup_var[setup_item_key].y;
    11161168            UpdateVar();
     1169            UpdateSize();
    11171170        }
    11181171    }

  • trunk/tools/neercs/video/render.h

    r2043 r2045  
    2929    void Shader();
    3030    void InitVar();
     31    void SetupVar();
    3132    void UpdateVar();
    3233    void UpdateSize();
Note: See TracChangeset for help on using the changeset viewer.