From 6b6d0137bb3eee0fccdfe4b4b458b051bac95f6e Mon Sep 17 00:00:00 2001 From: Benlitz Date: Sat, 14 Sep 2013 17:52:04 +0000 Subject: [PATCH] fixed more projects regarding the shader attribute change --- demos/tutorial/03_noise.cpp | 2 +- demos/tutorial/04_texture.cpp | 2 +- demos/tutorial/07_input.cpp | 6 ++---- demos/tutorial/12_voronoi.cpp | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/demos/tutorial/03_noise.cpp b/demos/tutorial/03_noise.cpp index 35531e19..9a3d96be 100644 --- a/demos/tutorial/03_noise.cpp +++ b/demos/tutorial/03_noise.cpp @@ -45,7 +45,7 @@ public: if (!m_ready) { m_shader = Shader::Create(LOLFX_RESOURCE_NAME(03_noise)); - m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0); + m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0); m_time_uni = m_shader->GetUniformLocation("u_Time"); m_vdecl = new VertexDeclaration(VertexStream(VertexUsage::Position)); diff --git a/demos/tutorial/04_texture.cpp b/demos/tutorial/04_texture.cpp index 0ae3c385..8a6e614c 100644 --- a/demos/tutorial/04_texture.cpp +++ b/demos/tutorial/04_texture.cpp @@ -75,7 +75,7 @@ public: m_texture = new Texture(ivec2(TEXTURE_WIDTH, 1), PixelFormat::Y_8); m_shader = Shader::Create(LOLFX_RESOURCE_NAME(04_texture)); - m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0); + m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0); m_texture_uni = m_shader->GetUniformLocation("u_Texture"); m_vdecl = new VertexDeclaration(VertexStream(VertexUsage::Position)); diff --git a/demos/tutorial/07_input.cpp b/demos/tutorial/07_input.cpp index bc12dd8c..342729ec 100644 --- a/demos/tutorial/07_input.cpp +++ b/demos/tutorial/07_input.cpp @@ -147,10 +147,8 @@ public: m_shader = Shader::Create(LOLFX_RESOURCE_NAME(07_input)); m_mvp = m_shader->GetUniformLocation("in_Matrix"); - m_coord = m_shader->GetAttribLocation("in_Vertex", - VertexUsage::Position, 0); - m_color = m_shader->GetAttribLocation("in_Color", - VertexUsage::Color, 0); + m_coord = m_shader->GetAttribLocation(VertexUsage::Position, 0); + m_color = m_shader->GetAttribLocation(VertexUsage::Color, 0); m_vdecl = new VertexDeclaration(VertexStream(VertexUsage::Position, diff --git a/demos/tutorial/12_voronoi.cpp b/demos/tutorial/12_voronoi.cpp index 08548943..77aa7bc3 100644 --- a/demos/tutorial/12_voronoi.cpp +++ b/demos/tutorial/12_voronoi.cpp @@ -89,7 +89,7 @@ public: m_vbo->Unlock(); m_screen_shader = Shader::Create(LOLFX_RESOURCE_NAME(12_texture_to_screen)); - m_screen_coord = m_screen_shader->GetAttribLocation("in_position", VertexUsage::Position, 0); + m_screen_coord = m_screen_shader->GetAttribLocation(VertexUsage::Position, 0); m_screen_texture = m_screen_shader->GetUniformLocation("in_texture"); for (int i = 0; i < MaxFboType; ++i) @@ -102,7 +102,7 @@ public: m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_texture"); m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_source_point"); m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_screen_res"); - m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation("in_position", VertexUsage::Position, 0); + m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation(VertexUsage::Position, 0); } else if (i == VoronoiFbo) { @@ -110,7 +110,7 @@ public: m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_texture"); m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_step"); m_fbos[i].m3 << m_fbos[i].m2->GetUniformLocation("in_screen_res"); - m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation("in_position", VertexUsage::Position, 0); + m_fbos[i].m4 << m_fbos[i].m2->GetAttribLocation(VertexUsage::Position, 0); } else if (i == DistanceVoronoiFbo) {