Changeset 2923


Ignore:
Timestamp:
Sep 14, 2013, 7:52:04 PM (6 years ago)
Author:
benlitz
Message:

fixed more projects regarding the shader attribute change

Location:
trunk/demos
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/lol.js/lol.js.cpp

    r2816 r2923  
    275275            /* Shader */
    276276            m_scroll_shader = Shader::Create(LOLFX_RESOURCE_NAME(scroll));
    277             m_scroll_coord = m_scroll_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
     277            m_scroll_coord = m_scroll_shader->GetAttribLocation(VertexUsage::Position, 0);
    278278            m_scroll_texture = m_scroll_shader->GetUniformLocation("in_Texture");
    279279            m_scroll_time = m_scroll_shader->GetUniformLocation("u_Time");
    280280
    281281            m_blit_shader = Shader::Create(LOLFX_RESOURCE_NAME(blit));
    282             m_blit_coord = m_blit_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
     282            m_blit_coord = m_blit_shader->GetAttribLocation(VertexUsage::Position, 0);
    283283            m_blit_texture = m_blit_shader->GetUniformLocation("in_Texture");
    284284            m_blit_glyphs = m_blit_shader->GetUniformLocation("in_Glyphs");
     
    287287
    288288            m_noise_shader = Shader::Create(LOLFX_RESOURCE_NAME(noise));
    289             m_noise_coord = m_noise_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
     289            m_noise_coord = m_noise_shader->GetAttribLocation(VertexUsage::Position, 0);
    290290            m_noise_time = m_noise_shader->GetUniformLocation("u_Time");
    291291            m_noise_color1 = m_noise_shader->GetUniformLocation("u_Color1");
  • trunk/demos/tutorial/03_noise.cpp

    r2816 r2923  
    4646        {
    4747            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(03_noise));
    48             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
     48            m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0);
    4949            m_time_uni = m_shader->GetUniformLocation("u_Time");
    5050
  • trunk/demos/tutorial/04_texture.cpp

    r2822 r2923  
    7676
    7777            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(04_texture));
    78             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
     78            m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0);
    7979            m_texture_uni = m_shader->GetUniformLocation("u_Texture");
    8080
  • trunk/demos/tutorial/07_input.cpp

    r2841 r2923  
    148148
    149149            m_mvp = m_shader->GetUniformLocation("in_Matrix");
    150             m_coord = m_shader->GetAttribLocation("in_Vertex",
    151                                                   VertexUsage::Position, 0);
    152             m_color = m_shader->GetAttribLocation("in_Color",
    153                                                   VertexUsage::Color, 0);
     150            m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0);
     151            m_color = m_shader->GetAttribLocation(VertexUsage::Color, 0);
    154152
    155153            m_vdecl =
  • trunk/demos/tutorial/12_voronoi.cpp

    r2816 r2923  
    9090
    9191            m_screen_shader = Shader::Create(LOLFX_RESOURCE_NAME(12_texture_to_screen));
    92             m_screen_coord = m_screen_shader->GetAttribLocation("in_position", VertexUsage::Position, 0);
     92            m_screen_coord = m_screen_shader->GetAttribLocation(VertexUsage::Position, 0);
    9393            m_screen_texture = m_screen_shader->GetUniformLocation("in_texture");
    9494
     
    103103                    m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_source_point");
    104104                    m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_screen_res");
    105                     m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation("in_position", VertexUsage::Position, 0);
     105                    m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation(VertexUsage::Position, 0);
    106106                }
    107107                else if (i == VoronoiFbo)
     
    111111                    m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_step");
    112112                    m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_screen_res");
    113                     m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation("in_position", VertexUsage::Position, 0);
     113                    m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation(VertexUsage::Position, 0);
    114114                }
    115115                else if (i == DistanceVoronoiFbo)
Note: See TracChangeset for help on using the changeset viewer.