'refactor and all sorts of stuff'

foglabs · Nov 1, 2020 · 1c52541 · 1c52541
1 parent efec97c
commit 1c52541
Show file tree

Hide file tree

Showing 346 changed files with 55,233 additions and 1,960 deletions.
diff --git a/index.html b/index.html
@@ -8,6 +8,8 @@
 </head>
 <body>
   <script type="text/javascript">
+
+    //utility functions
     function k(obj){
       return Object.keys(obj)
     }
@@ -100,13 +102,13 @@
 
     MOVE = 0
     WAIT = 1
+
+    DEMO = 0
   </script>
 
   <script type="module">
-    import * as main from '/v3/lib/main.js'
-    console.log('scene', main.scene)
+    import * as main from '/lib/main.js'
   </script>
 
-
 </body>
 </html>
diff --git a/lib/Character.js b/lib/Character.js
@@ -1,6 +1,6 @@
 import * as THREE from "./three.module.js"
 import { Timer } from "./Timer.js"
-import { scene, floor, characters } from "./main.js"
+import { scene, place } from "./main.js"
 
 class Character {
   constructor(geo, bbox, base_color, mat=false){
@@ -92,7 +92,7 @@ class Character {
   }
 
   arrivedAtPoint(){
-    return isWithin(this.mesh.position.x, this.routePoints[0][0], 0.1) && isWithin(this.mesh.position.y, this.routePoints[0][1], 0.1) && isWithin(this.mesh.position.z, this.routePoints[0][2], 0.1)
+    return isWithin(this.mesh.position.x, this.routePoints[0][0], 0.01) && isWithin(this.mesh.position.y, this.routePoints[0][1], 0.01) && isWithin(this.mesh.position.z, this.routePoints[0][2], 0.01)
   }
 
   handleRoutePoints(){
@@ -106,7 +106,7 @@ class Character {
         // this.routePoints.shift()
 
         this.action = WAIT
-        // console.log( 'arrived' )
+        console.log( 'arrived' )
         this.waitTimer.reset()
 
         // if we finished the route, we finished a lap
@@ -469,7 +469,7 @@ class Character {
 
   gravity(){
     // if(this.mesh.position.y > FLOOR){
-    if(!this.bbox.intersectsBox( floor.bbox )){
+    if(!this.bbox.intersectsBox( place.floor.bbox )){
       // pull down if were not at the floor yet
       this.accy = this.accy - 0.05
     } else {
@@ -497,7 +497,7 @@ class Character {
         for(var i=0; i<intersects.length; i++){
 
           // look for a char from the intsersect
-          otherChar = characters[ intersects[i].object.id ]
+          otherChar = place.characters[ intersects[i].object.id ]
           if(otherChar){
 
             // are we actually touching boxes wittem
@@ -668,49 +668,49 @@ class Character {
     // set bounding box from mesh baby
     this.bbox.setFromObject(this.mesh)
 
-    this.colorCycle()
+    // this.colorCycle()
 
-    if(this.deadSprite && this.deadSpriteMoves){
-      this.deadSprite.position.set(this.mesh.position.x, this.mesh.position.y, this.mesh.position.z)
-    }
+    // if(this.deadSprite && this.deadSpriteMoves){
+    //   this.deadSprite.position.set(this.mesh.position.x, this.mesh.position.y, this.mesh.position.z)
+    // }
 
-    if(this.banners){
-      this.banners.animation()
-    }
+    // if(this.banners){
+    //   this.banners.animation()
+    // }
 
-    if(this.godBanners){
-      this.godBanners.animation()
-    }
+    // if(this.godBanners){
+    //   this.godBanners.animation()
+    // }
 
-    if(this.duster){
-      // run dis
-      this.duster.animation()
-      if(this.dusterTimer.time() > 20){
-        this.dusterTimer.reset()
+    // if(this.duster){
+    //   // run dis
+    //   this.duster.animation()
+    //   if(this.dusterTimer.time() > 20){
+    //     this.dusterTimer.reset()
 
-         this.duster.particleSystem.material.opacity -= 0.1
-        if(this.duster.particleSystem.material.opacity <= 0){
+    //      this.duster.particleSystem.material.opacity -= 0.1
+    //     if(this.duster.particleSystem.material.opacity <= 0){
 
-          this.duster.remove()
-          this.duster = null
-        }
-      }
-    }
+    //       this.duster.remove()
+    //       this.duster = null
+    //     }
+    //   }
+    // }
 
-    if(this.bloodDuster){
-      // run dis
-      this.bloodDuster.animation()
-      if(this.bloodDusterTimer.time() > 20){
-        this.bloodDusterTimer.reset()
+    // if(this.bloodDuster){
+    //   // run dis
+    //   this.bloodDuster.animation()
+    //   if(this.bloodDusterTimer.time() > 20){
+    //     this.bloodDusterTimer.reset()
 
-         this.bloodDuster.particleSystem.material.opacity -= 0.1
-        if(this.bloodDuster.particleSystem.material.opacity <= 0){
+    //      this.bloodDuster.particleSystem.material.opacity -= 0.1
+    //     if(this.bloodDuster.particleSystem.material.opacity <= 0){
 
-          this.bloodDuster.remove()
-          this.bloodDuster = null
-        }
-      }
-    }
+    //       this.bloodDuster.remove()
+    //       this.bloodDuster = null
+    //     }
+    //   }
+    // }
 
   }
 }

diff --git a/lib/Game.js b/lib/Game.js
@@ -1,4 +1,4 @@
-import { Timer } from '/v3/lib/Timer.js'
+import { Timer } from '/lib/Timer.js'
 
 class Game {
   constructor(){

diff --git a/lib/Place.js b/lib/Place.js
@@ -0,0 +1,18 @@
+import * as THREE from "./three.module.js"
+import { Timer } from "./Timer.js"
+import { scene } from "./main.js"
+
+class Place {
+  // encapsulates background color/image control, scenery objects, and floor object
+  constructor(backgroundHex, characters, floor){
+    this.backgroundHex = backgroundHex
+    this.characters = characters
+    this.floor = floor
+  }
+
+  handlePlace(){
+
+  }
+}
+
+export { Place }
diff --git a/lib/Pointer.js b/lib/Pointer.js
@@ -15,7 +15,7 @@ class Pointer extends Character {
     // mesh id aka characters[mesh id]
     this.grabbedId = null
 
-    let geo = new THREE.BoxGeometry( 0.4,0.4,0.4 )
+    let geo = new THREE.BoxGeometry( 0.1,0.1,0.1 )
     let mat = new THREE.MeshPhysicalMaterial( { color: '#0000ff', transparent: true, transmission: 0.5, reflectivity: 1, roughness: 0, clearcoat: 1.0, clearcoatRoughness: 0.1 })
     this.grabBox = new Character(geo, new THREE.Box3(new THREE.Vector3(), new THREE.Vector3()), [23,23,141], mat)
     scene.add(this.grabBox.mesh)

diff --git a/lib/TubePainter.js b/lib/TubePainter.js