Added new project for lighting test

diff --cc include/common.h
index 0e4373b0b325118a21dee8e6ba66810a7f58fd74,25d5abfabf2a555bdc763dc23fb17fc501bd127d..b0ffec76ed00865c1185089de49d413e86fdd597
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -23,6 -24,11 +24,12 @@@
  #include <string>
  #include <fstream>
  
++
+ #ifdef __WIN32__
+ typedef unsigned int uint;
+ #undef near
+ #endif
+ 
  /*
   *    Include file headers
  */

diff --cc main.cpp
index 848d80f5d75c1d8d9929047a20ef19b974091567,bea3fd375a4db72c5467c857857361a4078a8338..e0d195f780986bfd8d9c0f8181c814f10ef9b8d8
--- 1/main.cpp
--- 2/main.cpp
+++ b/main.cpp
@@@ -728,18 -742,6 +742,21 @@@ void render()
        currentWorld->draw(player);
  
        #ifdef SHADERS
++<<<<<<< Updated upstream
 +              glUseProgramObjectARB(shaderProgram);
 +              glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), 640,100);
 +              glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 1,1,1);
 +              glUniform1f(glGetUniformLocation(shaderProgram, "lightStrength"), 100 + (1000-(shade*10)));
 +              std::cout << 100 + (1000-(shade*10)) << std::endl;
 +              //glBlendFunc(GL_ONE, GL_ONE);
 +      #endif //SHADERS
 +
 +      glColor4ub(0,0,0,200);
 +      glRectf(offset.x-SCREEN_WIDTH/2,0,offset.x+SCREEN_WIDTH/2,SCREEN_HEIGHT);
 +
 +      #ifdef SHADERS
++=======
++>>>>>>> Stashed changes
                glUseProgramObjectARB(0);
        #endif //SHADERS