mirror of
https://github.com/logsol/chuck.js.git
synced 2026-05-11 10:37:34 +00:00
merged from master (use strict)
This commit is contained in:
commit
1f8f0ef6e1
76 changed files with 157 additions and 60 deletions
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Detector () {
|
||||
Parent.call(this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ define([
|
|||
|
||||
function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RagDoll) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GameController (options) {
|
||||
|
||||
this.animationTimeout = null;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Item, Box2D, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Doll(physicsEngine, uid, player) {
|
||||
Parent.call(this, physicsEngine, uid, player);
|
||||
|
|
@ -15,10 +17,12 @@ function (Parent, Item, Box2D, Nc) {
|
|||
|
||||
Doll.prototype.findCloseItem = function(x, y) {
|
||||
|
||||
var self = this;
|
||||
|
||||
function findItem(array) {
|
||||
for (var i = 0; i < array.length; i++) {
|
||||
var item = array[i];
|
||||
if(item.isGrabbingAllowed(this.player)) {
|
||||
if(item.isGrabbingAllowed(self.player)) {
|
||||
return item;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Item(physicsEngine, uid, options) {
|
||||
Parent.call(this, physicsEngine, uid, options);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function RagDoll(physicsEngine, uid, options) {
|
||||
this.scheduledForDestruction = false;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
return Parent;
|
||||
|
||||
});
|
||||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
return Parent;
|
||||
|
||||
});
|
||||
|
|
@ -6,6 +6,8 @@ define([
|
|||
|
||||
function (Parent, Settings, FileSystem) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Level (uid, engine, gameObjects) {
|
||||
Parent.call(this, uid, engine, gameObjects);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
return Parent;
|
||||
|
||||
});
|
||||
|
|
@ -5,6 +5,8 @@ define([
|
|||
|
||||
function (Nc, Channel) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function PipeToServer (process) {
|
||||
|
||||
var self = this;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Player(id, physicsEngine, user) {
|
||||
Parent.call(this, id, physicsEngine, user);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ define([
|
|||
],
|
||||
|
||||
function () {
|
||||
|
||||
"use strict";
|
||||
|
||||
function AudioPlayer(path) {
|
||||
this.audio = new Audio(path);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Detector () {
|
||||
Parent.call(this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GamepadInput(playerController) {
|
||||
this.playerController = playerController;
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
define([
|
||||
"Game/Client/Control/Key"
|
||||
],
|
||||
|
||||
function (Key) {
|
||||
|
||||
function KeyboardInput () {
|
||||
this._registry = {};
|
||||
this.init();
|
||||
}
|
||||
|
||||
KeyboardInput.prototype.init = function () {
|
||||
// Using window is ok here because it only runs in the browser
|
||||
window.onkeydown = this._onKeyDown.bind(this);
|
||||
window.onkeyup = this._onKeyUp.bind(this);
|
||||
}
|
||||
|
||||
KeyboardInput.prototype.registerKey = function (keyCode, onKeyDown, onKeyUp) {
|
||||
var key = new Key();
|
||||
if(onKeyDown) key.setKeyDownFunction(onKeyDown);
|
||||
if(onKeyUp) key.setKeyUpFunction(onKeyUp);
|
||||
this._registry[keyCode] = key;
|
||||
}
|
||||
|
||||
KeyboardInput.prototype._getKeyByKeyCode = function (keyCode) {
|
||||
return this._registry[keyCode];
|
||||
}
|
||||
|
||||
KeyboardInput.prototype._onKeyDown = function (e) {
|
||||
var key = this._getKeyByKeyCode(e.keyCode);
|
||||
|
||||
if (key && !key.getActive()) {
|
||||
var callback = key.getKeyDownFunction();
|
||||
if(callback) callback();
|
||||
key.setActive(true);
|
||||
}
|
||||
|
||||
// Prevent tab from changing focus
|
||||
if(e.keyCode == 9) return false;
|
||||
}
|
||||
|
||||
KeyboardInput.prototype._onKeyUp = function (e) {
|
||||
var key = this._getKeyByKeyCode(e.keyCode);
|
||||
if (key && key.getActive()) {
|
||||
var callback = key.getKeyUpFunction();
|
||||
if(callback) callback();
|
||||
key.setActive(false);
|
||||
}
|
||||
|
||||
// Prevent tab from changing focus
|
||||
if(e.keyCode == 9) return false;
|
||||
}
|
||||
|
||||
return KeyboardInput;
|
||||
});
|
||||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Parent, Nc, KeyboardAndMouse, Gamepad) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function PlayerController (me) {
|
||||
|
||||
Parent.call(this, me);
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ define([
|
|||
|
||||
function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, requestAnimFrame, Settings, GameObject, Doll, DomController, ProtocolHelper, Me, AudioPlayer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
if (!window.cancelAnimationFrame) {
|
||||
window.cancelAnimationFrame = function(id) {
|
||||
clearTimeout(id);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc, Exception, ColorConverter, Layer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Doll(physicsEngine, uid, player) {
|
||||
this.layerId = Layer.ID.SPAWN;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Exception, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GameObject(physicsEngine, uid) {
|
||||
Parent.call(this, physicsEngine, uid);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc, Layer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Item(physicsEngine, uid, options) {
|
||||
this.layerId = Layer.ID.ITEM;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, CoreItem, Settings, Nc, Layer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function RagDoll(physicsEngine, uid, options) {
|
||||
this.layerId = Layer.ID.SPAWN;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Rube(physicsEngine, uid, options) {
|
||||
Parent.call(this, physicsEngine, uid, options);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function SpectatorDoll(physicsEngine, uid) {
|
||||
Parent.call(this, physicsEngine, uid);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc, Layer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Tile(physicsEngine, uid, options) {
|
||||
this.layerId = Layer.ID.TILE;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
|
||||
function (Parent, Settings, Nc, PIXI, AbstractLayer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Level (uid, engine, gameObjects) {
|
||||
Parent.call(this, uid, engine, gameObjects);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function TiledLevel(uid, engine, gameObjects) {
|
||||
this.layerId = "background";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Settings, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Me(id, physicsEngine, user) {
|
||||
Parent.call(this, id, physicsEngine, user);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ define([
|
|||
|
||||
function (ProtocolHelper, GameController, User, Nc, Settings, DomController) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Networker (socketLink, channelName, nickname) {
|
||||
this.channelName = channelName;
|
||||
this.nickname = nickname;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
|
||||
function (Parent, Settings, DomController, Box2D, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Engine () {
|
||||
Parent.call(this);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Nc, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Player(id, physicsEngine, user) {
|
||||
Parent.call(this, id, physicsEngine, user);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Abstract) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Layer(name, parallaxSpeed) {
|
||||
this.name = name;
|
||||
this.parallaxSpeed = parallaxSpeed;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
],
|
||||
|
||||
function (Abstract, DomController, Settings, Exception, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function AbstractView () {
|
||||
this.me = null;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Settings, Nc, Stats, Screenfull) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function DomController() {
|
||||
this.canvas = document.getElementById("canvas");
|
||||
this.debugCanvas = null;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Nc, Exception, Layer) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function LayerManager(container, me) {
|
||||
this.layers = [];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Settings, Nc, Stats, Screenfull) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Mesh() {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (PIXI) {
|
||||
|
||||
"use strict";
|
||||
|
||||
var Parent = PIXI.AbstractFilter;
|
||||
|
||||
function ColorRangeReplaceFilter() {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (PIXI, Nc, Settings, ColorConverter) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GameStats(container) {
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Parent, PIXI, ColorRangeReplaceFilter, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
var AVAILABLE_MESH_FILTERS = {
|
||||
"blur": PIXI.BlurFilter,
|
||||
"desaturate": PIXI.GrayFilter,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, PIXI, Nc, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Ghost() {
|
||||
Parent.call(this, "ghost", 0);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ define([
|
|||
|
||||
function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, LayerManager, Ghost, Swiper) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function PixiView () {
|
||||
|
||||
Parent.call(this);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, DomController, Three, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function ThreeView () {
|
||||
Parent.call(this);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
],
|
||||
|
||||
function (Settings, Exception, AbstractView, PixiView, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
var ViewManager = {};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
|
||||
function (Box2D) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Detector () {
|
||||
this.listener = new Box2D.Dynamics.b2ContactListener();
|
||||
this.listener.BeginContact = this.beginContact.bind(this);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
|
||||
function (PhysicsEngine, TiledLevel, Player, Nc, Doll) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GameController (options) {
|
||||
|
||||
this.options = options;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ define([
|
|||
|
||||
function (Parent, Box2D, Settings, CollisionDetector, Item, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Doll (physicsEngine, uid, player) {
|
||||
|
||||
this.characterName = "Chuck";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
],
|
||||
|
||||
function (Box2D, Exception) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function GameObject(physicsEngine, uid) {
|
||||
this.uid = uid;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D, Options, Settings, Exception, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Item(physicsEngine, uid, options) {
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D, Settings, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function RagDoll(physicsEngine, uid, options) {
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function RagDoll(physicsEngine, uid, options) {
|
||||
Parent.call(this, physicsEngine, uid, options);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Parent, RubeLoader, Box2D, Settings ) {
|
||||
|
||||
"use strict";
|
||||
|
||||
// Fixme - make this loadable
|
||||
var __ragdollJson;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D, Settings) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Skateboard(physicsEngine, uid, options) {
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function SpectatorDoll(physicsEngine, uid, player) {
|
||||
Parent.call(this, physicsEngine, uid);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
],
|
||||
|
||||
function (Parent, Box2D, Settings, Exception, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Tile(physicsEngine, uid, options) {
|
||||
this.options = options;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ define([
|
|||
|
||||
function (Settings, Box2D, CollisionDetector, Nc) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Engine () {
|
||||
this.world = new Box2D.Dynamics.b2World(
|
||||
new Box2D.Common.Math.b2Vec2(0, Settings.BOX2D_GRAVITY),
|
||||
|
|
|
|||
|
|
@ -7,9 +7,10 @@ define([
|
|||
"Game/" + GLOBALS.context + "/GameObjects/Items/RagDoll"
|
||||
],
|
||||
|
||||
|
||||
function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function Player (id, physicsEngine, user) {
|
||||
this.stats = {
|
||||
health: 100,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue