Skip to content

Commit da8c7c0

Browse files
bitnenferbitnenfer
committed
WebGL config data is now stored on WebGLRenderer
1 parent cffc40b commit da8c7c0

4 files changed

Lines changed: 26 additions & 21 deletions

File tree

‎src/renderer/webgl/WebGLRenderer.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ var WebGLRenderer = new Class({
3232
powerPreference: game.config.powerPreference
3333
};
3434

35-
this.contextCreationConfig = contextCreationConfig;
35+
this.config = {
36+
clearBeforeRender: game.config.clearBeforeRender,
37+
pixelArt: game.config.pixelArt,
38+
backgroundColor: game.config.backgroundColor,
39+
contextCreation: contextCreationConfig
40+
};
3641
this.game = game;
37-
this.gameConfig = game.config;
3842
this.type = CONST.WEBGL;
3943
this.width = game.config.width * game.config.resolution;
4044
this.height = game.config.height * game.config.resolution;
@@ -88,7 +92,7 @@ var WebGLRenderer = new Class({
8892

8993
this.canvas.addEventListener('webglcontextrestored', function (event) {
9094
renderer.contextLost = false;
91-
renderer.init(renderer.gameConfig, renderer.contextCreationConfig);
95+
renderer.init(renderer.config);
9296
for (var index = 0; index < renderer.restoredContextCallbacks.length; ++index)
9397
{
9498
var callback = renderer.restoredContextCallbacks[index];
@@ -101,14 +105,14 @@ var WebGLRenderer = new Class({
101105
this.supportedExtensions = null;
102106
this.extensions = {};
103107

104-
this.init(this.gameConfig, this.contextCreationConfig);
108+
this.init(this.config);
105109
},
106110

107-
init: function (config, contextCreationConfig)
111+
init: function (config)
108112
{
109113
var canvas = this.canvas;
110114
var clearColor = config.backgroundColor;
111-
var gl = canvas.getContext('webgl', contextCreationConfig) || canvas.getContext('experimental-webgl', contextCreationConfig);
115+
var gl = canvas.getContext('webgl', config.contextCreation) || canvas.getContext('experimental-webgl', config.contextCreation);
112116

113117
if (!gl)
114118
{
@@ -238,7 +242,7 @@ var WebGLRenderer = new Class({
238242
else console.warn('Pipeline', pipelineName, ' already exists.');
239243

240244
pipelineInstance.name = pipelineName;
241-
this.pipelines[pipelineName].resize(this.width, this.height, this.gameConfig.resolution);
245+
this.pipelines[pipelineName].resize(this.width, this.height, this.config.resolution);
242246

243247
return this;
244248
},
@@ -450,7 +454,7 @@ var WebGLRenderer = new Class({
450454
{
451455
filter = gl.LINEAR;
452456
}
453-
else if (scaleMode === CONST.ScaleModes.NEAREST || this.gameConfig.pixelArt)
457+
else if (scaleMode === CONST.ScaleModes.NEAREST || this.config.pixelArt)
454458
{
455459
filter = gl.NEAREST;
456460
}
@@ -683,13 +687,13 @@ var WebGLRenderer = new Class({
683687
if (this.contextLost) return;
684688

685689
var gl = this.gl;
686-
var color = this.gameConfig.backgroundColor;
690+
var color = this.config.backgroundColor;
687691
var pipelines = this.pipelines;
688692

689693
// Bind custom framebuffer here
690694
gl.clearColor(color.redGL, color.greenGL, color.blueGL, color.alphaGL);
691695

692-
if (this.gameConfig.clearBeforeRender)
696+
if (this.config.clearBeforeRender)
693697
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
694698

695699
for (var key in pipelines)

‎src/renderer/webgl/pipelines/FlatTintPipeline.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ var FlatTintPipeline = new Class({
109109
}
110110

111111
var renderer = this.renderer;
112-
var resolution = renderer.gameConfig.resolution;
112+
var resolution = renderer.config.resolution;
113113
var vertexViewF32 = this.vertexViewF32;
114114
var vertexViewU32 = this.vertexViewU32;
115115
var vertexOffset = this.vertexCount * this.vertexComponentCount;
@@ -181,7 +181,7 @@ var FlatTintPipeline = new Class({
181181
}
182182

183183
var renderer = this.renderer;
184-
var resolution = renderer.gameConfig.resolution;
184+
var resolution = renderer.config.resolution;
185185
var vertexViewF32 = this.vertexViewF32;
186186
var vertexViewU32 = this.vertexViewU32;
187187
var vertexOffset = this.vertexCount * this.vertexComponentCount;
@@ -269,7 +269,7 @@ var FlatTintPipeline = new Class({
269269
this.renderer.setPipeline(this);
270270

271271
var renderer = this.renderer;
272-
var resolution = renderer.gameConfig.resolution;
272+
var resolution = renderer.config.resolution;
273273
var length = path.length;
274274
var polygonCache = this.polygonCache;
275275
var polygonIndexArray;
@@ -437,7 +437,7 @@ var FlatTintPipeline = new Class({
437437
}
438438

439439
var renderer = this.renderer;
440-
var resolution = renderer.gameConfig.resolution;
440+
var resolution = renderer.config.resolution;
441441
var a0 = currentMatrix[0];
442442
var b0 = currentMatrix[1];
443443
var c0 = currentMatrix[2];

‎src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
var Class = require('../../../utils/Class');
23
var WebGLPipeline = require('../WebGLPipeline');
34
var Utils = require('../Utils');

‎src/renderer/webgl/pipelines/TextureTintPipeline.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ var TextureTintPipeline = new Class({
118118
var vertexViewU32 = this.vertexViewU32;
119119
var renderer = this.renderer;
120120
var roundPixels = camera.roundPixels;
121-
var resolution = renderer.gameConfig.resolution;
121+
var resolution = renderer.config.resolution;
122122
var maxQuads = this.maxQuads;
123123
var cameraScrollX = camera.scrollX;
124124
var cameraScrollY = camera.scrollY;
@@ -271,7 +271,7 @@ var TextureTintPipeline = new Class({
271271
var vertexViewU32 = this.vertexViewU32;
272272
var renderer = this.renderer;
273273
var roundPixels = camera.roundPixels;
274-
var resolution = renderer.gameConfig.resolution;
274+
var resolution = renderer.config.resolution;
275275
var list = blitter.getRenderList();
276276
var length = list.length;
277277
var cameraMatrix = camera.matrix.matrix;
@@ -391,7 +391,7 @@ var TextureTintPipeline = new Class({
391391
var vertexViewU32 = this.vertexViewU32;
392392
var renderer = this.renderer;
393393
var roundPixels = camera.roundPixels;
394-
var resolution = renderer.gameConfig.resolution;
394+
var resolution = renderer.config.resolution;
395395
var cameraMatrix = camera.matrix.matrix;
396396
var frame = sprite.frame;
397397
var texture = frame.texture.source[frame.sourceIndex].glTexture;
@@ -523,7 +523,7 @@ var TextureTintPipeline = new Class({
523523
var vertexViewU32 = this.vertexViewU32;
524524
var renderer = this.renderer;
525525
var roundPixels = camera.roundPixels;
526-
var resolution = renderer.gameConfig.resolution;
526+
var resolution = renderer.config.resolution;
527527
var cameraMatrix = camera.matrix.matrix;
528528
var a = cameraMatrix[0];
529529
var b = cameraMatrix[1];
@@ -605,7 +605,7 @@ var TextureTintPipeline = new Class({
605605
var vertexViewU32 = this.vertexViewU32;
606606
var renderer = this.renderer;
607607
var roundPixels = camera.roundPixels;
608-
var resolution = renderer.gameConfig.resolution;
608+
var resolution = renderer.config.resolution;
609609
var cameraMatrix = camera.matrix.matrix;
610610
var cameraWidth = camera.width + 50;
611611
var cameraHeight = camera.height + 50;
@@ -820,7 +820,7 @@ var TextureTintPipeline = new Class({
820820
var vertexViewU32 = this.vertexViewU32;
821821
var renderer = this.renderer;
822822
var roundPixels = camera.roundPixels;
823-
var resolution = renderer.gameConfig.resolution;
823+
var resolution = renderer.config.resolution;
824824
var cameraMatrix = camera.matrix.matrix;
825825
var frame = bitmapText.frame;
826826
var textureSource = bitmapText.texture.source[frame.sourceIndex];
@@ -1223,7 +1223,7 @@ var TextureTintPipeline = new Class({
12231223
var vertexViewU32 = this.vertexViewU32;
12241224
var renderer = this.renderer;
12251225
var roundPixels = camera.roundPixels;
1226-
var resolution = renderer.gameConfig.resolution;
1226+
var resolution = renderer.config.resolution;
12271227
var cameraMatrix = camera.matrix.matrix;
12281228
var width = srcWidth * (flipX ? -1.0 : 1.0);
12291229
var height = srcHeight * (flipY ? -1.0 : 1.0);

0 commit comments

Comments
 (0)