diff --git a/905x4c8pna.js b/905x4c8pna.js index a89e484..9233ed4 100644 --- a/905x4c8pna.js +++ b/905x4c8pna.js @@ -1,2 +1,34 @@ -return null; +if (!this.entityLoaded) { + return; +} + +if (data.keyCode === R3.System.Input.KEY_UP) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'shoot' + } + ); +} + +if (data.keyCode === R3.System.Input.KEY_LEFT) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'left' + } + ); +} + +if (data.keyCode === R3.System.Input.KEY_RIGHT) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'right' + } + ); +} + + + //@ sourceURL=keyDown.js \ No newline at end of file diff --git a/dwxvtxzrun.js b/dwxvtxzrun.js index 6c245a6..5e4df00 100644 --- a/dwxvtxzrun.js +++ b/dwxvtxzrun.js @@ -1,3 +1,5 @@ +return; + if (!this.entityLoaded) { return; } diff --git a/ff0fsum4zx.js b/ff0fsum4zx.js index 1407516..46fca8d 100644 --- a/ff0fsum4zx.js +++ b/ff0fsum4zx.js @@ -85,7 +85,9 @@ this.invertY = true; this.invertX = true; -this.shooting = false; +this.preparing = false; + +this.looking = null; if (this.debug) { this.arrowHelper = new THREE.ArrowHelper( @@ -124,19 +126,44 @@ R3.CustomCode.prototype.render = function(delta) { } ); - if (this.shooting === true) { - + if (this.preparing === true) { this.move( { x : 0, - y : 10 * delta + y : delta * -200 } ); + } - if (this.playerRotation.y < 0) { - this.playerRotation.y = 0; - this.shooting = false; - } + if (this.preparing === false && this.playerRotation.y < 0) { + this.move( + { + x : 0, + y : delta * 1000 + } + ); + }; + + if (this.looking === 'left') { + this.move( + { + x : delta * -700, + y : 0 + } + ); + } + + if (this.looking === 'right') { + this.move( + { + x : delta * 700, + y : 0 + } + ); + } + + if (this.activeBall === null) { + this.createActiveBall(); } if (this.totalTime <= 0) { @@ -328,7 +355,7 @@ R3.CustomCode.prototype.render = function(delta) { R3.CustomCode.prototype.move = function(data) { var x = 0; - + if (data && data.x) { if (this.invertX) { x = data.x; @@ -336,22 +363,22 @@ R3.CustomCode.prototype.move = function(data) { x = -data.x; } } - + var y = 0; - + if (data && data.y) { - + if (this.invertY) { y = data.y; } else { y = -data.y; } - - } - + + } + x *= 0.0025; y *= 0.0075; - + this.playerRotation.x += x; this.playerRotation.y += y; @@ -359,8 +386,9 @@ R3.CustomCode.prototype.move = function(data) { /** * Clamp player rotation to values between 0 and Math.PI * 2 */ - if (this.playerRotation.y > Math.PI) { - this.playerRotation.y = Math.PI; + if (this.playerRotation.y > 0) { + this.playerRotation.y = 0; + this.kick = true; } if (this.playerRotation.y < -Math.PI) { @@ -375,41 +403,39 @@ R3.CustomCode.prototype.move = function(data) { this.playerRotation.x = -Math.PI / 2; } - if (this.playerRotation.y <= 0) { - this.canKick = true; - } + // if (this.playerRotation.y <= 0) { + // this.canKick = true; + // } - if (this.canKick && this.playerRotation.y > 0) { - this.canKick = false; - this.kick = true; - } + //if (this.canKick && this.playerRotation.y === 0) { + // this.canKick = false; + // this.kick = true; + // } - if (y > 0 && this.canKick) { + // if (y > 0 && this.canKick) { + // + // /** + // * Moving down, initialize start time and record the distance travelled + // */ + // if (this.startTime === null) { + // this.startTime = Date.now(); + // } + // + // //this.kickDistance += Math.abs(y); + // + // } + + // if (y < 0) { + // /** + // * We are no longer moving down, also reset our Y distance counter + // * @type {boolean} + // */ + // //this.kickDistance = 0; + // this.startTime = null; + // } - /** - * Moving down, initialize start time and record the distance travelled - */ - if (this.startTime === null) { - this.startTime = Date.now(); - } - - this.kickDistance += Math.abs(y); - - } - - if (y < 0) { - /** - * We are no longer moving down, also reset our Y distance counter - * @type {boolean} - */ - this.kickDistance = 0; - this.startTime = null; - } - if (this.canKick && this.activeBall === null) { - this.createActiveBall(); - } this.footballPlayer.instance.matrix = new THREE.Matrix4(); this.footballPlayer.instance.matrix.decompose( @@ -430,10 +456,12 @@ R3.CustomCode.prototype.move = function(data) { this.kick = false; - if (this.startTime === null) { - console.warn('no kick start time'); - return; - } + //this.shooting = false; + + // if (this.startTime === null) { + // console.warn('no kick start time'); + // return; + // } R3.Event.Emit( R3.Event.PLAY_AUDIO, @@ -442,9 +470,11 @@ R3.CustomCode.prototype.move = function(data) { } ); - var kickDuration = Date.now() - this.startTime; + //var kickDuration = 1;//Date.now() - this.startTime; - var speed = this.kickDistance / kickDuration * 20; + var speed = this.kickDistance; + + console.log('speed = ' + speed); // if (speed > 1.5) { // speed = 1.5; @@ -476,7 +506,7 @@ R3.CustomCode.prototype.move = function(data) { kickDuration : this.kickDuration, kickDistance : this.kickDistance, kickSpeed : speed, - upAngle : Math.PI * speed, + upAngle : speed, v : v, vRotationAxis : vRotationAxis, t : 0, @@ -492,7 +522,7 @@ R3.CustomCode.prototype.move = function(data) { this.activeBall = null; } -}.bind(this) +}.bind(this); R3.Event.Subscribe( @@ -527,40 +557,28 @@ R3.Event.Subscribe( function(data) { if (data.type === 'shoot') { - - console.log('shoot'); - - this.shooting = false; - - this.move( - { - x : 0, - y : -10 - } - ); + this.preparing = true; } if (data.type === 'shoot_release') { - console.log('shoot release'); - this.shooting = true; + this.preparing = false; + this.kickDistance = Math.abs(this.playerRotation.y); } - if (data.type === 'look_left') { - this.move( - { - x : -10, - y : 0 - } - ); + if (data.type === 'left') { + this.looking = 'left'; } - if (data.type === 'look_right') { - this.move( - { - x : 10, - y : 0 - } - ); + if (data.type === 'right') { + this.looking = 'right'; + } + + if (data.type === 'right_release') { + this.looking = null; + } + + if (data.type === 'left_release') { + this.looking = null; } }.bind(this) diff --git a/p49pad0i7l.js b/p49pad0i7l.js index 190d333..2f143b5 100644 --- a/p49pad0i7l.js +++ b/p49pad0i7l.js @@ -1,3 +1,5 @@ +return; + if (!this.entityLoaded) { return; } diff --git a/r5kzahijoq.js b/r5kzahijoq.js index b087bbc..0c9a0ce 100644 --- a/r5kzahijoq.js +++ b/r5kzahijoq.js @@ -2,6 +2,31 @@ if (!this.entityLoaded) { return; } -console.log(data); +if (data.keyCode === R3.System.Input.KEY_LEFT) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'left_release' + } + ) +} -//@ sourceURL=keyDown.js \ No newline at end of file +if (data.keyCode === R3.System.Input.KEY_RIGHT) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'right_release' + } + ) +} + +if (data.keyCode === R3.System.Input.KEY_UP) { + R3.Event.Emit( + R3.Event.GAME_DATA, + { + type : 'shoot_release' + } + ) +} + +//@ sourceURL=keyUp.js \ No newline at end of file