Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed duplicate loading of .obj model causing material ID errors #1405

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed duplicate loading of .obj model causing material ID errors #1405

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea14b9c
Refactor createMaterial on MTL cuz create Default material not needed
erikwski Mar 7, 2024
7a897f0
new way to generate material id using node.id + material.Id only if i…
erikwski Mar 7, 2024
b26bb7f
newMaterial create istnace only if not exist an old one of the same N…
erikwski Mar 7, 2024
244279a
In the parseObj, format the id of the ref to the material with node.i…
erikwski Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/plugins/OBJLoaderPlugin/OBJSceneGraphLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ var loadOBJ = function (modelNode, url, ok) {
});
};

//--------------------------------------------------------------------------------------------
// How to format materialId
//--------------------------------------------------------------------------------------------
var formatMaterialId = function (modelId, materialId) {
return `${modelId}_${materialId}`;
};


var parseOBJ = (function () {

const regexp = {
Expand Down Expand Up @@ -292,7 +300,7 @@ var parseOBJ = (function () {
// material

var id = line.substring(7).trim();
state.object.material.id = id;
state.object.material.id = formatMaterialId(modelNode.id, id);

} else if (regexp.material_library_pattern.test(line)) {

Expand Down Expand Up @@ -532,7 +540,6 @@ var parseMTL = (function () {
var materialCfg = {
id: "Default"
};
var needCreate = false;
var line;
var pos;
var key;
Expand Down Expand Up @@ -560,13 +567,10 @@ var parseMTL = (function () {
switch (key.toLowerCase()) {

case "newmtl": // New material
//if (needCreate) {
createMaterial(modelNode, materialCfg);
//}
materialCfg = {
id: value
id: value ? formatMaterialId(modelNode.id , value) : ""
};
needCreate = true;
createMaterial(modelNode, materialCfg);
break;

case 'ka':
Expand Down Expand Up @@ -624,10 +628,6 @@ var parseMTL = (function () {
// modelNode.error("Unrecognized token: " + key);
}
}

if (needCreate) {
createMaterial(modelNode, materialCfg);
}
};

function createTexture(modelNode, basePath, value, encoding) {
Expand Down Expand Up @@ -658,7 +658,14 @@ var parseMTL = (function () {
}

function createMaterial(modelNode, materialCfg) {
new PhongMaterial(modelNode, materialCfg);
var material = modelNode.scene.components[materialCfg.id];
if(material){
console.warn("Material already loaded");
if(!modelNode._ownedComponents) modelNode._ownedComponents = {};
modelNode._ownedComponents[materialCfg.id] = material;
}else{
new PhongMaterial(modelNode, materialCfg);
}
}

function parseRGB(value) {
Expand Down