From ef50c626aedd2c6689ac0747f2724bce80ee9b18 Mon Sep 17 00:00:00 2001
From: Jacques KAISER <jkaiser@fzi.de>
Date: Thu, 17 Mar 2016 16:00:13 +0100
Subject: [PATCH] [NRRPLT-3488] Checking for undefined name in visualobject
Change-Id: If10d86347866804801d06c09b130819c4876eafd
---
gz3d/build/gz3d.js | 4 ++--
gz3d/src/gzsdfparser.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gz3d/build/gz3d.js b/gz3d/build/gz3d.js
index 11cbc1d..9b72ffb 100644
--- a/gz3d/build/gz3d.js
+++ b/gz3d/build/gz3d.js
@@ -8929,7 +8929,7 @@ GZ3D.SdfParser.prototype.createGeom = function(geom, mat, parent)
allChildren[c].receiveShadow = visualObj.receiveShadows;
}
- if (visualObj.name.indexOf('COLLISION_VISUAL') >= 0)
+ if (visualObj.name !== undefined && visualObj.name.indexOf('COLLISION_VISUAL') >= 0)
{
allChildren[c].castShadow = false;
allChildren[c].receiveShadow = false;
@@ -8956,7 +8956,7 @@ GZ3D.SdfParser.prototype.createVisual = function(visual)
if (visual.geometry)
{
var visualObj = new THREE.Object3D();
- visualObj.name = visual['@name'];
+ visualObj.name = visual['@name'] || visual['name'];
if (visual.pose)
{
diff --git a/gz3d/src/gzsdfparser.js b/gz3d/src/gzsdfparser.js
index ce33d8f..083215f 100644
--- a/gz3d/src/gzsdfparser.js
+++ b/gz3d/src/gzsdfparser.js
@@ -534,7 +534,7 @@ GZ3D.SdfParser.prototype.createGeom = function(geom, mat, parent)
allChildren[c].receiveShadow = visualObj.receiveShadows;
}
- if (visualObj.name.indexOf('COLLISION_VISUAL') >= 0)
+ if (visualObj.name !== undefined && visualObj.name.indexOf('COLLISION_VISUAL') >= 0)
{
allChildren[c].castShadow = false;
allChildren[c].receiveShadow = false;
@@ -561,7 +561,7 @@ GZ3D.SdfParser.prototype.createVisual = function(visual)
if (visual.geometry)
{
var visualObj = new THREE.Object3D();
- visualObj.name = visual['@name'];
+ visualObj.name = visual['@name'] || visual['name'];
if (visual.pose)
{
--
GitLab