Changeset 1906


Ignore:
Timestamp:
Sep 11, 2012, 1:09:35 AM (7 years ago)
Author:
rez
Message:

NEERCS: updated theme (more readable screen)

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

Legend:

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

    r1905 r1906  
    2727uniform vec3 corner;
    2828uniform float sync;
     29uniform float beat;
    2930
    3031vec2 screen(in vec2 p,in float radius)
    3132    {
    32     float d=deform.x+sync*0.0625;
     33    float d=deform.x+sync*0.0625+beat*0.0375;
    3334    return p*(1.5-(radius*cos(p.x*d)+radius*cos(p.y*d)))-0.5;
    3435    }
  • trunk/tools/neercs/video/render.cpp

    r1903 r1906  
    9696vec4 copper(0.125,0.125,32,64); // copper [base,variable,repeat x,repeat y]
    9797vec3 color_filter(0.9f,0.9f,1.0f);    // color filter [red,green,blue]
    98 vec3 color_color(1.2f,1.1f,0.25f);    // color modifier [brightness,contrast,grayscale]
     98vec3 color_color(1.0f,1.0f,0.40f);    // color modifier [brightness,contrast,grayscale]
    9999vec2 noise_offset(2.0f,2.0f);         // random line [horizontal,vertical]
    100100float noise_noise = 0.25f;            // noise
     
    103103float postfx_vignetting = -0.5f;      // vignetting strength
    104104float postfx_aberration = 3.0f;       // chromatic aberration
    105 vec4 postfx_ghost1(0.01f,0.0f,0.1f,-0.25f);     // ghost picture 1 [position x,position y,position z,strength]
    106 vec4 postfx_ghost2(0.02f,0.0f,0.1f,0.25f);      // ghost picture 2 [position x,position y,position z,strength]
     105vec4 postfx_ghost1(0.0f,0.0f,-2.0f,-0.15f);     // ghost picture 1 [position x,position y,position z,strength]
     106vec4 postfx_ghost2(0.0f,0.0f,2.0f,0.15f);       // ghost picture 2 [position x,position y,position z,strength]
    107107vec4 postfx_moire_h(0.75f,-0.25f,0.0f,1.0f);    // vertical moire [base,variable,repeat x,repeat y]
    108108vec4 postfx_moire_v(0.75f,-0.25f,1.0f,1.5f);    // horizontal moire [base,variable,repeat x,repeat y]
     
    435435              shader_postfx_scanline_v,
    436436              shader_postfx_corner,
    437               shader_postfx_sync;
     437              shader_postfx_sync,
     438              shader_postfx_beat;
    438439
    439440FrameBuffer *fbo_back, *fbo_front, *fbo_buffer;
     
    528529    shader_postfx_corner = shader_postfx->GetUniformLocation("corner");
    529530    shader_postfx_sync = shader_postfx->GetUniformLocation("sync");
     531    shader_postfx_beat = shader_postfx->GetUniformLocation("beat");
    530532
    531533    return true;
     
    663665    if (Input::WasPressed(Key::F2))
    664666    {
    665         m_polygon = !m_polygon;
    666         polygon_fillmode = (m_polygon)?GL_FILL:GL_LINE;
    667         glPolygonMode(GL_FRONT, polygon_fillmode);
     667        m_shader_glow = !m_shader_glow;
     668        m_shader_blur = !m_shader_blur;
     669        m_shader_remanency = !m_shader_remanency;
     670        m_shader_copper = !m_shader_copper;
     671        m_shader_color = !m_shader_color;
     672        m_shader_noise = !m_shader_noise;
     673        m_shader_postfx = !m_shader_postfx;
     674        //m_polygon = !m_polygon;
     675        //polygon_fillmode = (m_polygon)?GL_FILL:GL_LINE;
     676        //glPolygonMode(GL_FRONT, polygon_fillmode);
    668677    }
    669678   if (Input::WasPressed(Key::Tab))
     
    828837    if (Input::WasPressed(Key::Return))
    829838    {
    830         flash_flag = true;
    831         flash_angle = main_angle;
     839        beat_flag = true;
     840        beat_angle = main_angle;
     841        //flash_flag = true;
     842        //flash_angle = main_angle;
    832843    }
    833844
     
    11171128        shader_postfx->SetUniform(shader_postfx_corner, postfx_corner);
    11181129        shader_postfx->SetUniform(shader_postfx_sync, (float)fabs(sync_value*cosf((main_angle-sync_angle)*6.0f)));
     1130        shader_postfx->SetUniform(shader_postfx_beat, (float)fabs(beat_value*cosf((main_angle-beat_angle)*6.0f)));
    11191131        TraceQuad();
    11201132        shader_postfx->Unbind();
Note: See TracChangeset for help on using the changeset viewer.