Use real entity height and width (#140)

PrismarineJS · Feb 21, 2021 · 9c53fc0 · 9c53fc0
1 parent e4559d2
commit 9c53fc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/viewer/lib/entities.js b/viewer/lib/entities.js
@@ -2,21 +2,20 @@ const THREE = require('three')
 
 function getEntityMesh (entity) {
   if (entity.type === 'player') {
-    const geometry = new THREE.BoxGeometry(0.6, 1.8, 0.6)
-    geometry.translate(0, 0.9, 0)
+    const geometry = new THREE.BoxGeometry(entity.width, entity.height, entity.width)
+    geometry.translate(0, entity.height / 2, 0)
     const material = new THREE.MeshBasicMaterial({ color: 0x0000ff })
     const cube = new THREE.Mesh(geometry, material)
     return cube
   } else if (entity.type === 'object') {
-    const geometry = new THREE.BoxGeometry(0.2, 0.2, 0.2)
-    geometry.translate(0, 0.1, 0)
+    const geometry = new THREE.BoxGeometry(entity.width, entity.height, entity.width)
+    geometry.translate(0, entity.height / 2, 0)
     const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 })
     const cube = new THREE.Mesh(geometry, material)
     return cube
   }
-  // g(entity.type)
-  const geometry = new THREE.BoxGeometry(1, 1, 1)
-  geometry.translate(0, 0.5, 0)
+  const geometry = new THREE.BoxGeometry(entity.width, entity.height, entity.width)
+  geometry.translate(0, entity.height / 2, 0)
   const material = new THREE.MeshBasicMaterial({ color: 0xff00ff })
   const cube = new THREE.Mesh(geometry, material)
   return cube

diff --git a/viewer/lib/worldView.js b/viewer/lib/worldView.js
@@ -15,7 +15,7 @@ class WorldView extends EventEmitter {
     this.listeners = {
       // 'move': botPosition,
       entitySpawn: function (e) {
-        worldView.emitter.emit('entity', { id: e.id, type: e.type, pos: e.position })
+        worldView.emitter.emit('entity', { id: e.id, type: e.type, pos: e.position, width: e.width, height: e.height })
       },
       entityMoved: function (e) {
         worldView.emitter.emit('entity', { id: e.id, pos: e.position })
@@ -49,7 +49,7 @@ class WorldView extends EventEmitter {
     for (const id in bot.entities) {
       const e = bot.entities[id]
       if (e !== bot.entity) {
-        this.emitter.emit('entity', { id: e.id, type: e.type, pos: e.position })
+        this.emitter.emit('entity', { id: e.id, type: e.type, pos: e.position, width: e.width, height: e.height })
       }
     }
   }