From 9886b403e57cf2b65a413af1444bfea3d0e833c8 Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Mon, 4 Apr 2016 23:37:01 -0600 Subject: [PATCH] Updated pixelScale to OS.S, added controls for WASD and Arrows. --- loadControls.js | 47 +++++++++++++++++++++++++++++++++++++++++----- loadGameManager.js | 1 - loadRooms.js | 2 +- start.js | 3 ++- 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/loadControls.js b/loadControls.js index 1ea7fb6..b8a052c 100644 --- a/loadControls.js +++ b/loadControls.js @@ -1,9 +1,46 @@ -var ct_up = OS.C.Add("WASD Up", OS.Keycode.w); -var ct_left = OS.C.Add("WASD Left", OS.Keycode.a); -var ct_down = OS.C.Add("WASD Down", OS.Keycode.s); -var ct_right = OS.C.Add("WASD Right", OS.Keycode.d); +var ct_wasd_up = OS.C.Add("WASD Up", OS.Keycode.w); +var ct_wasd_left = OS.C.Add("WASD Left", OS.Keycode.a); +var ct_wasd_down = OS.C.Add("WASD Down", OS.Keycode.s); +var ct_wasd_right = OS.C.Add("WASD Right", OS.Keycode.d); +var ct_arrow_up = OS.C.Add("Arrow Up", OS.Keycode.up); +var ct_arrow_left = OS.C.Add("Arrow Left", OS.Keycode.left); +var ct_arrow_down = OS.C.Add("Arrow Down", OS.Keycode.down); +var ct_arrow_right = OS.C.Add("Arrow Right", OS.Keycode.right); var ct_shift = OS.C.Add("Shift", OS.Keycode.shift); -var ct_space = OS.C.Add("Space", OS.Keycode.space); +var ct_space = OS.C.Add("Confirm", OS.Keycode.space); +var ct_esc = OS.C.Add("Cancel", OS.Keycode.escape); function loadControls () {} + +function ct_up () { + return { + held : ct_wasd_up.held || ct_arrow_up.held, + down : ct_wasd_up.down || ct_arrow_up.down, + up : ct_wasd_up.up || ct_arrow_up.up + } +} + +function ct_left () { + return { + held : ct_wasd_left.held || ct_arrow_left.held, + down : ct_wasd_left.down || ct_arrow_left.down, + up : ct_wasd_left.up || ct_arrow_left.up + } +} + +function ct_down () { + return { + held : ct_wasd_down.held || ct_arrow_down.held, + down : ct_wasd_down.down || ct_arrow_down.down, + up : ct_wasd_down.up || ct_arrow_down.up + } +} + +function ct_right () { + return { + held : ct_wasd_right.held || ct_arrow_right.held, + down : ct_wasd_right.down || ct_arrow_right.down, + up : ct_wasd_right.up || ct_arrow_right.up + } +} diff --git a/loadGameManager.js b/loadGameManager.js index 1d777c4..d89cdf4 100644 --- a/loadGameManager.js +++ b/loadGameManager.js @@ -1,7 +1,6 @@ var Game = {}; G = Game; -G.pixelSize = 4; G.player = {}; G.map = {}; diff --git a/loadRooms.js b/loadRooms.js index 471bc59..57cbaa0 100644 --- a/loadRooms.js +++ b/loadRooms.js @@ -1,5 +1,5 @@ var rm_TitleScreen = OS.R.Add("Default", OS.camera.width, OS.camera.height, ""); -var rm_Ocean = OS.R.Add("Ocean", 64 * 1000 * G.pixelSize, 64 * 1000 * G.pixelSize, ""); +var rm_Ocean = OS.R.Add("Ocean", 64 * 1000 * OS.S.pixelScale, 64 * 1000 * OS.S.pixelScale, ""); function loadRooms() { OS.AddScript("rooms/titleScreen.js"); diff --git a/start.js b/start.js index 75062da..2fc09a2 100644 --- a/start.js +++ b/start.js @@ -1,5 +1,6 @@ OS.S.defaultStep = 1 / 120; -OS.S.SetCamera((window.innerWidth < 500) ? window.innerWidth - 10 : 500, (window.innerHeight < 800) ? window.innerHeight - 10 : 800); +OS.S.pixelScale = 4; +OS.S.SetCamera(64 * OS.S.pixelScale, 64 * OS.S.pixelScale); function start() {