From 078eb0b6acbb374f76bde3702d570df77cda1543 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Tue, 27 Oct 2020 13:59:15 +0000
Subject: [PATCH] Merged in NRRPLT-7984-sdf-materials-prio (pull request #42)
[NRRPLT-7984] changed SDf material priority
* [NRRPLT-7984] changed SDf material priority
* [NRRPLT-7984] corrected gz3d.js formatting
* [NRRPLT-7984] formatting mess hopefully gone
* Merged development into NRRPLT-7984-sdf-materials-prio
Approved-by: Manos Angelidis
Approved-by: Antoine Detailleur
---
gz3d/build/gz3d.js | 5 ++++-
gz3d/src/gziface.js | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gz3d/build/gz3d.js b/gz3d/build/gz3d.js
index d625fb1..89e3571 100644
--- a/gz3d/build/gz3d.js
+++ b/gz3d/build/gz3d.js
@@ -5978,8 +5978,11 @@ GZ3D.GZIface.prototype.createGeom = function(
}
});
- if (!colladaDefinesMaterials) {
+ if (mat) {
that.entityMaterial[materialName] = mat;
+ } else if (!colladaDefinesMaterials) {
+ console.error('GZIface.createGeom() - material definition missing for ' + meshUri + '!'
+ + ' Neither parsed material nor mesh material defined.');
}
if (that.entityMaterial[materialName]) {
diff --git a/gz3d/src/gziface.js b/gz3d/src/gziface.js
index 9571915..9b4ddc8 100644
--- a/gz3d/src/gziface.js
+++ b/gz3d/src/gziface.js
@@ -1464,8 +1464,11 @@ GZ3D.GZIface.prototype.createGeom = function(
}
});
- if (!colladaDefinesMaterials) {
+ if (mat) {
that.entityMaterial[materialName] = mat;
+ } else if (!colladaDefinesMaterials) {
+ console.error('GZIface.createGeom() - material definition missing for ' + meshUri + '!'
+ + ' Neither parsed material nor mesh material defined.');
}
if (that.entityMaterial[materialName]) {
--
GitLab