From 26719e004709010d3ee220bf82395c0bd70bcb0c Mon Sep 17 00:00:00 2001 From: Nehon Date: Mon, 14 Mar 2016 20:29:58 +0100 Subject: [PATCH] Fixed sign post material and adjusted ambient lights for the spot lights tests --- .../src/main/java/jme3test/light/TestSpotLight.java | 2 +- .../main/java/jme3test/light/TestSpotLightShadows.java | 2 +- .../main/java/jme3test/light/TestSpotLightTerrain.java | 2 +- .../src/main/resources/Models/Sign Post/Sign Post.j3m | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java index 8d29ae498..7a6f35c37 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java @@ -58,7 +58,7 @@ public class TestSpotLight extends SimpleApplication { Geometry lightMdl; public void setupLighting(){ AmbientLight al=new AmbientLight(); - al.setColor(ColorRGBA.White.mult(0.8f)); + al.setColor(ColorRGBA.White.mult(0.02f)); rootNode.addLight(al); spot=new SpotLight(); diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java index fbf0e1b67..0b930bdc5 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java @@ -65,7 +65,7 @@ public class TestSpotLightShadows extends SimpleApplication { public void setupLighting() { AmbientLight al = new AmbientLight(); - al.setColor(ColorRGBA.White.mult(0.3f)); + al.setColor(ColorRGBA.White.mult(0.02f)); rootNode.addLight(al); rootNode.setShadowMode(ShadowMode.CastAndReceive); diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLightTerrain.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLightTerrain.java index 4fb58602c..f656b1fd6 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLightTerrain.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLightTerrain.java @@ -95,7 +95,7 @@ public class TestSpotLightTerrain extends SimpleApplication { rootNode.addLight(sl); AmbientLight ambLight = new AmbientLight(); - ambLight.setColor(new ColorRGBA(0.8f, 0.8f, 0.8f, 0.2f)); + ambLight.setColor(ColorRGBA.Black); rootNode.addLight(ambLight); cam.setLocation(new Vector3f(-41.219646f, -84.8363f, -171.67267f)); diff --git a/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3m b/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3m index 91967d5c4..5d732d0c0 100644 --- a/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3m +++ b/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3m @@ -1,11 +1,11 @@ Material Signpost : Common/MatDefs/Light/Lighting.j3md { MaterialParameters { Shininess: 4.0 - DiffuseMap: Models/Sign Post/Sign Post.jpg - NormalMap: Models/Sign Post/Sign Post_normal.jpg - SpecularMap: Models/Sign Post/Sign Post_specular.jpg + DiffuseMap: "Models/Sign Post/Sign Post.jpg" + NormalMap: "Models/Sign Post/Sign Post_normal.jpg" + SpecularMap: "Models/Sign Post/Sign Post_specular.jpg" UseMaterialColors : true - Ambient : 0.5 0.5 0.5 1.0 + Ambient : 1.0 1.0 1.0 1.0 Diffuse : 1.0 1.0 1.0 1.0 Specular : 1.0 1.0 1.0 1.0 }