Merge pull request #21 from tobiastom/master

Removing functions from Constants and Settings.
This commit is contained in:
Jeena Paradies 2012-07-19 02:22:16 -07:00
commit b02f169fc9
2 changed files with 46 additions and 61 deletions

View file

@ -1,15 +1,9 @@
define(function() { define({
COLLISION_IDENTIFIER_PLAYER: 'player',
var Constants = { COLLISION_IDENTIFIER_PLAYER_HEAD: 'head',
COLLISION_IDENTIFIER_PLAYER: 'player', COLLISION_IDENTIFIER_PLAYER_CHEST: 'chest',
COLLISION_IDENTIFIER_PLAYER_HEAD: 'head', COLLISION_IDENTIFIER_PLAYER_LEGS: 'legs',
COLLISION_IDENTIFIER_PLAYER_CHEST: 'chest', COLLISION_IDENTIFIER_PLAYER_FOOT_SENSOR: 'footsensor',
COLLISION_IDENTIFIER_PLAYER_LEGS: 'legs',
COLLISION_IDENTIFIER_PLAYER_FOOT_SENSOR: 'footsensor',
COLLISION_IDENTIFIER_TILE: 'tile'
}
return Constants;
COLLISION_IDENTIFIER_TILE: 'tile'
}); });

View file

@ -1,59 +1,50 @@
define(function() { define({
STAGE_WIDTH: 600,
STAGE_HEIGHT: 400,
var Settings = { // BOX2D INITIALATORS
STAGE_WIDTH: 600, RATIO: 35,
STAGE_HEIGHT: 400, 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 // GRAPHIC PATHS
RATIO: 35, GRAPHICS_PATH: 'static/img/',
BOX2D_WORLD_AABB_SIZE: 3000, GRAPHICS_SUBPATH_ITEMS: 'items/',
BOX2D_ALLOW_SLEEP: true, GRAPHICS_SUBPATH_CHARACTERS: 'characters/',
BOX2D_GRAVITY: 16,
BOX2D_VELOCITY_ITERATIONS: 5,
BOX2D_POSITION_ITERATIONS: 5,
BOX2D_TIME_STEP: 1 / 60,
// GRAPHIC PATHS TILE_SIZE: 15,
GRAPHICS_PATH: 'static/img/',
GRAPHICS_SUBPATH_ITEMS: 'items/',
GRAPHICS_SUBPATH_CHARACTERS: 'characters/',
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 // restitution: bouncyness, friction: rubbing, density: mass
WALK_SPEED: 2.5, TILE_FRICTION: 0.99,
RUN_SPEED: 4.0, TILE_RESTITUTION: 0.1,
FLY_SPEED: 3.2,
JUMP_SPEED: 3.0,
JUMP_UPLIFT: 0.05,
// restitution: bouncyness, friction: rubbing, density: mass PLAYER_DENSITY: 0.96,
TILE_FRICTION: 0.99, PLAYER_FRICTION: 5,
TILE_RESTITUTION: 0.1, PLAYER_MOTION_FRICTION: 0.1,
PLAYER_RESTITUTION: 0.0,
PLAYER_LINEAR_DAMPING: .5,
PLAYER_DENSITY: 0.96, ITEM_DENSITY: 0.9,
PLAYER_FRICTION: 5, ITEM_FRICTION: 0.99,
PLAYER_MOTION_FRICTION: 0.1, ITEM_RESTITUTION: 0.02,
PLAYER_RESTITUTION: 0.0,
PLAYER_LINEAR_DAMPING: .5,
// BROWSER
CANVAS_DOM_ID: 'canvasContainer',
IS_BROWSER_ENVIRONMENT: typeof window !== 'undefined',
ITEM_DENSITY: 0.9, DEBUG_MODE: true,
ITEM_FRICTION: 0.99,
ITEM_RESTITUTION: 0.02,
// BROWSER // NETWORKING
CANVAS_DOM_ID: 'canvasContainer', WORLD_UPDATE_BROADCAST_INTERVAL: 15
IS_BROWSER_ENVIRONMENT: isBrowserEnvironment(),
DEBUG_MODE: true,
// NETWORKING
WORLD_UPDATE_BROADCAST_INTERVAL: 15
};
function isBrowserEnvironment(){
return typeof window !== 'undefined';
}
return Settings;
}) })