gamebox 0.4.0.rc5 → 0.4.0.rc11

data/bin/gb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+require 'rake'
+require 'thor'
+require 'gamebox'
+include Rake::DSL
+
+DIST_TYPES = %w(mac win linux)
+load File.expand_path(File.join(File.dirname(__FILE__), "..", "/lib/gamebox/tasks/gamebox_tasks.rake"))
+
+def print_version
+  puts "Gamebox #{Gamebox::VERSION::STRING}"
+end
+
+def run_rake_task(*args)
+  sh "rake #{args.shift}[#{args.join(',')}]"
+end
+
+if ARGV.include?('-v') || ARGV.include?('--version')
+  print_version
+  exit 0
+end
+
+class GameboxThorCommand < Thor
+  include Thor::Actions
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), "../templates/")
+  end
+
+  desc "new PATH", "Generates a new gamebox game at PATH."
+  def new(*args)
+    game_name = args[0]
+    self.destination_root = game_name
+
+    if Gamebox::VERSION::RC > 0
+      @gamebox_version = Gamebox::VERSION::STRING
+    else
+      @gamebox_version = "~> "+[Gamebox::VERSION::MAJOR, Gamebox::VERSION::MINOR, '0'].join('.')
+    end
+
+    directory "app", "."
+  end
+  desc "n PATH", "Generates a new gamebox game at PATH."
+  alias_method :n, :new
+
+  desc "start", "starts the application"
+  def start
+    print_version
+    run_rake_task("run")
+  end
+
+  desc "s", "starts the application"
+  alias_method :s, :start
+
+  desc "debug", "starts the application in debug"
+  def debug
+    print_version
+    run_rake_task("debug")
+  end
+
+  desc "d", "starts the application in debug"
+  alias_method :d, :debug
+
+  desc "dist [mac|linux|win|all]", "Build an executable for your app"
+  def dist(*args)
+    dist_type = args[0]
+    if DIST_TYPES.include?(dist_type)
+      run_rake_task("dist:#{dist_type}")
+    elsif dist_type == "all"
+      DIST_TYPES.each do |type|
+        run_rake_task("dist:#{type}")
+      end
+    else
+      p "Unrecognized dist type"
+    end
+  end
+
+  desc "generate [actor|behavior|stage] NAME", "Gamebox generator, this will generate templated files for you for quicker development"
+  def generate(*args)
+    run_rake_task("generate:#{args.shift}", *args)
+  end
+  desc "g [actor|behavior|stage] NAME", "Gamebox generator, this will generate templated files for you for quicker development"
+  alias_method :g, :generate
+
+end
+
+GameboxThorCommand.start

data/gamebox.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency "gosu"
   s.add_dependency "publisher"
-  s.add_dependency "conject", ">= 0.0.5"
+  s.add_dependency "conject", ">= 0.0.8"
   s.add_dependency "tween"
   s.add_dependency "i18n"
-  s.add_dependency "thor", ">= 0.15.2"
+  s.add_dependency "thor", ">= 0.14.6"
   s.add_dependency "require_all"
-  s.add_dependency "kvo", ">= 0.0.2"
+  s.add_dependency "kvo", ">= 0.1.0"
+  s.add_dependency "listen", ">= 0.5.3"
 
   s.add_development_dependency "pry", '~>0.9.7'
   s.add_development_dependency "pry-remote"

data/lib/gamebox.rb

@@ -26,7 +26,7 @@ end
 
 require "#{GAMEBOX_PATH}/version.rb"
 require 'require_all'
-directory_load_order = %w(lib core actors behaviors views stagehands)
+directory_load_order = %w(lib core post_setup_handlers actors behaviors views stagehands)
 directory_load_order.each do |dir|
   require_all "#{GAMEBOX_PATH}/#{dir}/**/*.rb"
 end

data/lib/gamebox/actors/collidable_debugger.rb

@@ -1,8 +1,8 @@
-Actor.define :collidable_debugger do
+define_actor :collidable_debugger do
   has_behaviors :collider_container
 end
 
-Behavior.define :collider_container do
+define_behavior :collider_container do
   setup do
     actor.has_attributes collider: actor.opts[:collider]
     actor.collider.when :remove do
@@ -11,9 +11,9 @@ Behavior.define :collider_container do
   end
 end
 
-ActorView.define :collidable_debugger_view do
+define_actor_view :collidable_debugger_view do
 
-  configure do
+  setup do
     @color = Color::WHITE
   end
 

data/lib/gamebox/actors/icon.rb

@@ -0,0 +1,7 @@
+# actor to represent an image being drawn somewhere
+# example:
+#  create_actor :icon, image: 'my/image.png'
+define_actor :icon do
+  has_behaviors :positioned, :graphical
+  has_attributes view: :graphical_actor_view
+end

data/lib/gamebox/actors/label.rb

@@ -1,50 +1,49 @@
-Behavior.define :label_stuff do
-  requires_behaviors :positioned
-  requires :font_style_factory
-
-  setup do
-    # will define attributes and set their values if no one else has
-    actor.has_attributes text:      "",
-                         font_size: 30,
-                         font_name: "Asimov.ttf",
-                         color:     [250,250,250,255],
-                         width:     0,
-                         height:    0,
-                         layer:     1
-
-    
-    font_style = font_style_factory.build actor.font_name, actor.font_size, actor.color
-    actor.has_attributes font_style: font_style
+define_actor :label do
+  has_attributes layered: 1
+  behavior do
+    requires_behaviors :positioned
+    requires :font_style_factory
+
+    setup do
+      # will define attributes and set their values if no one else has
+      actor.has_attributes text:      "",
+                           font_size: Gamebox.configuration.default_font_size,
+                           font_name: Gamebox.configuration.default_font_name,
+                           color:     Gamebox.configuration.default_font_color,
+                           width:     0,
+                           height:    0,
+                           layer:     1
+
+      
+      font_style = font_style_factory.build actor.font_name, actor.font_size, actor.color
+      actor.has_attributes font_style: font_style
+
+      actor.when :font_size_changed do
+        actor.font_style.size = actor.font_size
+        actor.font_style.reload
+        recalculate_size
+      end
+      actor.when :font_name_changed do
+        actor.font_style.name = actor.font_name
+        actor.font_style.reload
+        recalculate_size
+      end
+      actor.when :text_changed do
+        recalculate_size
+      end
+      actor.when :color_changed do
+        actor.font_style.color = actor.color
+      end
 
-    actor.when :font_size_changed do
-      actor.font_style.size = actor.font_size
-      actor.font_style.reload
-      recalculate_size
-    end
-    actor.when :font_name_changed do
-      actor.font_style.reload
-      recalculate_size
-    end
-    actor.when :text_changed do
-      recalculate_size
-    end
-    actor.when :color_changed do
-      actor.font_style.color = actor.color
     end
 
-  end
-
-  helpers do
-    def recalculate_size
-      actor.width = actor.font_style.calc_width actor.text
-      actor.height = actor.font_style.height
+    helpers do
+      def recalculate_size
+        actor.width = actor.font_style.calc_width actor.text
+        actor.height = actor.font_style.height
+      end
     end
   end
-end
-
-Actor.define :label do
-  has_attributes layered: 1
-  has_behavior :label_stuff
 
   view do
     draw do |target,x_off,y_off,z|

data/lib/gamebox/behaviors/animated.rb

@@ -36,9 +36,15 @@ Behavior.define :animated do
         set_image
       end
     end
+
+    reacts_with :remove
   end
 
   helpers do
+    def remove
+      director.unsubscribe_all self
+    end
+
     def next_frame
       action_set = @images[actor.action]
       @frame_num = (@frame_num + 1) % action_set.size unless action_set.nil?

data/lib/gamebox/behaviors/audible.rb

@@ -1,7 +1,6 @@
 
 
-Behavior.define :audible do
-  
+define_behavior :audible do
   requires :sound_manager
   setup do
     reacts_with :play_sound, :stop_sound

data/lib/gamebox/behaviors/collidable.rb

@@ -56,7 +56,7 @@ Behavior.define :collidable do
       stage.unregister_collidable actor
     end
 
-    reacts_with :position_changed
+    actor.when(:position_changed) { position_changed }
   end
 
   helpers do

data/lib/gamebox/behaviors/graphical.rb

@@ -7,10 +7,14 @@ Behavior.define :graphical do
   requires_behaviors :layered
   requires :resource_manager
   setup do 
-    image = resource_manager.load_actor_image(actor)
-    scale = @opts[:scale] || 1,
-    actor.has_attributes( image: image,
-                          width: image.width,
+    image = actor.do_or_do_not(:image) || resource_manager.load_actor_image(actor)
+    image = resource_manager.load_image(image) if image.is_a? String
+    scale = @opts[:scale] || 1
+
+    actor.has_attribute :image
+    actor.image = image
+
+    actor.has_attributes( width: image.width,
                           height: image.height,
                           tiled: @opts[:tiled],
                           view: @opts[:view] || :graphical_actor_view,

data/lib/gamebox/behaviors/physical.rb

@@ -52,10 +52,15 @@ Behavior.define :physical do
 
     warp(vec2(actor.x,actor.y))
 
-    reacts_with :warp
+    reacts_with :warp, :remove
   end
 
   helpers do
+    def remove
+       # TODO not sure what else needs to be cleaned up here
+      director.unsubscribe_all self
+    end
+
     def setup_friction
       @friction = @opts[:friction]
       @friction ||= 0.4

data/lib/gamebox/behaviors/positioned.rb

@@ -1,18 +1,11 @@
 define_behavior :positioned do
-  requires :director
   setup do
     x = opts[:x] || 0
     y = opts[:y] || 0
     actor.has_attributes x: x, y: y
-    director.when :update do |time|
-      if @x_dirty || @y_dirty
-        actor.react_to :position_changed
-        actor.emit :position_changed 
-      end
-      @x_dirty = false
-      @y_dirty = false
-    end
-    actor.when :x_changed do @x_dirty = true end
-    actor.when :y_changed do @y_dirty = true end
+    actor.has_attributes position: vec2(actor.x, actor.y)
+    actor.when(:x_changed) { actor.position = vec2(actor.x, actor.y) }
+    actor.when(:y_changed) { actor.position = vec2(actor.x, actor.y) }
   end
+
 end

data/lib/gamebox/behaviors/projectile.rb

@@ -10,6 +10,14 @@ define_behavior :projectile do
       actor.x += (actor.vel_x * secs)
       actor.y += (actor.vel_y * secs)
     end
+
+    reacts_with :remove
+  end
+
+  helpers do
+    def remove
+      director.unsubscribe_all self
+    end
   end
 
 end

data/lib/gamebox/behaviors/visible.rb

@@ -1,15 +1,15 @@
 # in charge of registering / showing / hiding of actor views
 define_behavior :visible do
-  requires :stage
+  requires :renderer
   setup do
     actor.has_attribute :visible
   end
 
   react_to do |message, *args|
     if message == :show
-      stage.register_drawable opts[:view] unless actor.visible
+      renderer.register_drawable opts[:view] unless actor.visible
     elsif message == :hide
-      stage.unregister_drawable opts[:view] if actor.visible
+      renderer.unregister_drawable opts[:view] if actor.visible
     end
     actor.visible = message == :show
   end

data/lib/gamebox/core/aabb_tree.rb

@@ -132,7 +132,7 @@ class AABBTree
       w ||= 2
       h ||= 2
 
-      expand_bb_by!(Rect.new item.x, item.y, w, h, DEFAULT_BB_SCALE)
+      expand_bb_by!(Rect.new(item.x, item.y, w, h), DEFAULT_BB_SCALE)
     end
   end
 end

data/lib/gamebox/core/actor.rb

@@ -8,6 +8,7 @@ class Actor
   can_fire_anything
   construct_with :this_object_context
   public :this_object_context
+  attr_accessor :actor_type
 
   def initialize
     has_attribute :alive, true
@@ -15,8 +16,8 @@ class Actor
   end
 
   def configure(opts={}) # :nodoc:
+    self.actor_type = opts.delete(:actor_type)
     has_attributes opts
-    self.actor_type = opts[:actor_type]
   end
 
   # Used by BehaviorFactory#add_behavior.
@@ -31,11 +32,12 @@ class Actor
     end
   end
 
-  def react_to(message, *opts)
+  def react_to(message, *opts, &blk)
     # TODO cache the values array?
     @behaviors.values.each do |behavior|
-      behavior.react_to(message, *opts)
+      behavior.react_to(message, *opts, &blk)
     end
+    nil
   end
 
   def has_behavior?(name)
@@ -54,16 +56,40 @@ class Actor
     fire :remove_me
   end
 
+  def input
+    # TODO conject should have a lazily loaded dependency mechanism
+    @input_mapper ||= this_object_context[:input_mapper]
+  end
+
   def to_s
-    atts = methods.sort - Actor.instance_methods
-    atts_hash = {}
-    atts.each do |att|
-      atts_hash[att] = send(att) unless att.to_s.end_with? "="
+    attrs = []
+    attributes.keys.sort.each do |name|
+      attrs << "#{name}: #{printable_value(attributes[name])}"
+    end
+    """
+    #{actor_type}:#{self.object_id}
+    Behaviors:
+    #{@behaviors.keys.sort}
+    Attributes:
+    #{attrs.join("\n")}
+    """
+  end
+  alias pretty_inspect to_s
+
+  private
+  def printable_value(value)
+    case value
+    when String, Float, Fixnum, TrueClass, FalseClass, Vector2
+      value
+    when Array
+      value.map do |pv|
+        printable_value(pv)
+      end
+    else
+      value.class
     end
-    "#{self.actor_type}:#{self.object_id} with attributes\n#{atts_hash.inspect}"
   end
 
-  # TODO should this live somewhere else?
   class << self
 
     def define(actor_type, opts={}, &blk)
@@ -74,7 +100,6 @@ class Actor
       # TODO evaluate the perf of doing this
       definition.source = caller.detect{|c|!c.match /core/}
       definition.instance_eval &blk if block_given?
-      @definitions[actor_type] = definition
 
       view_blk = definition.view_blk
       if view_blk
@@ -86,6 +111,8 @@ class Actor
         Behavior.define actor_type, &behavior_blk
         definition.has_behavior actor_type
       end
+
+      @definitions[actor_type] = definition
     end
 
     def definitions
@@ -94,45 +121,5 @@ class Actor
 
   end
 
-  class ActorDefinition
-    attr_accessor :behaviors, :attributes, :view_blk, :behavior_blk, :source
-    def initialize
-      @behaviors = []
-      @attributes = []
-    end
-
-    def has_behaviors(*behaviors, &blk)
-      if block_given?
-        collector = MethodMissingCollector.new
-        collector.instance_eval &blk
-        collector.calls.each do |name, args|
-          if args.empty?
-            @behaviors << name
-          else
-            @behaviors << {name => args.first}
-          end
-        end
-      end
-      behaviors.each do |beh|
-        @behaviors << beh
-      end
-    end
-    alias has_behavior has_behaviors
-
-    def has_attributes(*attributes)
-      attributes.each do |att|
-        @attributes << att
-      end
-    end
-    alias has_behavior has_behaviors
-
-    def view(&blk)
-      @view_blk = blk
-    end
-
-    def behavior(&blk)
-      @behavior_blk = blk
-    end
-  end
 
 end