small update

yomotsu · Oct 17, 2015 · a84e3ff · a84e3ff
1 parent f657ce9
commit a84e3ff
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 1,009 deletions.
diff --git a/build/addon/meshwalk.TPS.js b/build/addon/meshwalk.TPS.js
diff --git a/build/addon/meshwalk.TPS.min.js b/build/addon/meshwalk.TPS.min.js
diff --git a/example/1_getstarted.html b/example/1_getstarted.html
@@ -21,7 +21,7 @@
 
 <script src="../lib/three.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 'use strict';

diff --git a/example/2_keyboardInput.html b/example/2_keyboardInput.html
@@ -21,7 +21,7 @@
 
 <script src="../lib/three.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 // See demo/1_getstarted.html first

diff --git a/example/3_cameraControl.html b/example/3_cameraControl.html
@@ -21,7 +21,7 @@
 
 <script src="../lib/three.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 // See demo/2_keyboardInput.html first

diff --git a/example/4_objects.html b/example/4_objects.html
@@ -27,7 +27,7 @@
 
 <script src="../lib/three.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 // See demo/2_keyboardInput.html first

diff --git a/example/5_terrain.html b/example/5_terrain.html
@@ -21,7 +21,7 @@
 
 <script src="../lib/three.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 // See demo/3_cameraControl.html first

diff --git a/example/7_conclusion.html b/example/7_conclusion.html
@@ -19,7 +19,7 @@
 <script src="../lib/three.min.js"></script>
 <script src="../lib/bluebird.min.js"></script>
 <script src="../build/meshwalk.min.js"></script>
-<script src="../build/addon/meshwalk.TPS.min.js"></script>
+<script src="../build/meshwalk.TPS.min.js"></script>
 <script>
 
 'use strict';

diff --git a/src/TPS/KeyInputControl.js b/src/TPS/KeyInputControl.js
@@ -172,6 +172,7 @@
       )
     ) {
 
+      this.isMoveKeyHolded = false;
       this.dispatchEvent( { type: 'movekeyrelease' } );
 
     }

diff --git a/src/TPS/TPSCameraControl.js b/src/TPS/TPSCameraControl.js
@@ -11,9 +11,9 @@
   var modulo = function ( n, d ) {
 
     return ( ( n % d ) + d ) % d;
-    
+
   }
-  
+
   // camera              isntance of THREE.Camera
   // trackObject         isntance of THREE.Object3D
   // params.el           DOM element
@@ -26,7 +26,7 @@
     THREE.EventDispatcher.prototype.apply( this );
     this.camera = camera;
     this.trackObject  = trackObject;
-    this.el           = params && params.el || window;
+    this.el           = params && params.el || document.body;
     this.offset       = params && params.offset || new THREE.Vector3( 0, 0, 0 ),
     this.radius       = params && params.radius    || 10;
     this.minRadius    = params && params.minRadius || 1;
@@ -53,7 +53,7 @@
     this.el.addEventListener( 'mouseup',   this._mouseupListener,   false );
     this.el.addEventListener( 'mousewheel',     this._scrollListener, false );
     this.el.addEventListener( 'DOMMouseScroll', this._scrollListener, false );
-    
+
   };
 
   ns.TPSCameraControl.prototype = {
@@ -71,8 +71,8 @@
         this.trackObject.matrixWorld.elements[ 14 ] + this.offset.z
       );
       position = new THREE.Vector3(
-        Math.cos( this.phi ) * Math.cos( this.theta + PI_HALF ), 
-        Math.sin( this.phi ), 
+        Math.cos( this.phi ) * Math.cos( this.theta + PI_HALF ),
+        Math.sin( this.phi ),
         Math.cos( this.phi ) * Math.sin( this.theta + PI_HALF )
       );
       distance = this.collisionTest( position.clone().normalize() );
@@ -196,13 +196,15 @@
     this._pointerLast.y = this.lat;
     this.el.removeEventListener( 'mousemove', this._mousedragListener, false );
     this.el.addEventListener( 'mousemove', this._mousedragListener, false );
+    document.body.className += ' js-TPSCameraDragging';
 
   }
 
   function onmouseup () {
 
     this.dispatchEvent( { type: 'mouseup' } );
     this.el.removeEventListener( 'mousemove', this._mousedragListener, false );
+    document.body.className = document.body.className.replace( / js-TPSCameraDragging/, '' );
 
   }
 
@@ -223,12 +225,12 @@
   function onscroll ( event ) {
 
     event.preventDefault();
-    
+
     if ( event.wheelDeltaY ) {
 
       // WebKit
       this.radius -= event.wheelDeltaY * 0.05 / 5;
-    
+
     } else if ( event.wheelDelta ) {
 
       // IE

diff --git a/src/core/World.js b/src/core/World.js
@@ -23,6 +23,7 @@
     } else if ( object instanceof ns.CharacterController ) {
 
       this.characterPool.push( object );
+      object.world = this;
 
     }