PBRTerrain(Advanced)Test: gamma correction is enabled by default in v3.4

jme3-examples/src/main/java/jme3test/terrain/PBRTerrainAdvancedTest.java

@@ -40,12 +40,10 @@ import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.LightProbe;
-import com.jme3.light.LightProbe.AreaType;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.shader.VarType;
-import com.jme3.system.AppSettings;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
@@ -153,11 +151,6 @@ public class PBRTerrainAdvancedTest extends SimpleApplication {
 
     public static void main(String[] args) {
         PBRTerrainAdvancedTest app = new PBRTerrainAdvancedTest();
-        AppSettings s = new AppSettings(true);
-
-        s.put("GammaCorrection", true);
-
-        app.setSettings(s);
         app.start();
     }
 
@@ -188,7 +181,6 @@ public class PBRTerrainAdvancedTest extends SimpleApplication {
                     matTerrain.setFloat("AlbedoMap_4_scale", grassScale);
                     matTerrain.setFloat("AlbedoMap_5_scale", marbleScale);
                     matTerrain.setFloat("AlbedoMap_6_scale", gravelScale);
-
                 }
             }
             if (name.equals("toggleNight") && !pressed) {
@@ -361,6 +353,7 @@ public class PBRTerrainAdvancedTest extends SimpleApplication {
 //        matTerrain.setColor("EmissiveColor_1", new ColorRGBA(0.08f, 0.01f, 0.1f, 0.4f));
 //this texture slot does not have a unique emissiveIntensityMap packed into its MRAoEi map,
         // so setting an emissiveColor will apply equal intensity to every pixel
+
         terrain.setMaterial(matTerrain);
     }
 
@@ -440,7 +433,7 @@ public class PBRTerrainAdvancedTest extends SimpleApplication {
     private void setUpLights() {
         LightProbe probe = (LightProbe) assetManager.loadAsset("Scenes/LightProbes/quarry_Probe.j3o");
 
-        probe.setAreaType(AreaType.Spherical);
+        probe.setAreaType(LightProbe.AreaType.Spherical);
         probe.getArea().setRadius(2000);
         probe.getArea().setCenter(new Vector3f(0, 0, 0));
         rootNode.addLight(probe);

jme3-examples/src/main/java/jme3test/terrain/PBRTerrainTest.java

@@ -43,7 +43,6 @@ import com.jme3.light.LightProbe;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
-import com.jme3.system.AppSettings;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
@@ -118,12 +117,6 @@ public class PBRTerrainTest extends SimpleApplication {
 
     public static void main(String[] args) {
         PBRTerrainTest app = new PBRTerrainTest();
-        AppSettings s = new AppSettings(true);
-
-        s.put("FrameRate", 140);
-        s.put("GammaCorrection", true);
-
-        app.setSettings(s);
         app.start();
     }
 
@@ -154,7 +147,6 @@ public class PBRTerrainTest extends SimpleApplication {
                     matTerrain.setFloat("AlbedoMap_4_scale", grassScale);
                     matTerrain.setFloat("AlbedoMap_5_scale", marbleScale);
                     matTerrain.setFloat("AlbedoMap_6_scale", gravelScale);
-
                 }
             }
             if (name.equals("toggleNight") && !pressed) {
@@ -260,8 +252,8 @@ public class PBRTerrainTest extends SimpleApplication {
         Texture normalMapGrass = assetManager.loadTexture("Textures/Terrain/PBR/Ground037_1K_Normal.png");
         normalMapGrass.setWrap(WrapMode.Repeat);
 
-        Texture normalMapMarble = assetManager.loadTexture("Textures/Terrain/PBR/Marble013_1K_Normal.png");
-        normalMapGrass.setWrap(WrapMode.Repeat);
+//        Texture normalMapMarble = assetManager.loadTexture("Textures/Terrain/PBR/Marble013_1K_Normal.png");
+//        normalMapMarble.setWrap(WrapMode.Repeat);
 
         Texture normalMapTiles = assetManager.loadTexture("Textures/Terrain/PBR/Tiles083_1K_Normal.png");
         normalMapTiles.setWrap(WrapMode.Repeat);
@@ -271,7 +263,7 @@ public class PBRTerrainTest extends SimpleApplication {
         matTerrain.setTexture("NormalMap_2", normalMapSnow);
         matTerrain.setTexture("NormalMap_3", normalMapTiles);
         matTerrain.setTexture("NormalMap_4", normalMapGrass);
-        //     matTerrain.setTexture("NormalMap_5", normalMapMarble);  // Adding this texture would exceed the 16 texture limit.
+//        matTerrain.setTexture("NormalMap_5", normalMapMarble);  // Adding this texture would exceed the 16 texture limit.
         matTerrain.setTexture("NormalMap_6", normalMapGravel);
 
         terrain.setMaterial(matTerrain);