Fixed: rapyuta-robotics/zethus#88

RoboStack · Jun 12, 2020 · 270e5c6 · 270e5c6
1 parent 207d6e1
commit 270e5c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -5,6 +5,7 @@ import {
   Material,
   Mesh,
   MeshBasicMaterial,
+  MeshStandardMaterial,
   Object3D,
   Quaternion,
   TorusGeometry,
@@ -133,6 +134,14 @@ export function assertIsMeshBasicMaterial(
   }
 }
 
+export function assertIsMaterialWithColor(
+  val: any,
+): asserts val is MeshBasicMaterial {
+  if (!('color' in val)) {
+    throw new TypeError(`Expected 'val' to be MeshBasicMaterial with color`);
+  }
+}
+
 export function assertBehavesLikeArray<T>(val: any): asserts val is Array<T> {
   if (val.length === undefined) {
     throw new TypeError(`Expected 'val' to be an array`);

diff --git a/src/utils/transform.ts b/src/utils/transform.ts
@@ -1,5 +1,5 @@
 import { Color, Mesh, Object3D, Quaternion } from 'three';
-import { assertIsMaterial } from './helpers';
+import { assertIsMaterialWithColor } from './helpers';
 import Line from '../primitives/Line';
 import LineSegments from '../primitives/LineSegment';
 
@@ -28,7 +28,10 @@ export const setColor = (
   object: Mesh | Line | LineSegments,
   color: string | number | RosMessage.Color,
 ) => {
-  assertIsMaterial(object.material);
+  console.log("¡¡¡¡ assertIsMeshBasicMaterial !!!!")
+  console.log(object)
+  assertIsMaterialWithColor(object.material);
+
   if (typeof color === 'string' || typeof color === 'number') {
     object.material.color = new Color(color);
   } else {