From bfb1df5e46562f40ad520623b18dbf7c0e4622e5 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Tue, 27 Apr 2021 11:25:15 +0000
Subject: [PATCH] Merged in NRRPLT-8194-hotfix-opacity (pull request #53)
[NRRPLT-8194] mirror frontend
* [NRRPLT-8194] mirror frontend
Approved-by: erdisayar
Approved-by: Manos Angelidis
---
gz3d/build/gz3d.js | 13 +++++++++++++
gz3d/src/gziface.js | 13 +++++++++++++
2 files changed, 26 insertions(+)
diff --git a/gz3d/build/gz3d.js b/gz3d/build/gz3d.js
index 1175044..d120bc3 100644
--- a/gz3d/build/gz3d.js
+++ b/gz3d/build/gz3d.js
@@ -6259,6 +6259,19 @@ GZ3D.GZIface.prototype.parseMaterial = function(material) {
}
}
+ if (material.emissive) {
+ emissive = [material.emissive.r, material.emissive.g, material.emissive.b, material.emissive.a];
+ }
+ if (material.diffuse) {
+ diffuse = [material.diffuse.r, material.diffuse.g, material.diffuse.b, material.diffuse.a];
+ }
+ if (material.specular) {
+ specular = [material.specular.r, material.specular.g, material.specular.b, material.specular.a];
+ }
+ if (material.diffuse && material.diffuse.a) {
+ opacity = material.diffuse.a;
+ }
+
// normal map
if (material.normal_map) {
var mapUri;
diff --git a/gz3d/src/gziface.js b/gz3d/src/gziface.js
index f28470d..b25db1f 100644
--- a/gz3d/src/gziface.js
+++ b/gz3d/src/gziface.js
@@ -1751,6 +1751,19 @@ GZ3D.GZIface.prototype.parseMaterial = function(material) {
}
}
+ if (material.emissive) {
+ emissive = [material.emissive.r, material.emissive.g, material.emissive.b, material.emissive.a];
+ }
+ if (material.diffuse) {
+ diffuse = [material.diffuse.r, material.diffuse.g, material.diffuse.b, material.diffuse.a];
+ }
+ if (material.specular) {
+ specular = [material.specular.r, material.specular.g, material.specular.b, material.specular.a];
+ }
+ if (material.diffuse && material.diffuse.a) {
+ opacity = material.diffuse.a;
+ }
+
// normal map
if (material.normal_map) {
var mapUri;
--
GitLab