From eb3ae6f00c8c4b5a8c9d296212b9992481b639c8 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Tue, 27 Jun 2023 18:50:09 +0200
Subject: [PATCH] better collisions

---
 MazeMesh.js | 10 ++++++----
 main.js     | 15 ++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/MazeMesh.js b/MazeMesh.js
index 7dc980a..69a9c97 100644
--- a/MazeMesh.js
+++ b/MazeMesh.js
@@ -1,10 +1,12 @@
 import * as THREE from 'three';
 
-const mazeGeometry = new THREE.BoxGeometry( 1, 1, 1 );
-
 export default class MazeMesh extends THREE.InstancedMesh {
-    constructor( width, length, material ) {
-        super( mazeGeometry, material, width*length - 2 );
+    constructor( width, length, height, material ) {
+        super( 
+            new THREE.BoxGeometry( 1, height, 1 ),
+            material,
+            width*length - 2
+        );
         this.length = length
         this.width = width
         this.map = new Array(length).fill().map(() => new Array(width).fill(1))
diff --git a/main.js b/main.js
index 1d81ead..558ce43 100644
--- a/main.js
+++ b/main.js
@@ -15,7 +15,7 @@ import MazeMesh from './MazeMesh.js';
 const mazeWidth = 23
 
 const parameters = {
-    elevation: 90 * Math.random(),
+    elevation: 1 + 89 * Math.random(),
     azimuth: -160,
 };
 
@@ -87,7 +87,7 @@ const wallMaterial = new THREE.MeshStandardMaterial({
     roughnessMap: loader.load('img/stonewall-roughness.png'),
 })
 
-const maze = new MazeMesh(mazeWidth, mazeWidth, wallMaterial);
+const maze = new MazeMesh(mazeWidth, mazeWidth, 1, wallMaterial);
 maze.castShadow = true;
 maze.receiveShadow = true;
 maze.matrixAutoUpdate = false
@@ -95,12 +95,13 @@ scene.add(maze)
 
 console.log(String(maze))
 
-const wall = new THREE.Mesh(maze.geometry);
+const invisibleWall = new THREE.Mesh(new THREE.BoxGeometry( .9, 1.8, .9 ));
 let matrix = new THREE.Matrix4()
 for (let i = 0; i < maze.count; i++) {
     maze.getMatrixAt(i, matrix)
-    const clone = wall.clone()
+    const clone = invisibleWall.clone()
     clone.position.setFromMatrixPosition(matrix)
+    clone.position.y += 0.5;
     worldOctree.fromGraphNode(clone)
 }
 
@@ -179,11 +180,7 @@ ground.matrixAutoUpdate = false
 ground.updateMatrix();
 scene.add(ground)
 
-const groundCollisioner = new THREE.Mesh(
-    new THREE.PlaneGeometry(mazeWidth, mazeWidth)
-)
-groundCollisioner.rotation.x = - Math.PI / 2;
-worldOctree.fromGraphNode(groundCollisioner)
+worldOctree.fromGraphNode(ground)
 
 // Water