|
@@ -9,7 +9,7 @@ var APP = {
|
|
|
var loader = new THREE.ObjectLoader();
|
|
|
var camera, scene, renderer;
|
|
|
|
|
|
- var scripts = {};
|
|
|
+ var events = {};
|
|
|
|
|
|
this.dom = undefined;
|
|
|
|
|
@@ -25,7 +25,7 @@ var APP = {
|
|
|
camera = loader.parse( json.camera );
|
|
|
scene = loader.parse( json.scene );
|
|
|
|
|
|
- scripts = {
|
|
|
+ events = {
|
|
|
keydown: [],
|
|
|
keyup: [],
|
|
|
mousedown: [],
|
|
@@ -41,26 +41,26 @@ var APP = {
|
|
|
|
|
|
var object = scene.getObjectByProperty( 'uuid', uuid, true );
|
|
|
|
|
|
- var sources = json.scripts[ uuid ];
|
|
|
+ var scripts = json.scripts[ uuid ];
|
|
|
|
|
|
- for ( var i = 0; i < sources.length; i ++ ) {
|
|
|
+ for ( var i = 0; i < scripts.length; i ++ ) {
|
|
|
|
|
|
- var script = sources[ i ];
|
|
|
+ var script = scripts[ i ];
|
|
|
|
|
|
- var events = ( new Function( 'player', 'scene', 'keydown', 'keyup', 'mousedown', 'mouseup', 'mousemove', 'touchstart', 'touchend', 'touchmove', 'update', script.source + '\nreturn { keydown: keydown, keyup: keyup, mousedown: mousedown, mouseup: mouseup, mousemove: mousemove, touchstart: touchstart, touchend: touchend, touchmove: touchmove, update: update };' ).bind( object ) )( this, scene );
|
|
|
+ var functions = ( new Function( 'player', 'scene', 'keydown', 'keyup', 'mousedown', 'mouseup', 'mousemove', 'touchstart', 'touchend', 'touchmove', 'update', script.source + '\nreturn { keydown: keydown, keyup: keyup, mousedown: mousedown, mouseup: mouseup, mousemove: mousemove, touchstart: touchstart, touchend: touchend, touchmove: touchmove, update: update };' ).bind( object ) )( this, scene );
|
|
|
|
|
|
- for ( var name in events ) {
|
|
|
+ for ( var name in functions ) {
|
|
|
|
|
|
- if ( events[ name ] === undefined ) continue;
|
|
|
+ if ( functions[ name ] === undefined ) continue;
|
|
|
|
|
|
- if ( scripts[ name ] === undefined ) {
|
|
|
+ if ( events[ name ] === undefined ) {
|
|
|
|
|
|
console.warn( 'APP.Player: event type not supported (', name, ')' );
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
- scripts[ name ].push( events[ name ].bind( object ) );
|
|
|
+ events[ name ].push( functions[ name ].bind( object ) );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -108,7 +108,7 @@ var APP = {
|
|
|
|
|
|
request = requestAnimationFrame( animate );
|
|
|
|
|
|
- dispatch( scripts.update, { time: time } );
|
|
|
+ dispatch( events.update, { time: time } );
|
|
|
|
|
|
renderer.render( scene, camera );
|
|
|
|
|
@@ -148,49 +148,49 @@ var APP = {
|
|
|
|
|
|
var onDocumentKeyDown = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.keydown, event );
|
|
|
+ dispatch( events.keydown, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentKeyUp = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.keyup, event );
|
|
|
+ dispatch( events.keyup, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentMouseDown = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.mousedown, event );
|
|
|
+ dispatch( events.mousedown, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentMouseUp = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.mouseup, event );
|
|
|
+ dispatch( events.mouseup, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentMouseMove = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.mousemove, event );
|
|
|
+ dispatch( events.mousemove, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentTouchStart = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.touchstart, event );
|
|
|
+ dispatch( events.touchstart, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentTouchEnd = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.touchend, event );
|
|
|
+ dispatch( events.touchend, event );
|
|
|
|
|
|
};
|
|
|
|
|
|
var onDocumentTouchMove = function ( event ) {
|
|
|
|
|
|
- dispatch( scripts.touchmove, event );
|
|
|
+ dispatch( events.touchmove, event );
|
|
|
|
|
|
};
|
|
|
|