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

Made obj material parsing external

Browse source
This commit is contained in:
Richard Davey 2020-10-08 10:45:03 +01:00
parent c0ab4d4ae9
commit 2e988801ce
1 changed files with 6 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/gameobjects/mesh/Mesh.js
View file

@ -12,7 +12,6 @@ var Face = require('../../geom/mesh/Face');
var GameObject = require('../GameObject');
var GameObjectEvents = require('../events');
var GetCalcMatrix = require('../GetCalcMatrix');
var GetColor = require('../../display/color/GetColor');
var GetFastValue = require('../../utils/object/GetFastValue');
var Matrix4 = require('../../math/Matrix4');
var Vector3 = require('../../math/Vector3');
@ -450,7 +449,6 @@ var Mesh = new Class({
* @since 3.50.0
*
* @param {string} key - The key of the model data in the OBJ Cache to add to this Mesh.
* @param {string} [material] - An optional Wavefront mtl file, given as a string. Supports `Kd` diffuse rgb value formats. See `parseOBJMaterial` method for details.
* @param {number} [scale=1] - An amount to scale the model data by. Use this if the model has exported too small, or large, to see.
* @param {number} [x=0] - Offset the model x position by this amount.
* @param {number} [y=0] - Offset the model y position by this amount.
@ -458,13 +456,13 @@ var Mesh = new Class({
*
* @return {this} This Mesh Game Object.
*/
addOBJ: function (key, material, scale, x, y, z)
addOBJ: function (key, scale, x, y, z)
{
var data = this.scene.sys.cache.obj.get(key);
if (data)
{
this.addModel(data, material, scale, x, y, z);
this.addModel(data, scale, x, y, z);
}
return this;
@ -645,7 +643,6 @@ var Mesh = new Class({
* @since 3.50.0
*
* @param {Phaser.Types.Geom.Mesh.OBJData} data - The parsed OBJ model data.
* @param {string} [material] - An optional Wavefront mtl file, given as a string. Supports `Kd` diffuse rgb value formats. See `parseOBJMaterial` method for details.
* @param {number} [scale=1] - An amount to scale the model data by. Use this if the model has exported too small, or large, to see.
* @param {number} [x=0] - Offset the model x position by this amount.
* @param {number} [y=0] - Offset the model y position by this amount.
@ -653,17 +650,14 @@ var Mesh = new Class({
*
* @return {this} This Mesh Game Object.
*/
addModel: function (data, material, scale, x, y, z)
addModel: function (data, scale, x, y, z)
{
if (scale === undefined) { scale = 1; }
if (x === undefined) { x = 0; }
if (y === undefined) { y = 0; }
if (z === undefined) { z = 0; }
if (material)
{
material = this.parseOBJMaterial(material);
}
var materials = data.materials;
for (var m = 0; m < data.models.length; m++)
{
@ -695,9 +689,9 @@ var Mesh = new Class({
var color = 0xffffff;
if (material && face.material !== '' && material[face.material])
if (face.material !== '' && materials[face.material])
{
color = material[face.material];
color = materials[face.material];
}
var vert1 = this.addVertex(x + m1.x * scale, y + m1.y * scale, z + m1.z * scale, uv1.u, uv1.v, color);
@ -745,69 +739,6 @@ var Mesh = new Class({
return this;
},
/**
* Takes a Wavefront Material file and extracts the diffuse reflectivity of the named
* materials, converts them to integer color values and returns them.
*
* This is used internally by the `addOBJ` and `addModel` methods, but is exposed for
* public consumption as well.
*
* Note this only works with diffuse values, specified in the `Kd r g b` format, where
* `g` and `b` are optional, but `r` is required. It does not support spectral rfl files,
* or any other material statement (such as `Ka` or `Ks`)
*
* @method Phaser.GameObjects.Mesh#parseOBJMaterial
* @since 3.50.0
*
* @param {string} The OBJ MTL file.
*
* @return {object} The parsed material colors.
*/
parseOBJMaterial: function (mtl)
{
var output = {};
var lines = mtl.split('\n');
var currentMaterial = '';
for (var i = 0; i < lines.length; i++)
{
var line = lines[i].trim();
if (line.indexOf('#') === 0 || line === '')
{
continue;
}
var lineItems = line.replace(/\s\s+/g, ' ').trim().split(' ');
switch (lineItems[0].toLowerCase())
{
case 'newmtl':
{
currentMaterial = lineItems[1];
break;
}
// The diffuse reflectivity of the current material
// Support r, [g], [b] format, where g and b are optional
case 'kd':
{
var r = Math.floor(lineItems[1] * 255);
var g = (lineItems.length >= 2) ? Math.floor(lineItems[2] * 255) : r;
var b = (lineItems.length >= 3) ? Math.floor(lineItems[3] * 255) : r;
output[currentMaterial] = GetColor(r, g, b);
break;
}
}
}
return output;
},
/**
* Adds a new Vertex into the vertices array of this Mesh.
*