Changeset 2055 for trunk/tools


Ignore:
Timestamp:
Nov 2, 2012, 2:21:21 AM (8 years ago)
Author:
rez
Message:

neercs: fixed scanline, added a new theme

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

Legend:

Unmodified
Added
Removed
  • trunk/tools/neercs/video/postfx.lolfx

    r2051 r2055  
    9393    if(k>=r_p+r_h) r=mix(c4,c5,k*((k-(r_p+r_h))/(r_p-r_h)));
    9494
    95     c*=moire_h.x+moire_h.y*sin(z.y*float(angle.y*moire_h.z)/ratio_2d.y+PI); // moire h
    96     c*=moire_v.x+moire_v.y*sin(z.x*float(angle.x*moire_v.z)/ratio_2d.x+PI); // moire v
     95    //c*=moire_h.x+moire_h.y*sin(z.y*float(screen_size.y*moire_h.z)/ratio_2d.y)*sin(0.5+z.x*float(screen_size.x*moire_h.w)/ratio_2d.x); // moire h
     96    //c*=moire_v.x+moire_v.y*sin(z.x*float(screen_size.x*moire_v.z)/ratio_2d.x)*sin(0.5+z.y*float(screen_size.y*moire_v.w)/ratio_2d.y); // moire v
     97
     98    c*=moire_h.x+moire_h.y*sin(z.y*float(angle.y*moire_h.z)/ratio_2d.y)*sin(PI+z.x*float(screen_size.x*moire_h.w)/ratio_2d.x); // moire h
     99    c*=moire_v.x+moire_v.y*sin(z.x*float(angle.x*moire_v.z)/ratio_2d.x)*sin(PI+z.y*float(screen_size.y*moire_v.w)/ratio_2d.y); // moire v
    97100    c*=scanline_h.x+scanline_h.y*cos(z.y*float(angle.y*scanline_h.z+scanline_h.w)/ratio_2d.y); // scanline h
    98101    c*=scanline_v.x+scanline_v.y*cos(z.x*float(angle.x*scanline_v.z+scanline_v.w)/ratio_2d.x); // scanline v
  • trunk/tools/neercs/video/render.cpp

    r2051 r2055  
    130130/* theme variable */
    131131int theme_i = 0;           // current theme
    132 const int theme_n = 4;     // theme number
     132const int theme_n = 5;     // theme number
    133133int theme_var_key = 0;     // theme array key
    134134/* setup variable */
     
    529529    0,0,0,0,
    5305300,
    531     0.75f,0.0f,0.0f,0.0f,     // postfx_moire_h
    532     0.75f,-0.25f,0.25f,0.5f, // postfx_moire_v
     531    1.0f,0.0f,0.0f,0.0f,      // postfx_moire_h
     532    0.75f,-0.25f,0.25f,0.25f, // postfx_moire_v
    5335330,
    534534    1.0f,0.0f,0.0f,0.0f,      // postfx_scanline_h
     
    567567    0,
    5685680,
    569     1.0f,0.75f,0.0f,          // color_filter
    570     1.0f,1.25f,0.2f,1.0f,     // color_color
     569    1.0f,0.7f,0.0f,           // color_filter
     570    1.0f,1.25f,0.1f,1.0f,     // color_color
    571571    1.5f,                     // postfx_aberration
    5725720,
     
    579579    1.5f,0.0f,0.0f,0.25f,     // postfx_ghost2
    5805800,
    581     0.5f,0.15f,0.05f,         // postfx_gradient
    582     0.8f,0.8f,0.8f,           // postfx_gradient_color
     581    0.0f,0.25f,0.1f,          // postfx_gradient
     582    0.25f,0.5f,0.5f,          // postfx_gradient_color
    583583    0,0,
    5845840,
     
    603603    0,0,0,0,
    6046040,
    605     0.4f,0.6f,                // buffer
    606     0.4f,0.6f,                // remanence
     605    0.7f,0.3f,                // buffer
     606    0.5f,0.5f,                // remanence
    607607    0,0,0,0,
    6086080,
     
    6256250,
    626626    1.0f,1.0f,0.9f,           // color_filter
    627     1.0f,1.15f,0.1f,0.25f,    // color_color
    628     2.0f,                     // postfx_aberration
     627    1.15f,1.25f,-0.1f,0.25f,  // color_color
     628    3.0f,                     // postfx_aberration
    6296290,
    630630    0.0f,0.0f,                // noise_offset
     
    636636    0.0f,0.0f,0.0f,0.0f,      // postfx_ghost2
    6376370,
    638     0.5f,0.0f,0.0f ,          // postfx_gradient
    639     0.0f,0.0f,0.0f,           // postfx_gradient_color
     638    0.25f,0.5f,0.1f ,         // postfx_gradient
     639    0.7f,0.9f,1.0f,           // postfx_gradient_color
    640640    0,0,
    6416410,
     
    646646    1.0f,0.0f,0.0f,0.0f,      // postfx_moire_v
    6476470,
    648     0.80f,0.2f,0.75f,0.0f,    // postfx_scanline_h
    649     0.80f,0.2f,0.75f,0.0f,    // postfx_scanline_v
     648    0.75f,0.25f,0.7f,0.0f,    // postfx_scanline_h
     649    0.75f,0.25f,0.7f,0.0f,    // postfx_scanline_v
    6506500,
    651651    0.0f,0.0f,0.0f,1.0f,      // mirror
     
    655655    0,0,0,0,
    656656/* granpa tv */
     6570,
     658    2,2,                      // ratio_2d
     659    2,2,                      // border
     660    0,0,0,0,
     6610,
     662    0.2f,0.8f,                // buffer
     663    0.6f,0.4f,                // remanence
     664    0,0,0,0,
     6650,
     666    0.7f,0.3f,                // glow_mix
     667    3.0f,0.0f,                // glow_large
     668    1.5f,0.0f,                // glow_small
     669    0,0,
     6700,
     671    0.5f,0.5f,                // blur
     672    0,0,0,0,0,0,
     6730,
     674    1.0f,0.5f,                // postfx_deform
     675    0.1f,0.7f,0.84f,          // postfx_corner
     676    0.5f,                     // postfx_vignetting
     677    0,0,
     6780,
     679    0.75f,0.25f,0.42f,4.0f,   // copper_copper
     680    4.0f,4.0f,4.0f,           // copper_mask_color
     681    0,
     6820,
     683    0.8f,0.85f,0.75f,         // color_filter
     684    1.0f,1.1f,1.0f,0.0f,      // color_color
     685    4.0f,                     // postfx_aberration
     6860,
     687    1.0f,1.0f,                // noise_offset
     688    0.15f,                    // noise_noise
     689    1.0f,1.0f,0.5f,           // noise_retrace
     690    0,0,
     6910,
     692    1.0f,0.0f,0.0f,-0.25f,    // postfx_ghost1
     693    1.5f,0.0f,0.0f,0.25f,     // postfx_ghost2
     6940,
     695    0.5f,0.25f,0.05f,         // postfx_gradient
     696    0.9f,0.8f,0.5f,           // postfx_gradient_color
     697    0,0,
     6980,
     699    8.0f,0.25f,0.75f,0.2f,    // postfx_glass
     700    0,0,0,0,
     7010,
     702    1.0f,0.0f,0.0f,0.0f,      // postfx_moire_h
     703    0.75f,-0.25f,0.25f,0.25f, // postfx_moire_v
     7040,
     705    1.0f,0.0f,0.0f,0.0f,      // postfx_scanline_h
     706    0.75f,-0.25f,0.5f,0.0f,   // postfx_scanline_v
     7070,
     708    0.95f,0.9f,0.5f,4.0f,     // mirror
     709    0,0,0,0,
     7100,
     711    4.0f,0.9f,16,0.25f,       // radial
     712    0,0,0,0,
    657713/* intex system 4000 */
    6587140};
Note: See TracChangeset for help on using the changeset viewer.