v0.3.7

Added collision shapes for a variety of existing meshes
Added wireframe property to items and hulls

dist/MeshLoaders/Other/AssemblyJigCollision.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Model;
+
+var _drei = require("@react-three/drei");
+
+var _AssemblyJigCollision = _interopRequireDefault(require("../../Meshes/Other/AssemblyJigCollision.glb"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function Model(props) {
+  var _useGLTF = (0, _drei.useGLTF)(_AssemblyJigCollision.default),
+      nodes = _useGLTF.nodes;
+
+  return [{
+    type: 'group',
+    rotation: [Math.PI, 0, 0],
+    children: [{
+      type: 'raw',
+      geometry: nodes.mesh_0.geometry,
+      material: nodes.mesh_0.material,
+      scale: [5, 5, 5]
+    }]
+  }];
+}
+
+_drei.useGLTF.preload(_AssemblyJigCollision.default);

dist/MeshLoaders/Other/ConveyorCollision.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Model;
+
+var _drei = require("@react-three/drei");
+
+var _ConveyorCollision = _interopRequireDefault(require("../../Meshes/Other/ConveyorCollision.glb"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function Model(props) {
+  var _useGLTF = (0, _drei.useGLTF)(_ConveyorCollision.default),
+      nodes = _useGLTF.nodes;
+
+  return [{
+    type: 'group',
+    rotation: [-Math.PI / 2, 0, 0],
+    children: [{
+      type: 'raw',
+      geometry: nodes.mesh_0.geometry,
+      material: nodes.mesh_0.material
+    }]
+  }];
+}
+
+_drei.useGLTF.preload(_ConveyorCollision.default);

dist/MeshLoaders/Other/ConveyorDispatcherCollision.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Model;
+
+var _drei = require("@react-three/drei");
+
+var _ConveyorDispatcherCollision = _interopRequireDefault(require("../../Meshes/Other/ConveyorDispatcherCollision.glb"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function Model(props) {
+  var _useGLTF = (0, _drei.useGLTF)(_ConveyorDispatcherCollision.default),
+      nodes = _useGLTF.nodes;
+
+  return [{
+    type: 'group',
+    rotation: [-Math.PI / 2, 0, 0],
+    children: [{
+      type: 'raw',
+      geometry: nodes.mesh_0.geometry,
+      material: nodes.mesh_0.material
+    }]
+  }];
+}
+
+_drei.useGLTF.preload(_ConveyorDispatcherCollision.default);

dist/MeshLoaders/Other/ConveyorReceiverCollision.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Model;
+
+var _drei = require("@react-three/drei");
+
+var _ConveyorReceiverCollision = _interopRequireDefault(require("../../Meshes/Other/ConveyorReceiverCollision.glb"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function Model(props) {
+  var _useGLTF = (0, _drei.useGLTF)(_ConveyorReceiverCollision.default),
+      nodes = _useGLTF.nodes;
+
+  return [{
+    type: 'group',
+    rotation: [-Math.PI / 2, 0, 0],
+    children: [{
+      type: 'raw',
+      geometry: nodes.mesh_0.geometry,
+      material: nodes.mesh_0.material
+    }]
+  }];
+}
+
+_drei.useGLTF.preload(_ConveyorReceiverCollision.default);

dist/MeshLookup.js

@@ -255,10 +255,14 @@ var _Knife = _interopRequireDefault(require("./MeshLoaders/Other/Knife"));
 
 var _Conveyor = _interopRequireDefault(require("./MeshLoaders/Other/Conveyor"));
 
+var _ConveyorCollision = _interopRequireDefault(require("./MeshLoaders/Other/ConveyorCollision"));
+
 var _TransportJig = _interopRequireDefault(require("./MeshLoaders/Other/TransportJig"));
 
 var _AssemblyJig = _interopRequireDefault(require("./MeshLoaders/Other/AssemblyJig"));
 
+var _AssemblyJigCollision = _interopRequireDefault(require("./MeshLoaders/Other/AssemblyJigCollision"));
+
 var _BladeWithTransportJig = _interopRequireDefault(require("./MeshLoaders/Other/BladeWithTransportJig"));
 
 var _KnifeWithTransportJig = _interopRequireDefault(require("./MeshLoaders/Other/KnifeWithTransportJig"));
@@ -267,6 +271,10 @@ var _ConveyorDispatcher = _interopRequireDefault(require("./MeshLoaders/Other/Co
 
 var _ConveyorReceiver = _interopRequireDefault(require("./MeshLoaders/Other/ConveyorReceiver"));
 
+var _ConveyorDispatcherCollision = _interopRequireDefault(require("./MeshLoaders/Other/ConveyorDispatcherCollision"));
+
+var _ConveyorReceiverCollision = _interopRequireDefault(require("./MeshLoaders/Other/ConveyorReceiverCollision"));
+
 var _StandardMeshes = require("./Util/StandardMeshes");
 
 var _MeshLookupTable;
@@ -290,12 +298,16 @@ var MeshLookupTable = (_MeshLookupTable = {
   'handle_l': _HandleL.default,
   'handle_r': _HandleR.default,
   'conveyor': _Conveyor.default,
+  'conveyor_collision': _ConveyorCollision.default,
   'transport_jig': _TransportJig.default,
   'assembly_jig': _AssemblyJig.default,
+  'assembly_jig_collision': _AssemblyJigCollision.default,
   'blade_with_transport_jig': _BladeWithTransportJig.default,
   'knife_with_transport_jig': _KnifeWithTransportJig.default,
   'conveyor_dispatcher': _ConveyorDispatcher.default,
   'conveyor_receiver': _ConveyorReceiver.default,
+  'conveyor_dispatcher_collision': _ConveyorDispatcherCollision.default,
+  'conveyor_receiver_collision': _ConveyorReceiverCollision.default,
   'package://nao_meshes/meshes/V40/HeadPitch.dae': _HeadPitch.default,
   'package://nao_meshes/meshes/V40/HeadYaw.dae': _HeadYaw.default,
   'package://nao_meshes/meshes/V40/LAnklePitch.dae': _LAnklePitch.default,

dist/SceneStore.js

@@ -156,6 +156,11 @@ var store = function store(set, get) {
         state.items[key].color = color;
       });
     },
+    setItemWireframe: function setItemWireframe(key, wireframe) {
+      return set(function (state) {
+        state.items[key].wireframe = wireframe;
+      });
+    },
     setItemHighlighted: function setItemHighlighted(key, value) {
       return set(function (state) {
         state.items[key].highlighted = value;
@@ -259,6 +264,11 @@ var store = function store(set, get) {
         state.hulls[key].scale = color;
       });
     },
+    setHullWireframe: function setHullWireframe(key, wireframe) {
+      return set(function (state) {
+        state.hulls[key].wireframe = wireframe;
+      });
+    },
     setHullHighlighted: function setHullHighlighted(key, value) {
       return set(function (state) {
         state.hulls[key].highlighted = value;

dist/Util/MeshConvert.js

@@ -23,6 +23,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var MeshConverter = function MeshConverter(node, idx, materialOverride, opacity) {
   // console.log(node);
   if (node.type === 'group') {
@@ -61,6 +67,7 @@ var MeshConverter = function MeshConverter(node, idx, materialOverride, opacity)
           receiveShadow: false
         }, /*#__PURE__*/_react.default.createElement("meshLambertMaterial", {
           transparent: true,
+          wireframe: materialOverride.wireframe,
           attach: "material",
           opacity: opacity,
           color: (0, _ColorConversion.rgbToHex)(materialOverride),
@@ -74,6 +81,7 @@ var MeshConverter = function MeshConverter(node, idx, materialOverride, opacity)
         }, /*#__PURE__*/_react.default.createElement("meshLambertMaterial", {
           transparent: true,
           attach: "material",
+          wireframe: materialOverride.wireframe,
           opacity: opacity,
           color: (0, _ColorConversion.rgbToHex)(materialOverride),
           side: _three.FrontSide
@@ -91,6 +99,7 @@ var MeshConverter = function MeshConverter(node, idx, materialOverride, opacity)
         }, /*#__PURE__*/_react.default.createElement("meshLambertMaterial", {
           attach: "material",
           opacity: opacity,
+          wireframe: materialOverride.wireframe,
           color: (0, _ColorConversion.rgbToHex)(materialOverride)
         }));
 
@@ -148,7 +157,9 @@ exports.GhostConverter = GhostConverter;
 var itemToGroupAndChildRefs = function itemToGroupAndChildRefs(item) {
   var color = item.color,
       shape = item.shape;
-  var materialOverride = color ? color : undefined;
+  var materialOverride = color ? _objectSpread(_objectSpread({}, color), {}, {
+    wireframe: item.wireframe
+  }) : undefined;
   var opacity = color ? color.a : 1.0;
   var content = [];
 
@@ -191,7 +202,8 @@ exports.itemToGhost = itemToGhost;
 var hullToGroupAndRef = function hullToGroupAndRef(hull) {
   var color = hull.color,
       vertices = hull.vertices,
-      hullKey = hull.hullKey;
+      hullKey = hull.hullKey,
+      wireframe = hull.wireframe;
   var ref = /*#__PURE__*/(0, _react.createRef)();
   var geometry = new _threeStdlib.ConvexGeometry(vertices.map(function (v) {
     return new _three.Vector3(v.x, v.y, v.z);
@@ -210,6 +222,7 @@ var hullToGroupAndRef = function hullToGroupAndRef(hull) {
       receiveShadow: false
     }, /*#__PURE__*/_react.default.createElement("meshLambertMaterial", {
       transparent: true,
+      wireframe: wireframe,
       attach: "material",
       opacity: color.a,
       color: (0, _ColorConversion.rgbToHex)(color),
@@ -223,6 +236,7 @@ var hullToGroupAndRef = function hullToGroupAndRef(hull) {
       transparent: true,
       attach: "material",
       opacity: color.a,
+      wireframe: wireframe,
       color: (0, _ColorConversion.rgbToHex)(color),
       side: _three.FrontSide
     })));
@@ -235,6 +249,7 @@ var hullToGroupAndRef = function hullToGroupAndRef(hull) {
       receiveShadow: true
     }, /*#__PURE__*/_react.default.createElement("meshLambertMaterial", {
       transparent: true,
+      wireframe: wireframe,
       attach: "material",
       opacity: color.a,
       color: (0, _ColorConversion.rgbToHex)(color)

docs/iframe.html

@@ -135,4 +135,4 @@
 
 
 
-              window['FEATURES'] = {"postcss":true};</script><script src="runtime~main.0904ee00.iframe.bundle.js"></script><script src="vendors~main.146e3d4e.iframe.bundle.js"></script><script src="main.2a8c734b.iframe.bundle.js"></script></body></html>
+              window['FEATURES'] = {"postcss":true};</script><script src="runtime~main.0904ee00.iframe.bundle.js"></script><script src="vendors~main.146e3d4e.iframe.bundle.js"></script><script src="main.cd74042e.iframe.bundle.js"></script></body></html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "robot-scene",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "main": "dist/index.js",
   "private": false,
   "files": [

src/components/MeshLoaders/Other/AssemblyJigCollision.js

@@ -0,0 +1,18 @@
+import { useGLTF } from '@react-three/drei'
+import AssemblyJigCollisionFile from '../../Meshes/Other/AssemblyJigCollision.glb';
+
+export default function Model(props) {
+  const { nodes } = useGLTF(AssemblyJigCollisionFile);
+  return [
+      { type: 'group', rotation: [Math.PI, 0, 0], children: [
+        {
+            type:'raw',
+            geometry:nodes.mesh_0.geometry,
+            material:nodes.mesh_0.material,
+            scale:[5,5,5]
+          }
+      ]}
+    ]
+}
+
+useGLTF.preload(AssemblyJigCollisionFile)

src/components/MeshLoaders/Other/ConveyorCollision.js

@@ -0,0 +1,17 @@
+import { useGLTF } from '@react-three/drei'
+import ConveyorCollisionFile from '../../Meshes/Other/ConveyorCollision.glb';
+
+export default function Model(props) {
+  const { nodes } = useGLTF(ConveyorCollisionFile);
+  return [
+      { type: 'group', rotation: [-Math.PI / 2, 0, 0], children: [
+        {
+            type:'raw',
+            geometry:nodes.mesh_0.geometry,
+            material:nodes.mesh_0.material
+          }
+      ]}
+    ]
+}
+
+useGLTF.preload(ConveyorCollisionFile)

src/components/MeshLoaders/Other/ConveyorDispatcherCollision.js

@@ -0,0 +1,17 @@
+import { useGLTF } from '@react-three/drei'
+import ConveyorDispatcherCollisionFile from '../../Meshes/Other/ConveyorDispatcherCollision.glb';
+
+export default function Model(props) {
+  const { nodes } = useGLTF(ConveyorDispatcherCollisionFile);
+  return [
+      { type: 'group', rotation: [-Math.PI / 2, 0, 0], children: [
+        {
+            type:'raw',
+            geometry:nodes.mesh_0.geometry,
+            material:nodes.mesh_0.material
+          }
+      ]}
+    ]
+}
+
+useGLTF.preload(ConveyorDispatcherCollisionFile)

src/components/MeshLoaders/Other/ConveyorReceiverCollision.js

@@ -0,0 +1,17 @@
+import { useGLTF } from '@react-three/drei'
+import ConveyorReceiverCollisionFile from '../../Meshes/Other/ConveyorReceiverCollision.glb';
+
+export default function Model(props) {
+  const { nodes } = useGLTF(ConveyorReceiverCollisionFile);
+  return [
+      { type: 'group', rotation: [-Math.PI / 2, 0, 0], children: [
+        {
+            type:'raw',
+            geometry:nodes.mesh_0.geometry,
+            material:nodes.mesh_0.material
+          }
+      ]}
+    ]
+}
+
+useGLTF.preload(ConveyorReceiverCollisionFile)