Changeset 2277 for trunk/tutorialTweet

Timestamp:

Jan 25, 2013, 4:48:37 PM (8 years ago)

Author:

sam

Message:

build: hide LolFx external declarations behind macros.

Location:

trunk/tutorial

Files:

• 01_triangle.cpp (modified) (2 diffs)
• 02_cube.cpp (modified) (2 diffs)
• 03_noise.cpp (modified) (2 diffs)
• 04_texture.cpp (modified) (2 diffs)
• 08_fbo.cpp (modified) (2 diffs)
• 11_fractal.cpp (modified) (2 diffs)

trunk/tutorial/01_triangle.cpp

@@ -19 +19 @@
 using namespace lol;
 
-extern char const *lolfx_01_triangle;
+LOLFX_RESOURCE_DECLARE(01_triangle);
 
 class Triangle : public WorldEntity
@@ -38 +38 @@
         if (!m_ready)
         {
-            m_shader = Shader::Create(lolfx_01_triangle);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(01_triangle));
             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
 

trunk/tutorial/02_cube.cpp

@@ -19 +19 @@
 using namespace lol;
 
-extern char const *lolfx_02_cube;
+LOLFX_RESOURCE_DECLARE(02_cube);
 
 class Cube : public WorldEntity
@@ -75 +75 @@
         if (!m_ready)
         {
-            m_shader = Shader::Create(lolfx_02_cube);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(02_cube));
 
             m_mvp = m_shader->GetUniformLocation("in_Matrix");

trunk/tutorial/03_noise.cpp

@@ -19 +19 @@
 using namespace lol;
 
-extern char const *lolfx_03_noise;
+LOLFX_RESOURCE_DECLARE(03_noise);
 
 class NoiseDemo : public WorldEntity
@@ -45 +45 @@
         if (!m_ready)
         {
-            m_shader = Shader::Create(lolfx_03_noise);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(03_noise));
             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
             m_time_uni = m_shader->GetUniformLocation("u_Time");

trunk/tutorial/04_texture.cpp

@@ -21 +21 @@
 static int const TEXTURE_WIDTH = 256;
 
-extern char const *lolfx_04_texture;
+LOLFX_RESOURCE_DECLARE(04_texture);
 
 class TextureDemo : public WorldEntity
@@ -75 +75 @@
             m_texture = new Texture(ivec2(TEXTURE_WIDTH, 1), PixelFormat::A8R8G8B8);
 
-            m_shader = Shader::Create(lolfx_04_texture);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(04_texture));
             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
 

trunk/tutorial/08_fbo.cpp

@@ -19 +19 @@
 using namespace lol;
 
-extern char const *lolfx_08_fbo;
+LOLFX_RESOURCE_DECLARE(08_fbo);
 
 class FBO : public WorldEntity
@@ -57 +57 @@
         if (!m_ready)
         {
-            m_shader = Shader::Create(lolfx_08_fbo);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(08_fbo));
             m_coord = m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
             m_uni_flag = m_shader->GetUniformLocation("in_Flag");

trunk/tutorial/11_fractal.cpp

@@ -21 +21 @@
 using namespace lol;
 
-extern char const *lolfx_11_fractal;
+LOLFX_RESOURCE_DECLARE(11_fractal);
 
 class Fractal : public WorldEntity
@@ -449 +449 @@
             m_texture->SetData(&m_pixels[0]);
 
-            m_shader = Shader::Create(lolfx_11_fractal);
+            m_shader = Shader::Create(LOLFX_RESOURCE_NAME(11_fractal));
 
             m_vertexattrib = m_shader->GetAttribLocation("a_Vertex", VertexUsage::Position, 0);