Split Forward and Deferred max counts up.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '382f15a0-80e7-11e7-8972-194766e6f4cf'
+build: 'eb7dc200-8100-11e7-b353-1b576d4fdd2c'
 };
 module.exports = CHECKSUM;

v3/src/gameobjects/lightlayer/Const.js

@@ -1,3 +1,6 @@
 module.exports = {
-    MAX_LIGHTS: 10
-};
+
+    MAX_LIGHTS: 10,
+    DEFERRED_MAX_LIGHTS: 100
+
+};

v3/src/gameobjects/lightlayer/LightLayer.js

@@ -34,7 +34,7 @@ var LightLayer = new Class({
         GameObject.call(this, scene, 'LightLayer');
 
         var resourceManager = scene.game.renderer.resourceManager;
-        var deferred = WebGLSupportedExtensions.has('WEBGL_draw_buffers');
+        this._isDeferred = WebGLSupportedExtensions.has('WEBGL_draw_buffers');
 
         this.renderer = scene.game.renderer;
         this.passShader = null;
@@ -49,7 +49,7 @@ var LightLayer = new Class({
         this.lightsLocations = [];
         this._z = 0;
 
-        if (resourceManager !== undefined && !deferred)
+        if (resourceManager !== undefined && !this._isDeferred)
         {
             this.gl = scene.game.renderer.gl;
             this.passShader = resourceManager.createShader('Phong2DShaderForward', {vert: TexturedAndNormalizedTintedShader.vert, frag: `
@@ -116,7 +116,7 @@ var LightLayer = new Class({
         {
             var gl = this.gl = scene.game.renderer.gl;
             this.ext = scene.game.renderer.getExtension('WEBGL_draw_buffers');
-            this.gBufferShaderPass = resourceManager.createShader('GBufferShader', {vert: TexturedAndNormalizedTintedShader.vert, frag: `
+            this.gBufferShaderPass = resourceManager.createShader('GBufferShader', { vert: TexturedAndNormalizedTintedShader.vert, frag: `
                 #extension GL_EXT_draw_buffers : require 
 
                 precision mediump float;
@@ -161,7 +161,7 @@ var LightLayer = new Class({
                 uniform sampler2D uGbufferColor;
                 uniform sampler2D uGbufferNormal;
                 uniform vec3 uAmbientLightColor;
-                uniform Light uLights[` + Const.MAX_LIGHTS + `];
+                uniform Light uLights[` + Const.DEFERRED_MAX_LIGHTS + `];
                 
                 void main()
                 {
@@ -171,7 +171,7 @@ var LightLayer = new Class({
                     vec3 gbNormal = texture2D(uGbufferNormal, uv).rgb;
                     vec3 normal = normalize(vec3(gbNormal * 2.0 - 1.0));
 
-                    for (int index = 0; index < ` + Const.MAX_LIGHTS + `; ++index)
+                    for (int index = 0; index < ` + Const.DEFERRED_MAX_LIGHTS + `; ++index)
                     {
                         Light light = uLights[index];
                         float lightY = uResolution.y - light.position.y;
@@ -189,7 +189,7 @@ var LightLayer = new Class({
             `});
             this.lightPassVBO = gl.createBuffer();
             gl.bindBuffer(gl.ARRAY_BUFFER, this.lightPassVBO);
-            gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([-1, 7, -1, -1, 7, -1]), gl.STATIC_DRAW);
+            gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([ -1, 7, -1, -1, 7, -1 ]), gl.STATIC_DRAW);
 
             this.uMainTextureLoc = this.gBufferShaderPass.getUniformLocation('uMainTexture');
             this.uNormTextureLoc = this.gBufferShaderPass.getUniformLocation('uNormTexture');
@@ -210,7 +210,7 @@ var LightLayer = new Class({
             this.gBufferShaderPass.bindAttribLocation(2, 'v_alpha');
             this.lightPassShader.bindAttribLocation(0, 'vertexPosition');
 
-            for (var index = 0; index < Const.MAX_LIGHTS; ++index)
+            for (var index = 0; index < Const.DEFERRED_MAX_LIGHTS; ++index)
             {
                 this.lightsLocations[index] = {
                     position: this.lightPassShader.getUniformLocation('uLights[' + index + '].position'),
@@ -242,7 +242,7 @@ var LightLayer = new Class({
             gl.framebufferTexture2D(gl.FRAMEBUFFER, this.ext.COLOR_ATTACHMENT0_WEBGL, gl.TEXTURE_2D, this.gBufferColorTex, 0);
             gl.framebufferTexture2D(gl.FRAMEBUFFER, this.ext.COLOR_ATTACHMENT1_WEBGL, gl.TEXTURE_2D, this.gBufferNormalTex, 0);
 
-            this.ext.drawBuffersWEBGL([this.ext.COLOR_ATTACHMENT0_WEBGL, this.ext.COLOR_ATTACHMENT1_WEBGL]);
+            this.ext.drawBuffersWEBGL([ this.ext.COLOR_ATTACHMENT0_WEBGL, this.ext.COLOR_ATTACHMENT1_WEBGL ]);
 
             var complete = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
 
@@ -263,26 +263,26 @@ var LightLayer = new Class({
         this.setOrigin(0, 0);
     },
 
-    get z()
+    get z ()
     {
         return this._z;
     },
 
-    set z(newZ)
+    set z (newZ)
     {
         this._z = newZ;
-    },  
+    },
 
-    setAmbientLightColor: function (r, g, b) 
+    setAmbientLightColor: function (r, g, b)
     {
-        this.ambientLightColorR = r; 
-        this.ambientLightColorG = g; 
-        this.ambientLightColorB = b; 
+        this.ambientLightColorR = r;
+        this.ambientLightColorG = g;
+        this.ambientLightColorB = b;
     },
 
     getMaxLights: function ()
     {
-        return Const.MAX_LIGHTS;
+        return (this._isDeferred) ? Const.DEFERRED_MAX_LIGHTS : Const.MAX_LIGHTS;
     },
 
     getLightCount: function ()
@@ -292,7 +292,7 @@ var LightLayer = new Class({
 
     isDeferred: function ()
     {
-        return WebGLSupportedExtensions.has('WEBGL_draw_buffers');
+        return this._isDeferred;
     },
 
     /* This will probably be removed later */ 
@@ -330,7 +330,7 @@ var LightLayer = new Class({
 
     addLight: function (x, y, z, r, g, b, attenuation)
     {
-        if (this.lights.length < Const.MAX_LIGHTS)
+        if (this.lights.length < this.getMaxLights())
         {
             var light = null;
             if (this.lightPool.length > 0)
@@ -359,14 +359,13 @@ var LightLayer = new Class({
         }
     },
 
-    updateLights: function(renderer, camera, shader)
+    updateLights: function (renderer, camera, shader)
     {
         if (this.gl !== null)
         {
             var locations = this.lightsLocations;
             var lights = this.lights;
             var length = lights.length;
-            var gl = this.gl;
             var point = {x: 0, y: 0};
 
             shader.setConstantFloat2(this.uResolutionLoc, renderer.width, renderer.height);