From 76210fe4155c258f7cf7364cb1ef8b5afc70b962 Mon Sep 17 00:00:00 2001
From: rvandoosselaer <remy.vand@gmail.com>
Date: Fri, 10 Apr 2020 15:15:38 +0200
Subject: [PATCH] Add a check to see if the NB_PROBES identifier is defined.
 Fixes #1340

---
 .../resources/Common/ShaderLib/PBR.glsllib    |  3 +
 .../jme3test/light/pbr/TestIssue1340.java     | 66 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 jme3-examples/src/main/java/jme3test/light/pbr/TestIssue1340.java

diff --git a/jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib b/jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib
index d27c0222f..daafcf0ca 100644
--- a/jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib
+++ b/jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib
@@ -2,6 +2,9 @@
 #ifndef PI
     #define PI 3.14159265358979323846264
 #endif
+#ifndef NB_PROBES
+    #define NB_PROBES 0
+#endif
 
 //Specular fresnel computation
 vec3 F_Shlick(float vh,	vec3 F0){
diff --git a/jme3-examples/src/main/java/jme3test/light/pbr/TestIssue1340.java b/jme3-examples/src/main/java/jme3test/light/pbr/TestIssue1340.java
new file mode 100644
index 000000000..ec89d6a47
--- /dev/null
+++ b/jme3-examples/src/main/java/jme3test/light/pbr/TestIssue1340.java
@@ -0,0 +1,66 @@
+package jme3test.light.pbr;
+
+import com.jme3.app.SimpleApplication;
+import com.jme3.asset.plugins.UrlLocator;
+import com.jme3.environment.EnvironmentCamera;
+import com.jme3.environment.LightProbeFactory;
+import com.jme3.environment.generation.JobProgressAdapter;
+import com.jme3.light.DirectionalLight;
+import com.jme3.light.LightProbe;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Spatial;
+import com.jme3.system.AppSettings;
+
+/**
+ * @author: rvandoosselaer
+ */
+public class TestIssue1340 extends SimpleApplication {
+
+    public static void main(String[] args) {
+        TestIssue1340 testIssue1340 = new TestIssue1340();
+        testIssue1340.setSettings(createSettings());
+        testIssue1340.start();
+    }
+
+    private static AppSettings createSettings() {
+        AppSettings settings = new AppSettings(true);
+        settings.setRenderer(AppSettings.LWJGL_OPENGL32);
+        return settings;
+    }
+
+    @Override
+    public void simpleInitApp() {
+        stateManager.attach(new EnvironmentCamera(32));
+
+        DirectionalLight light = new DirectionalLight(Vector3f.UNIT_Y.negate(), ColorRGBA.White);
+        rootNode.addLight(light);
+
+        assetManager.registerLocator("https://github.com/KhronosGroup/glTF-Sample-Models/raw/master/2.0/RiggedFigure/", UrlLocator.class);
+
+        Spatial model = assetManager.loadModel("/glTF-Embedded/RiggedFigure.gltf");
+        rootNode.attachChild(model);
+
+        viewPort.setBackgroundColor(ColorRGBA.LightGray);
+    }
+
+    /**
+     * #ifndef NB_PROBES
+     *     #define NB_PROBES 0
+     * #endif
+     */
+    int frame;
+
+    @Override
+    public void simpleUpdate(float tpf) {
+        frame++;
+        if (frame == 2) {
+            LightProbeFactory.makeProbe(stateManager.getState(EnvironmentCamera.class), rootNode, new JobProgressAdapter<LightProbe>() {
+                @Override
+                public void done(LightProbe result) {
+                    enqueue(() -> rootNode.addLight(result));
+                }
+            });
+        }
+    }
+}