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

Fixed issue with no mesh specified and texture getting

Browse source
This commit is contained in:
Richard Davey 2020-10-15 09:58:54 +01:00
parent 1e01f74bdc
commit 020cfab2d6
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/geom/mesh/GenerateGridVerts.js
View file

@ -46,7 +46,7 @@ var tempMatrix = new Matrix4();
var GenerateGridVerts = function (config)
{
var mesh = GetFastValue(config, 'mesh');
var texture = GetFastValue(config, 'texture', (mesh) ? mesh.texture : null);
var texture = GetFastValue(config, 'texture', null);
var frame = GetFastValue(config, 'frame');
var width = GetFastValue(config, 'width', 1);
var height = GetFastValue(config, 'height', width);
@ -59,7 +59,7 @@ var GenerateGridVerts = function (config)
var rotateY = GetFastValue(config, 'rotateY', 0);
var rotateZ = GetFastValue(config, 'rotateZ', 0);
var zIsUp = GetFastValue(config, 'zIsUp', true);
var isOrtho = GetFastValue(config, 'isOrtho', mesh.dirtyCache[11]);
var isOrtho = GetFastValue(config, 'isOrtho', (mesh) ? mesh.dirtyCache[11] : false);
var colors = GetFastValue(config, 'colors', [ 0xffffff ]);
var alphas = GetFastValue(config, 'alphas', [ 1 ]);
var tile = GetFastValue(config, 'tile', false);
@ -75,11 +75,25 @@ var GenerateGridVerts = function (config)
tempRotation.set(rotateX, rotateY, rotateZ);
tempMatrix.fromRotationXYTranslation(tempRotation, tempPosition, zIsUp);
if (!texture && mesh)
{
texture = mesh.texture;
}
else if (mesh && typeof(texture) === 'string')
{
texture = mesh.scene.sys.textures.get(texture);
}
else
{
// There's nothing more we can do without a texture
return result;
}
var textureFrame = texture.get(frame);
// If the Mesh is ortho and no width/height is given, we'll default to texture sizes (if set!)
if (!widthSet && isOrtho && texture)
{
var textureFrame = texture.get(frame);
var renderer = mesh.scene.sys.renderer;
width = textureFrame.width / renderer.height;

2
src/geom/mesh/typedefs/GenerateGridConfig.js
View file

@ -2,7 +2,7 @@
* @typedef {object} Phaser.Types.Geom.Mesh.GenerateGridConfig
* @since 3.50.0
*
* @property {(string|Phaser.Textures.Texture)} key - The key of the texture to be used for this Grid, as stored in the Texture Manager, or a Texture instance.
* @property {(string|Phaser.Textures.Texture)} texture - The texture to be used for this Grid. Must be a Texture instance. Can also be a string but only if the `mesh` property is set.
* @property {(string|integer)} [frame] - The name or index of the frame within the Texture.
* @property {Phaser.GameObjects.Mesh} [mesh] - If specified, the vertices of the generated grid will be added to this Mesh Game Object.
* @property {number} [width=1] - The width of the grid in 3D units. If you wish to get a pixel accurate grid based on a texture, you can use an Ortho Mesh or the `isOrtho` parameter.