Merge pull request #207 from JamesTKhan/upgrade-gdx-gltf

Upgrade gdx-gltf version to support CSM in future

build.gradle

@@ -33,7 +33,7 @@ allprojects {
         mockitoVersion = '1.10.19'
         commonsIoVersion = '2.5'
         commonsLangVersion = '3.12.0'
-        gltfVersion = '2.1.0'
+        gltfVersion = '2.2.1'
         args4jVersion = '2.33'
         pf4jVersion = '3.11.0'
 

commons/src/main/com/mbrlabs/mundus/commons/shaders/MundusPBRShader.java

@@ -2,8 +2,13 @@
 
 import com.badlogic.gdx.graphics.g3d.Attributes;
 import com.badlogic.gdx.graphics.g3d.Renderable;
+import com.badlogic.gdx.graphics.g3d.attributes.PointLightsAttribute;
+import com.badlogic.gdx.graphics.g3d.attributes.SpotLightsAttribute;
+import com.badlogic.gdx.graphics.g3d.environment.PointLight;
+import com.badlogic.gdx.graphics.g3d.environment.SpotLight;
 import com.badlogic.gdx.graphics.glutils.ShaderProgram;
 import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.utils.Array;
 import com.mbrlabs.mundus.commons.env.MundusEnvironment;
 import net.mgsx.gltf.scene3d.shaders.PBRShader;
 
@@ -15,6 +20,10 @@ public class MundusPBRShader extends PBRShader {
 
     private final int u_clipPlane = register("u_clipPlane");
 
+    protected final int UNIFORM_POINT_LIGHT_NUM_ACTIVE = register(new Uniform("u_activeNumPointLights"));
+
+    protected final int UNIFORM_SPOT_LIGHT_NUM_ACTIVE = register(new Uniform("u_activeNumSpotLights"));
+
     public MundusPBRShader(Renderable renderable, Config config, String prefix) {
         super(renderable, config, prefix);
     }
@@ -38,6 +47,24 @@ protected void bindLights(Renderable renderable, Attributes attributes) {
         Vector3 clippingPlane = env.getClippingPlane();
         set(u_clipPlane, clippingPlane.x, clippingPlane.y, clippingPlane.z, env.getClippingHeight());
 
+        //
+        PointLightsAttribute attr = env.get(PointLightsAttribute.class, PointLightsAttribute.Type);
+        final Array<PointLight> pointLights = attr == null ? null : attr.lights;
+        if (pointLights != null && pointLights.size > 0) {
+            set(UNIFORM_POINT_LIGHT_NUM_ACTIVE, pointLights.size);
+        } else {
+            set(UNIFORM_POINT_LIGHT_NUM_ACTIVE, 0);
+        }
+
+        SpotLightsAttribute spotAttr = env.get(SpotLightsAttribute.class, SpotLightsAttribute.Type);
+        final Array<SpotLight> spotLights = spotAttr == null ? null : spotAttr.lights;
+
+        if (spotLights != null && spotLights.size > 0) {
+            set(UNIFORM_SPOT_LIGHT_NUM_ACTIVE, spotLights.size);
+        } else {
+            set(UNIFORM_SPOT_LIGHT_NUM_ACTIVE, 0);
+        }
+
         super.bindLights(renderable, attributes);
     }
 }