shank 0.0.5 → 0.0.6

data/lib/shank/version.rb

@@ -1,3 +1,3 @@
 module Shank
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/shank.rb

@@ -1,7 +1,14 @@
 require 'sprockets'
 
-module Shank
+require 'pixie_dust'
+
+if defined? ::Rails
+  class Engine < ::Rails::Engine
+    config.paths['app/assets'] = "source"
+  end
+else
   root_dir = File.expand_path(File.dirname(File.dirname(__FILE__)))
+  asset_dir = File.join(root_dir, "source")
 
-  ::Sprockets.append_path File.join(root_dir, "source")
+  ::Sprockets.append_path asset_dir
 end

data/pixie.json

@@ -0,0 +1,13 @@
+{
+  "author": "STRd6",
+  "main": null,
+  "name": "Shank",
+  "library": true,
+  "directories": {
+    "lib": "lib",
+    "source": "source",
+    "test": "test"
+  },
+  "libs": {
+  }
+}

data/shank.gemspec

@@ -15,5 +15,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
 
+  gem.add_dependency "coffee-script"
   gem.add_dependency "sprockets"
+  gem.add_dependency "pixie_dust"
 end

data/source/engine.gamepads.coffee

@@ -3,17 +3,17 @@ The <code>Gamepads</code> module gives the engine access to gamepads.
 
     # First you need to add the `Gamepads` module to the engine
     Engine.defaultModules.push "Gamepads"
-
+    
     window.engine = Engine
       ...
-
+    
     # Then you need to get a controller reference
     # id = 0 for player 1, etc.
     controller = engine.controller(id)
-
+    
     # Point indicating direction primary axis is held
     direction = controller.position()
-
+    
     # Check if buttons are held
     controller.actionDown("A")
     controller.actionDown("B")
@@ -27,11 +27,9 @@ The <code>Gamepads</code> module gives the engine access to gamepads.
 @param {Object} I Instance variables
 @param {Object} self Reference to the engine
 ###
-root = (exports ? this)
-
-root.Engine.Gamepads = (I, self) ->
+Engine.Gamepads = (I, self) ->
   gamepads = Gamepads()
-
+  
   self.bind "beforeUpdate", ->
     # Update the gamepads
     gamepads.update()

data/source/error_handler.coffee

@@ -2,9 +2,7 @@
 This error handler captures any runtime errors and reports them to the IDE
 if present.
 ###
-root = (exports ? this)
-
-root.onerror = (message, url, lineNumber) ->
+window.onerror = (message, url, lineNumber) ->
   errorContext = $('script').last().text().split('\n')[(lineNumber-5)..(lineNumber+4)]
 
   errorContext[4] = "<b style='font-weight: bold; text-decoration: underline;'>" + errorContext[4] + "</b>"

data/source/gamepads.coffee

@@ -1,19 +1,30 @@
-root = (exports ? this)
-
-root.Gamepads = (I={}) ->
+Gamepads = (I={}) ->
   state = {} # holds current and previous states
   controllers = [] # controller cache
 
   # Capture the current gamepad state
   snapshot = ->
-    Array::map.call navigator.webkitGamepads || navigator.webkitGetGamepads(), (x) ->
+    Array::map.call navigator.webkitGamepads || navigator.webkitGetGamepads?() || [], (x) ->
       axes: x.axes
       buttons: x.buttons
 
   controller: (index=0) ->
-    controllers[index] ||= Gamepads.Controller
-      index: index
-      state: state
+    if controller = controllers[index]
+      return controller
+
+    gamepadIndex = index # (index + 1) % 4 # Offsetting gamepads
+
+    gamepad =
+      Gamepads.Controller
+        index: gamepadIndex
+        state: state
+
+    if index is 0 # TODO Second keyboard controls
+      keyboardController = Gamepads.KeyboardController()
+
+      controllers[index] ||= Gamepads.CombinedController(gamepad, keyboardController)
+    else
+      controllers[index] ||= gamepad
 
   update: ->
     state.previous = state.current
@@ -21,3 +32,6 @@ root.Gamepads = (I={}) ->
 
     controllers.each (controller) ->
       controller?.update()
+
+# window.addEventListener "MozGamepadConnected", (event) ->
+#   console.log event

data/source/gamepads.combined_controller.coffee

@@ -0,0 +1,38 @@
+Gamepads.CombinedController = (sources...) ->
+
+  self = Core().extend
+    buttonDown: (buttons...) ->
+      sources.inject false, (memo, source) ->
+        memo or source.buttonDown buttons...
+
+    # true if button was just pressed
+    buttonPressed: (button) ->
+      sources.inject false, (memo, source) ->
+        memo or source.buttonPressed(button)
+
+    # true if button was just released
+    buttonReleased: (button) ->
+      sources.inject false, (memo, source) ->
+        memo or source.buttonPressed(button)
+
+    position: (stick=0) ->
+      raw = sources.inject Point(0, 0), (point, source) ->
+        point.add(source.position(stick))
+
+      # TODO: This could be a point method
+      if raw.length() > 1
+        raw.norm()
+      else
+        raw
+
+    tap: ->
+      raw = sources.inject Point(0, 0), (point, source) ->
+        point.add(source.tap())
+
+      Point(raw.x.sign(), raw.y.sign())
+
+    update: ->
+      sources.invoke "update"
+
+    drawDebug: (canvas) ->
+      sources.invoke "drawDebug", canvas

data/source/gamepads.controller.coffee

@@ -1,12 +1,10 @@
-root = (exports ? this)
-
-root.Gamepads.Controller = (I={}) ->
+Gamepads.Controller = (I={}) ->
   Object.reverseMerge I,
     debugColor: "#000"
 
   MAX_BUFFER = 0.03
   AXIS_MAX = 1 - MAX_BUFFER
-  DEAD_ZONE = AXIS_MAX * 0.2
+  DEAD_ZONE = AXIS_MAX * 0.25
   TRIP_HIGH = AXIS_MAX * 0.75
   TRIP_LOW = AXIS_MAX * 0.5
 
@@ -16,30 +14,24 @@ root.Gamepads.Controller = (I={}) ->
     "A": 0
     "B": 1
 
-    # X/C, Y/D are interchangeable
-    "C": 2
-    "D": 3
     "X": 2
     "Y": 3
 
-    "L": 4
     "LB": 4
-    "L1": 4
-
-    "R": 5
     "RB": 5
-    "R1": 5
 
-    "SELECT": 6
-    "BACK": 6
+    "LT": 6
+    "RT": 7
+
+    "SELECT": 8
+    "BACK": 8
 
-    "START": 7
+    "START": 9
 
-    "HOME": 8
-    "GUIDE": 8
+    "TL": 10
+    "TR": 11
 
-    "TL": 9
-    "TR": 10
+    "HOME": 16
 
   currentState = ->
     I.state.current?[I.index]
@@ -65,7 +57,7 @@ root.Gamepads.Controller = (I={}) ->
     tap = Point(x, y)
 
   self = Core().include(Bindable).extend
-    actionDown: (buttons...) ->
+    buttonDown: (buttons...) ->
       if state = currentState()
         buttons.inject false, (down, button) ->
           down || if button is "ANY"
@@ -82,6 +74,11 @@ root.Gamepads.Controller = (I={}) ->
 
       return (self.buttons()[buttonId] > BUTTON_THRESHOLD) && !(previousState()?.buttons[buttonId] > BUTTON_THRESHOLD)
 
+    buttonReleased: (button) ->
+      buttonId = buttonMapping[button]
+
+      return !(self.buttons()[buttonId] > BUTTON_THRESHOLD) && (previousState()?.buttons[buttonId] > BUTTON_THRESHOLD)
+
     position: (stick=0) ->
       if state = currentState()
         p = Point(self.axis(2*stick), self.axis(2*stick+1))
@@ -129,12 +126,17 @@ root.Gamepads.Controller = (I={}) ->
           color: I.debugColor
           text: axis
           x: 0
-          y: i * lineHeight
+          y: (i + 1) * lineHeight
 
       self.buttons().each (button, i) ->
+        canvas.drawText
+          color: I.debugColor
+          text: "#{i}:"
+          x: 230
+          y: (i + 1) * lineHeight
+
         canvas.drawText
           color: I.debugColor
           text: button
           x: 250
-          y: i * lineHeight
-
+          y: (i + 1) * lineHeight

data/source/gamepads.keyboard_controller.coffee

@@ -0,0 +1,90 @@
+Gamepads.KeyboardController = (I={}) ->
+  Object.reverseMerge I,
+    axisMapping: [
+      ["left", "right"]
+      ["up", "down"]
+    ]
+    buttonMapping:
+      "A": 'z'
+      "B": 'x'
+
+      # X/C, Y/D are interchangeable
+      "C": 'c'
+      "D": 'v'
+      "X": 'c'
+      "Y": 'v'
+
+      "SELECT": "shift"
+      "START": "return"
+
+    debugColor: "#000"
+
+  tap = Point(0, 0)
+  buttonKeys = Object.keys(I.buttonMapping)
+  buttonValues = buttonKeys.map (key) ->
+    I.buttonMapping[key]
+
+  # Init any keys used
+  I.axisMapping.each (axis) ->
+    axis.each (key) ->
+      keydown[key] = false
+
+  buttonKeys.each (key) ->
+    keydown[key] = false
+
+  processTaps = ->
+    [x, y] = I.axisMapping.map ([negative, positive]) ->
+      justPressed[positive] - justPressed[negative]
+
+    tap = Point(x, y)
+
+  self = Core().include(Bindable).extend
+    buttonDown: (buttons...) ->
+      buttons.inject false, (down, button) ->
+        down || if button is "ANY"
+          buttonValues.inject false, (down, button) ->
+            down || keydown[button]
+        else
+          keydown[I.buttonMapping[button]]
+
+    # true if button was just pressed
+    buttonPressed: (button) ->
+      keyname = I.buttonMapping[button]
+
+      return justPressed[keyname]
+
+    buttonReleased: (button) ->
+      keyname = I.buttonMapping[button]
+
+      return justReleased[keyname]
+
+    position: (stick=0) ->
+      [x, y] = I.axisMapping.map ([negative, positive]) ->
+        keydown[positive] - keydown[negative]
+
+      tap = Point(x, y)
+
+    tap: ->
+      tap
+
+    update: ->
+      processTaps()
+
+    drawDebug: (canvas) ->
+      lineHeight = 18
+
+      p = self.position()
+
+      ["x", "y"].each (key, i) ->
+        canvas.drawText
+          color: I.debugColor
+          text: p[key]
+          x: 0
+          y: i * lineHeight
+
+      buttonKeys.each (button, i) ->
+        canvas.drawText
+          color: I.debugColor
+          text: self.buttonDown(button)
+          x: 250
+          y: i * lineHeight

data/source/keydown.coffee

@@ -21,7 +21,7 @@ $ ->
   ###
 
   ###*
-  The global justPressed property lets your query the status of keys. However, 
+  The global justPressed property lets your query the status of keys. However,
   unlike keydown it will only trigger once for each time the key is pressed.
 
   <code><pre>
@@ -43,6 +43,7 @@ $ ->
   ###
   window.keydown = {}
   window.justPressed = {}
+  window.justReleased = {}
 
   prevKeysDown = {}
 
@@ -60,10 +61,12 @@ $ ->
 
   window.updateKeys = () ->
     window.justPressed = {}
+    window.justReleased = {}
     keydown.any = false
 
     for key, value of keydown
-      justPressed[key] = value unless prevKeysDown[key]
+      justPressed[key] = value and !prevKeysDown[key]
+      justReleased[key] = !value and prevKeysDown[key]
 
       justPressed.any = true if (justPressed[key] || mousePressed.left || mousePressed.right)
       keydown.any = true if (value || mouseDown.left || mouseDown.right)

data/source/mouse.coffee

@@ -32,6 +32,7 @@ $ ->
   ###
   window.mouseDown = {}
   window.mousePressed = {}
+  window.mouseReleased = {}
   window.mousePosition = Point(0, 0)
 
   prevButtonsDown = {}
@@ -45,9 +46,11 @@ $ ->
     buttonNames[event.which]
 
   $(document).bind "mousemove", (event) ->
-    #TODO Position relative to canvas element
-    mousePosition.x = event.pageX
-    mousePosition.y = event.pageY
+    # Position relative to canvas element
+    offset = $("canvas").offset()
+
+    mousePosition.x = event.pageX - offset.left
+    mousePosition.y = event.pageY - offset.top
 
   $(document).bind "mousedown", (event) ->
     mouseDown[buttonName(event)] = true
@@ -57,10 +60,14 @@ $ ->
 
   window.updateMouse = ->
     window.mousePressed = {}
+    window.mouseReleased = {}
 
     for button, value of mouseDown
       mousePressed[button] = value unless prevButtonsDown[button]
 
+    for button, value of mouseDown
+      mouseReleased[button] = !value if prevButtonsDown[button]
+
     prevButtonsDown = {}
     for button, value of mouseDown
       prevButtonsDown[button] = value

data/source/music.coffee

@@ -11,9 +11,7 @@ default, the track is looped.
 @namespace
 ###
 
-root = (exports ? this)
-
-root.Music = (->
+Music = (->
   # TODO: Load this from local storage of user preferences
   globalMusicVolume = 1
   trackVolume = 1

data/source/shank.coffee

@@ -1,17 +1 @@
-#= require init
-
-#= require engine.gamepads
-#= require engine_stats
-#= require error_handler
-#= require gamepads
-#= require gamepads.controller
-#= require joysticks
-#= require jquery.hotkeys
-#= require jquery.reverse_merge
-#= require keydown
-#= require mouse
-#= require music
-#= require pixie_canvas
-#= require request_animation_frame
-#= require sound
-#= require storage
+#= require_tree .

data/source/sound.coffee

@@ -29,24 +29,24 @@
   Object.extend Sound,
     ###*
     Set the global volume modifier for all sound effects.
-  
+
     Any value set is clamped between 0 and 1. This is multiplied
     into each individual effect that plays.
-  
+
     If no argument is given return the current global sound effect volume.
-  
-    @name globalVolume
+
+    @name volume
     @methodOf Sound
     @param {Number} [newVolume] The volume to set
     ###
-    globalVolume: (newVolume) ->
+    volume: (newVolume) ->
       if newVolume?
         globalVolume = newVolume.clamp(0, 1)
 
       return globalVolume
 
     ###*
-    Play a sound from your sounds 
+    Play a sound from your sounds
     directory with the name of `id`.
 
     <code><pre>
@@ -59,7 +59,7 @@
 
     @param {String} id id or name of the sound file to play
     @param {String} maxChannels max number of sounds able to be played simultaneously
-    ###  
+    ###
     play: (id, maxChannels) ->
       # TODO: Too many channels crash Chrome!!!1
       maxChannels ||= 4
@@ -100,7 +100,7 @@
     @param {String} url location of sound file to play
 
     @returns {Sound} this sound object
-    ### 
+    ###
     playFromUrl: (url) ->
       sound = $('<audio />').get(0)
       sound.src = url
@@ -114,8 +114,8 @@
     Stop a sound while it is playing.
 
     <code><pre>
-    # stops the sound 'explode' from 
-    # playing if it is currently playing 
+    # stops the sound 'explode' from
+    # playing if it is currently playing
     Sound.stop('explode')
     </pre></code>
 
@@ -123,9 +123,24 @@
     @methodOf Sound
 
     @param {String} id id or name of sound to stop playing.
-    ### 
+    ###
     stop: (id) ->
       sounds[id]?.stop()
 
-    (exports ? this)["Sound"] = Sound
+  ###*
+  Set the global volume modifier for all sound effects.
+
+  Any value set is clamped between 0 and 1. This is multiplied
+  into each individual effect that plays.
+
+  If no argument is given return the current global sound effect volume.
+
+  @name globalVolume
+  @deprecated
+  @methodOf Sound
+  @param {Number} [newVolume] The volume to set
+  ###
+  Sound.globalVolume = Sound.volume
+
+  (exports ? this)["Sound"] = Sound
 )(jQuery)