Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 01:38:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed batchLight

Browse source
This commit is contained in:
Richard Davey 2020-11-20 13:05:32 +00:00
parent ed756d16f1
commit e7b85b08af
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gameobjects/lights/PointLight.js
View file

@ -177,13 +177,11 @@ var PointLight = new Class({
renderWebGL: function (renderer, src, camera, parentTransformMatrix)
{
renderer.pipelines.set(src.pipeline);
var pipeline = renderer.pipelines.set(src.pipeline);
console.warn('temps removed');
var camMatrix = renderer._tempMatrix1;
var lightMatrix = renderer._tempMatrix2;
var calcMatrix = renderer._tempMatrix3;
var camMatrix = pipeline._tempMatrix1;
var lightMatrix = pipeline._tempMatrix2;
var calcMatrix = pipeline._tempMatrix3;
var width = src.width;
var height = src.height;
@ -231,7 +229,7 @@ var PointLight = new Class({
var tx3 = calcMatrix.getX(xw, y);
var ty3 = calcMatrix.getY(xw, y);
this.pipeline.batchLight(src, camera, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, lightX, lightY);
pipeline.batchLight(src, camera, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, lightX, lightY);
}
});

17
src/renderer/webgl/pipelines/LightPipeline.js
View file

@ -219,7 +219,7 @@ var LightPipeline = new Class({
var vertexViewF32 = this.vertexViewF32;
var vertexOffset = (this.vertexCount * this.vertexComponentCount) - 1;
var vertexOffset = (this.vertexCount * this.currentShader.vertexComponentCount) - 1;
vertexViewF32[++vertexOffset] = x0;
vertexViewF32[++vertexOffset] = y0;
@ -296,8 +296,9 @@ var LightPipeline = new Class({
*/
onBind: function ()
{
return this;
this.set1i('uMainSampler', 0);
this.set1i('uNormSampler', 1);
this.set2f('uResolution', this.width / 2, this.height / 2);
},
/**
@ -307,7 +308,6 @@ var LightPipeline = new Class({
* @since 3.0.0
*
* @return {this} This WebGLPipeline instance.
*/
flush: function ()
{
var gl = this.gl;
@ -332,6 +332,7 @@ var LightPipeline = new Class({
return this;
},
*/
/**
* Called every time the pipeline is bound by the renderer.
@ -344,22 +345,22 @@ var LightPipeline = new Class({
* @param {boolean} [reset=false] - Should the pipeline be fully re-bound after a renderer pipeline clear?
*
* @return {this} This WebGLPipeline instance.
*/
bind: function (reset)
{
if (reset === undefined) { reset = false; }
WebGLPipeline.prototype.bind.call(this, reset);
var renderer = this.renderer;
var program = this.program;
// var renderer = this.renderer;
// var program = this.program;
// renderer.setInt1(program, 'uMainSampler', 0);
// renderer.setInt1(program, 'uNormSampler', 1);
renderer.setFloat2(program, 'uResolution', this.width / 2, this.height / 2);
// renderer.setFloat2(program, 'uResolution', this.width / 2, this.height / 2);
return this;
},
*/
/**
* This function sets all the needed resources for each camera pass.