Advertisement
robn

Untitled

Sep 29th, 2011
139
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 1.20 KB | None | 0 0
  1. diff --git a/src/LmrModel.cpp b/src/LmrModel.cpp
  2. index 80ebbb2..a2851fb 100644
  3. --- a/src/LmrModel.cpp
  4. +++ b/src/LmrModel.cpp
  5. @@ -233,6 +233,7 @@ SHADER_CLASS_END()
  6.  
  7.  static LmrShader *s_sunlightShader[4];
  8.  static LmrShader *s_pointlightShader[4];
  9. +static Render::Shader *s_simpleShader;
  10.  static float s_scrWidth = 800.0f;
  11.  static bool s_buildDynamic;
  12.  static FontManager s_fontManager;
  13. @@ -489,7 +490,7 @@ public:
  14.                         Render::UnbindAllBuffers();
  15.  
  16.                         glDisable(GL_LIGHTING);
  17. -                       Render::State::UseProgram(Render::simpleShader);
  18. +                       Render::State::UseProgram(s_simpleShader);
  19.                         RenderThrusters(rstate, cameraPos, params);
  20.                 }
  21.         }
  22. @@ -2992,6 +2993,7 @@ void LmrModelCompilerInit()
  23.         s_pointlightShader[1] = new LmrShader("model-pointlit", "#define NUM_LIGHTS 2\n");
  24.         s_pointlightShader[2] = new LmrShader("model-pointlit", "#define NUM_LIGHTS 3\n");
  25.         s_pointlightShader[3] = new LmrShader("model-pointlit", "#define NUM_LIGHTS 4\n");
  26. +       s_simpleShader = new Render::Shader("simple", "");
  27.  
  28.         PiVerify(s_font = s_fontManager.GetVectorFont("WorldFont"));
  29.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement