Add new sprites and normal maps

raatmarien · May 14, 2015 · ab9fefc · ab9fefc
1 parent 6373992
commit ab9fefc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/light.cpp b/light.cpp
@@ -81,8 +81,8 @@ void LightManager::initialize(const char* lightMapFilePath
 
     Vector3f falloff;
     falloff.x = 1.0f; // Constant falloff
-    falloff.y = 0.0015f; // Linear falloff
-    falloff.z = 0.0000012f; // Quadratic falloff
+    falloff.y = 0.0005f; // Linear falloff
+    falloff.z = 0.0000002f; // Quadratic falloff
 
     standardLightTexture
         = generateLightTexture(500, Color(255,255,255,255)
@@ -152,7 +152,7 @@ void LightManager::draw(RenderTexture* diffuse
             dLightPos.x /= (float) viewRect.width;
             dLightPos.y /= (float) viewRect.height;
             lightShader.setParameter("lightPos", Vector3f(dLightPos.x, dLightPos.y
-                                                          , 0.1f));
+                                                          , 0.3f));
             RenderStates states;
             states.shader = &lightShader;
             states.blendMode = BlendAdd;

diff --git a/main.cpp b/main.cpp
@@ -253,8 +253,8 @@ void draw(RenderWindow* window) {
 }
 
 void loadSprites() {
-    spritesMap.loadFromFile("sprites/spriteMap4.png");
-    normalTiles.loadFromFile("normalmaps/tilesNormal.png");
+    spritesMap.loadFromFile("sprites/spriteMap5.png");
+    normalTiles.loadFromFile("normalmaps/tilesNormal2.png");
     playerSprite.loadFromFile("sprites/player.png");
     mousePointerTexture.loadFromFile("sprites/mousePointer.png");
 }
diff --git a/normalmaps/tilesNormal2.png b/normalmaps/tilesNormal2.png
diff --git a/sprites/spriteMap5.png b/sprites/spriteMap5.png