Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-22 12:43:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/v4.0.0' into v4.0.0

Browse source
This commit is contained in:
Ben Richards 2024-11-21 12:33:32 +13:00
commit 7411a4b244
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gameobjects/components/Lighting.js
View file

@ -82,7 +82,7 @@ var Lighting = {
{ {
if (enabled === null) if (enabled === null)
{ {
this.selfShadow.enabled = this.scene.game.config.selfShadow; this.selfShadow.enabled = this.scene.sys.game.config.selfShadow;
} }
else else
{ {

2
src/gameobjects/rope/RopeWebGLRenderer.js
View file

@ -46,7 +46,7 @@ var RopeWebGLRenderer = function (renderer, src, drawingContext, parentMatrix)
} }
else else
{ {
smoothPixelArt = src.scene.game.config.smoothPixelArt; smoothPixelArt = src.scene.sys.game.config.smoothPixelArt;
} }
renderOptions.smoothPixelArt = smoothPixelArt; renderOptions.smoothPixelArt = smoothPixelArt;

1
src/physics/matter-js/MatterImage.js
View file

@ -97,6 +97,7 @@ var MatterImage = new Class({
this.setTexture(texture, frame); this.setTexture(texture, frame);
this.setSizeToFrame(); this.setSizeToFrame();
this.setOrigin(); this.setOrigin();
this.initRenderNodes(this._defaultRenderNodesMap);
/** /**
* A reference to the Matter.World instance that this body belongs to. * A reference to the Matter.World instance that this body belongs to.

1
src/physics/matter-js/MatterSprite.js
View file

@ -103,6 +103,7 @@ var MatterSprite = new Class({
this.setTexture(texture, frame); this.setTexture(texture, frame);
this.setSizeToFrame(); this.setSizeToFrame();
this.setOrigin(); this.setOrigin();
this.initRenderNodes(this._defaultRenderNodesMap);
/** /**
* A reference to the Matter.World instance that this body belongs to. * A reference to the Matter.World instance that this body belongs to.

4
src/renderer/webgl/renderNodes/submitter/SubmitterQuad.js
View file

@ -256,7 +256,7 @@ var SubmitterQuad = new Class({
var selfShadowEnabled = selfShadow.enabled; var selfShadowEnabled = selfShadow.enabled;
if (selfShadowEnabled === null) if (selfShadowEnabled === null)
{ {
selfShadowEnabled = gameObject.scene.game.config.selfShadow; selfShadowEnabled = gameObject.scene.sys.game.config.selfShadow;
} }
this._lightingOptions.normalGLTexture = normalMap; this._lightingOptions.normalGLTexture = normalMap;
@ -280,7 +280,7 @@ var SubmitterQuad = new Class({
} }
else else
{ {
smoothPixelArt = gameObject.scene.game.config.smoothPixelArt; smoothPixelArt = gameObject.scene.sys.game.config.smoothPixelArt;
} }
this._renderOptions.smoothPixelArt = smoothPixelArt; this._renderOptions.smoothPixelArt = smoothPixelArt;
} }

4
src/renderer/webgl/renderNodes/submitter/SubmitterTilemapGPULayer.js
View file

@ -391,7 +391,7 @@ var SubmitterTilemapGPULayer = new Class({
var selfShadow = gameObject.selfShadow.enabled; var selfShadow = gameObject.selfShadow.enabled;
if (selfShadow === null) if (selfShadow === null)
{ {
selfShadow = gameObject.scene.game.config.selfShadow; selfShadow = gameObject.scene.sys.game.config.selfShadow;
} }
if (selfShadow) if (selfShadow)
{ {
@ -406,7 +406,7 @@ var SubmitterTilemapGPULayer = new Class({
var smoothPixelArt = texture.smoothPixelArt; var smoothPixelArt = texture.smoothPixelArt;
if (smoothPixelArt === null) if (smoothPixelArt === null)
{ {
smoothPixelArt = gameObject.scene.game.config.smoothPixelArt; smoothPixelArt = gameObject.scene.sys.game.config.smoothPixelArt;
} }
var smoothPixelArtAddition = programManager.getAddition('SmoothPixelArt'); var smoothPixelArtAddition = programManager.getAddition('SmoothPixelArt');
if (smoothPixelArtAddition) if (smoothPixelArtAddition)