From ceafcc628c5f423b4ff3eca78855f4b836d24b31 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Thu, 19 Jul 2012 12:06:24 +0300 Subject: [PATCH 1/3] Made core for constants more awesome. --- lib/Chuck/Constants.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/Chuck/Constants.js b/lib/Chuck/Constants.js index 4e41b00..f10054f 100644 --- a/lib/Chuck/Constants.js +++ b/lib/Chuck/Constants.js @@ -1,15 +1,9 @@ -define(function() { +define({ + COLLISION_IDENTIFIER_PLAYER: 'player', + COLLISION_IDENTIFIER_PLAYER_HEAD: 'head', + COLLISION_IDENTIFIER_PLAYER_CHEST: 'chest', + COLLISION_IDENTIFIER_PLAYER_LEGS: 'legs', + COLLISION_IDENTIFIER_PLAYER_FOOT_SENSOR: 'footsensor', - var Constants = { - COLLISION_IDENTIFIER_PLAYER: 'player', - COLLISION_IDENTIFIER_PLAYER_HEAD: 'head', - COLLISION_IDENTIFIER_PLAYER_CHEST: 'chest', - COLLISION_IDENTIFIER_PLAYER_LEGS: 'legs', - COLLISION_IDENTIFIER_PLAYER_FOOT_SENSOR: 'footsensor', - - COLLISION_IDENTIFIER_TILE: 'tile' - } - - return Constants; - + COLLISION_IDENTIFIER_TILE: 'tile' }); \ No newline at end of file From 19287ebb5d94936d2af626c61676913d33cac887 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Thu, 19 Jul 2012 12:10:45 +0300 Subject: [PATCH 2/3] Added my awesomeness to the settings. --- lib/Chuck/Settings.js | 88 ++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 48 deletions(-) diff --git a/lib/Chuck/Settings.js b/lib/Chuck/Settings.js index db6bbc6..9c57666 100755 --- a/lib/Chuck/Settings.js +++ b/lib/Chuck/Settings.js @@ -1,59 +1,51 @@ -define(function() { +define({ + STAGE_WIDTH: 600, + STAGE_HEIGHT: 400, - var Settings = { - STAGE_WIDTH: 600, - STAGE_HEIGHT: 400, + // BOX2D INITIALATORS + RATIO: 35, + BOX2D_WORLD_AABB_SIZE: 3000, + BOX2D_ALLOW_SLEEP: true, + BOX2D_GRAVITY: 16, + BOX2D_VELOCITY_ITERATIONS: 5, + BOX2D_POSITION_ITERATIONS: 5, + BOX2D_TIME_STEP: 1 / 60, - // BOX2D INITIALATORS - RATIO: 35, - BOX2D_WORLD_AABB_SIZE: 3000, - BOX2D_ALLOW_SLEEP: true, - BOX2D_GRAVITY: 16, - BOX2D_VELOCITY_ITERATIONS: 5, - BOX2D_POSITION_ITERATIONS: 5, - BOX2D_TIME_STEP: 1 / 60, + // GRAPHIC PATHS + GRAPHICS_PATH: 'static/img/', + GRAPHICS_SUBPATH_ITEMS: 'items/', + GRAPHICS_SUBPATH_CHARACTERS: 'characters/', - // GRAPHIC PATHS - GRAPHICS_PATH: 'static/img/', - GRAPHICS_SUBPATH_ITEMS: 'items/', - GRAPHICS_SUBPATH_CHARACTERS: 'characters/', + TILE_SIZE: 15, - TILE_SIZE: 15, + // GAME PLAY + WALK_SPEED: 2.5, + RUN_SPEED: 4.0, + FLY_SPEED: 3.2, + JUMP_SPEED: 3.0, + JUMP_UPLIFT: 0.05, - // GAME PLAY - WALK_SPEED: 2.5, - RUN_SPEED: 4.0, - FLY_SPEED: 3.2, - JUMP_SPEED: 3.0, - JUMP_UPLIFT: 0.05, + // restitution: bouncyness, friction: rubbing, density: mass + TILE_FRICTION: 0.99, + TILE_RESTITUTION: 0.1, - // restitution: bouncyness, friction: rubbing, density: mass - TILE_FRICTION: 0.99, - TILE_RESTITUTION: 0.1, + PLAYER_DENSITY: 0.96, + PLAYER_FRICTION: 5, + PLAYER_MOTION_FRICTION: 0.1, + PLAYER_RESTITUTION: 0.0, + PLAYER_LINEAR_DAMPING: .5, - PLAYER_DENSITY: 0.96, - PLAYER_FRICTION: 5, - PLAYER_MOTION_FRICTION: 0.1, - PLAYER_RESTITUTION: 0.0, - PLAYER_LINEAR_DAMPING: .5, + ITEM_DENSITY: 0.9, + ITEM_FRICTION: 0.99, + ITEM_RESTITUTION: 0.02, - - ITEM_DENSITY: 0.9, - ITEM_FRICTION: 0.99, - ITEM_RESTITUTION: 0.02, - - // BROWSER - CANVAS_DOM_ID: 'canvasContainer', - IS_BROWSER_ENVIRONMENT: isBrowserEnvironment(), - DEBUG_MODE: true, - - // NETWORKING - WORLD_UPDATE_BROADCAST_INTERVAL: 15 - }; - - function isBrowserEnvironment(){ + // BROWSER + CANVAS_DOM_ID: 'canvasContainer', + IS_BROWSER_ENVIRONMENT: isBrowserEnvironment(){ return typeof window !== 'undefined'; - } + }, + DEBUG_MODE: true, - return Settings; + // NETWORKING + WORLD_UPDATE_BROADCAST_INTERVAL: 15 }) \ No newline at end of file From 46fa3f0e634e8650103723746f791b094650d903 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Thu, 19 Jul 2012 12:20:13 +0300 Subject: [PATCH 3/3] Fixed a copy and paste error within the settings. --- lib/Chuck/Settings.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Chuck/Settings.js b/lib/Chuck/Settings.js index 9c57666..b438367 100755 --- a/lib/Chuck/Settings.js +++ b/lib/Chuck/Settings.js @@ -41,9 +41,8 @@ define({ // BROWSER CANVAS_DOM_ID: 'canvasContainer', - IS_BROWSER_ENVIRONMENT: isBrowserEnvironment(){ - return typeof window !== 'undefined'; - }, + IS_BROWSER_ENVIRONMENT: typeof window !== 'undefined', + DEBUG_MODE: true, // NETWORKING