From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 2 Nov 2015 13:52:36 +0000 (-0500)
Subject: Added new project for lighting test
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=07d73ea992641198a887f000bf44b874c8e11574;p=clyne%2Fgamedev.git

Added new project for lighting test
---

07d73ea992641198a887f000bf44b874c8e11574
diff --cc include/common.h
index 0e4373b,25d5abf..b0ffec7
--- a/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 848d80f,bea3fd3..e0d195f
--- a/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