Browse Source

Better pickup predicate

David Catuhe 10 years ago
parent
commit
72b9ac02e8
3 changed files with 30606 additions and 30609 deletions
  1. 1 4
      Babylon/Actions/babylon.actionManager.ts
  2. 28 30577
      babylon.2.1-beta.debug.js
  3. 30577 28
      babylon.2.1-beta.js

+ 1 - 4
Babylon/Actions/babylon.actionManager.ts

@@ -194,9 +194,6 @@
                 if (action.trigger >= ActionManager._OnPickTrigger && action.trigger <= ActionManager._OnCenterPickTrigger) {
                     return true;
                 }
-                if (action.trigger == ActionManager._OnPickUpTrigger) {
-                    return true;
-                }
             }
 
             return false;
@@ -268,4 +265,4 @@
             return properties[properties.length - 1];
         }
     }
-} 
+} 

File diff suppressed because it is too large
+ 28 - 30577
babylon.2.1-beta.debug.js


File diff suppressed because it is too large
+ 30577 - 28
babylon.2.1-beta.js