gosu_extensions 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/core/game_window.rb

@@ -37,6 +37,15 @@ class GameWindow < Gosu::Window
                 :proceed_condition,
                 :collisions
   
+  # TODO Move to Debug Module
+  #
+  def draw_circle x, y, r, color
+    0.step(360, 10) { |a1|
+      a2 = a1 + 10
+      draw_line x + Gosu.offset_x(a1, r), y + Gosu.offset_y(a1, r), color, x + Gosu.offset_x(a2, r), y + Gosu.offset_y(a2, r), color, 0
+    }
+  end
+  
   def initialize
     setup_window
     
@@ -127,8 +136,18 @@ class GameWindow < Gosu::Window
     # default is no background
   end
   
+  def debug?
+    @debug
+  end
+  
   class << self
     
+    def debug
+      InitializerHooks.register self do
+        @debug = true
+      end
+    end
+    
     # Sets the Esc button to close the window.
     #
     def default_controls

data/lib/core/layer.rb

@@ -7,5 +7,5 @@
 # * Background (Fixed, true Background)
 #
 module Layer
-  Background, Ambient, Players, UI = 0, 1, 2, 3
+  Background, Ambient, Players, UI, Debug = 0, 1, 2, 3, 4
 end

data/lib/extensions/circle.rb

@@ -0,0 +1,22 @@
+module CP
+  module Shape
+    
+    class Circle
+      
+      attr_reader :radius, :center
+      
+      def initialize_with_radius body, radius, center
+        @radius, @center = radius, center
+        initialize_without_radius body, radius, center
+      end
+      alias_method_chain :initialize, :radius
+      
+      
+      def debug window, _
+        window.draw_circle body.p.x, body.p.y, radius, Gosu::Color::RED
+      end
+      
+    end
+    
+  end
+end

data/lib/extensions/poly.rb

@@ -0,0 +1,24 @@
+module CP
+  module Shape
+    
+    class Poly
+      
+      attr_reader :verts, :offset
+      
+      def initialize_with_verts body, verts, offset
+        @verts, @offset = verts, offset
+        initialize_without_verts body, verts, offset
+      end
+      alias_method_chain :initialize, :verts
+      
+      def debug window, thing
+        colors = [Gosu::Color::RED]*verts.size
+        points = verts.map{ |vert| vert = vert.rotate(body.a.radians_to_vec2); vert += body.p; [vert.x, vert.y] }.zip(colors).flatten
+        points << 0 << :default
+        window.draw_quad *points
+      end
+      
+    end
+    
+  end
+end

data/lib/gosu_extensions.rb

@@ -18,6 +18,8 @@ $:.unshift File.join(File.dirname(__FILE__), '/extensions')
 require 'module'
 require 'numeric'
 require 'math'
+require 'circle'
+require 'poly'
 
 $:.unshift File.join(File.dirname(__FILE__), '/core')
 require 'resources'

data/lib/traits/imageable.rb

@@ -40,22 +40,32 @@ module Imageable extend Trait
   def image
     @image || raise(ImageMissingError.new)
   end
+  # Set this thing's image using a path.
+  #
+  def image_from path, *args
+    self.image = Gosu::Image.new self.window, File.join(Resources.root, path), *args
+  end
+  # Set this thing's image in the form of a sequenced image.
+  #
+  def sequenced_image_from path, width, height, frequency = 10, &block
+    @image_sequence_started = Time.now
+    self.image = Gosu::Image::load_tiles self.window, File.join(Resources.root, path), width, height, false
+  end
   
   module ClassMethods
     
     def image path, *args
       InitializerHooks.register self do
-        self.image = Gosu::Image.new self.window, File.join(Resources.root, path), *args
+        image_from path, *args
       end
     end
     
     def sequenced_image path, width, height, frequency = 10, &block
       InitializerHooks.register self do
-        @image_sequence_started = Time.now
-        self.image = Gosu::Image::load_tiles self.window, File.join(Resources.root, path), width, height, false
+        sequenced_image_from path, width, height, frequency, &block
       end
       # divider = 1000 / frequency
-
+      
       # Override image.
       #
       define_method :image do

data/lib/traits/shooter.rb

@@ -102,8 +102,8 @@ module Shooter extend Trait
     self.shot_type.new @window
   end
   
-  def muzzle_position
-    instance_eval &(@muzzle_position || @muzzle_position = lambda { |*| self.position + self.rotation_vector*self.radius })
+  def muzzle_position distance = 10
+    instance_eval &(@muzzle_position || @muzzle_position = lambda { |*| self.position + self.rotation_vector * distance })
   end
   def muzzle_velocity target = nil
     instance_eval &(@muzzle_velocity || @muzzle_velocity = lambda { |*| self.rotation_vector })

data/lib/units/sprite.rb

@@ -144,7 +144,6 @@ class Sprite
   # Draws its image.
   #
   def draw
-    # p [self.class, self.layer, self.drawing_rotation, 0.5, 0.5, *self.current_size] unless self.position
     self.image.draw_rot self.position.x, self.position.y, self.layer, self.drawing_rotation, 0.5, 0.5, *self.current_size
   end
   def current_size

data/lib/units/thing.rb

@@ -91,6 +91,10 @@ class Thing < Sprite
   #
   def move;end
   
+  def draw
+    window.debug? ? shape.debug(window, self) : super
+  end
+  
   #
   #
   def speed= v

data/spec/lib/core/layer_spec.rb

@@ -13,4 +13,7 @@ describe Layer do
   it "should be the right layer" do
     Layer::UI.should == 3
   end
+  it "should be the right layer" do
+    Layer::Debug.should == 4
+  end
 end

data/spec/lib/traits/shooter_spec.rb

@@ -126,9 +126,9 @@ describe Shooter do
   describe 'muzzle_position' do
     context 'default' do
       it 'should use the default calculation' do
-        @shooter.stub! :position => "position + ", :rotation_vector => "rotation", :radius => 3
+        @shooter.stub! :position => "position + ", :rotation_vector => "rotation"
         
-        @shooter.muzzle_position.should == "position + rotationrotationrotation"
+        @shooter.muzzle_position.should == "position + rotationrotationrotationrotationrotationrotationrotationrotationrotationrotation"
       end
     end
     context 'non-default' do

data/spec/lib/units/thing_spec.rb

@@ -35,10 +35,18 @@ describe Thing do
                    :drawing_rotation => :some_drawing_rotation,
                    :current_size     => [:size_x, :size_y]
     end
-    it "should delegate to the image" do
-      @image.should_receive(:draw_rot).once.with :some_x, :some_y, :some_layer, :some_drawing_rotation, 0.5, 0.5, :size_x, :size_y
+    context 'debug on' do
       
-      @thing.draw
+    end
+    context 'debug off' do
+      before(:each) do
+        @window.stub! :debug? => false
+      end
+      it "should delegate to the image" do
+        @image.should_receive(:draw_rot).once.with :some_x, :some_y, :some_layer, :some_drawing_rotation, 0.5, 0.5, :size_x, :size_y
+        
+        @thing.draw
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -74,9 +74,11 @@ files:
 - lib/core/vector_utilities.rb
 - lib/core/wave.rb
 - lib/core/waves.rb
+- lib/extensions/circle.rb
 - lib/extensions/math.rb
 - lib/extensions/module.rb
 - lib/extensions/numeric.rb
+- lib/extensions/poly.rb
 - lib/gosu_extensions.rb
 - lib/traits/attachable.rb
 - lib/traits/controllable.rb