gosu_extensions 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/bin/gogogosu

@@ -0,0 +1,33 @@
+#!/usr/local/bin/ruby
+# TODO remove
+
+Signal.trap("INT") { puts; exit } # CTRL-C
+
+File.open(File.join(File.dirname(__FILE__), '../VERSION')) do |f|
+  puts "Gosu Extensions #{f.read}"
+end
+
+application = ARGV.first
+
+puts "Usage: gogogosu <application_name>" and exit(1) unless application
+
+require File.dirname(__FILE__) + '/../generator/gogogosu'
+
+generator = Generator::Gogogosu.new
+
+generator.dir application do
+  generator.dir 'lib' do
+    
+  end
+  generator.dir 'media' do
+    
+  end
+end
+
+puts <<-START
+Great!
+
+Now proceed as follows:
+1. cd #{application}
+2. 
+START

data/lib/core/background.rb

@@ -0,0 +1,47 @@
+#
+#
+class Background
+  
+  #
+  #
+  attr_reader :window, :draw_function
+  
+  #
+  #
+  def initialize window
+    @window        = window
+    @draw_function = functionify window.background_options
+  end
+  
+  def functionify path_or_color
+    Gosu::Color === path_or_color ? color_draw_function(path_or_color) : image_draw_function(path_or_color)
+  end
+  
+  #
+  #
+  def color_draw_function color
+    lambda do
+      window.draw_quad(0,            0,             color,
+                       window.width, 0,             color,
+                       window.width, window.height, color,
+                       0,            window.height, color,
+                       0, :default)
+    end
+  end
+  
+  #
+  #
+  def image_draw_function path
+    image = Gosu::Image.new window, File.join(Resources.root, path), true
+    lambda do
+      image.draw 0, 0, Layer::Background, 1.0, 1.0
+    end
+  end
+  
+  #
+  #
+  def draw
+    draw_function.call
+  end
+  
+end

data/lib/core/collision.rb

@@ -48,15 +48,16 @@ class Collision
   #
   def complex_package definition
     lambda do |this_shape, that_shape|
-      this_that = Array.new(2)
+      this_that = Array.new 2
       window.moveables.each do |moveable|
         if moveable.shape == this_shape
           this_that[0] = moveable
+          break if this_that.all?
         end
         if moveable.shape == that_shape
           this_that[1] = moveable
+          break if this_that.all?
         end
-        break if this_that.all?
       end
       definition.call *this_that
     end

data/lib/core/game_window.rb

@@ -25,15 +25,14 @@ class GameWindow < Gosu::Window
               :caption,
               :screen_width,
               :screen_height,
-              :gravity_vector
+              :gravity_vector,
+              :background_options
   attr_reader :environment,
               :moveables,
               :font,
               :scheduling,
               :collisions
-  attr_accessor :background_path,
-                :background_hard_borders,
-                :stop_condition,
+  attr_accessor :stop_condition,
                 :proceed_condition
   
   def initialize
@@ -117,6 +116,9 @@ class GameWindow < Gosu::Window
   def gravity_vector
     @gravity_vector || @gravity_vector = CP::Vec2.new(0, 0.98/SUBSTEPS)
   end
+  def background_options
+    Gosu::Color::WHITE
+  end
   
   class << self
     def gravity amount = 0.98
@@ -150,10 +152,10 @@ class GameWindow < Gosu::Window
         self.font_size = size
       end
     end
-    def background path, options = {}
+    def background path_or_color = Gosu::Color::WHITE
+      attr_reader :background_options
       InitializerHooks.register self do
-        self.background_path = path
-        self.background_hard_borders = options[:hard_borders] || false
+        self.background_options = path_or_color
       end
     end
     def full_screen
@@ -206,9 +208,7 @@ class GameWindow < Gosu::Window
     self.caption = self.class.caption || ""
   end
   def setup_background
-    if self.background_path
-      @background_image = Gosu::Image.new self, File.join(Resources.root, self.background_path), self.background_hard_borders
-    end
+    @background = Background.new self
   end
   def setup_moveables
     @moveables = Moveables.new
@@ -442,7 +442,7 @@ class GameWindow < Gosu::Window
   # Draws a background image.
   #
   def draw_background
-    @background_image.draw 0, 0, Layer::Background, 1.0, 1.0 if @background_image
+    @background.draw
   end
   # Draw ambient objects, like asteroids or the like that do not influence the player.
   #
@@ -460,16 +460,6 @@ class GameWindow < Gosu::Window
   def draw_ui
     @uis.each(&:draw_ui)
   end
-  #
-  #
-  # Example:
-  #   imprint do
-  #     circle x, y, radius, :fill => true, :color => :black
-  #   end
-  #
-  def imprint &block
-    @background_image.paint &block
-  end
   
   # Input handling.
   #

data/lib/core/rotation.rb

@@ -0,0 +1,6 @@
+module Rotation
+  
+  Half    = Math::HalfPI
+  Quarter = Math::QuarterPI
+  
+end

data/lib/extensions/math.rb

@@ -0,0 +1,7 @@
+module Math
+  
+  HalfPI    = PI/2
+  ThirdPI   = PI/3
+  QuarterPI = PI/4
+  
+end

data/lib/gosu_extensions.rb

@@ -17,17 +17,20 @@ end
 $:.unshift File.join(File.dirname(__FILE__), '/extensions')
 require 'module'
 require 'numeric'
+require 'math'
 
 $:.unshift File.join(File.dirname(__FILE__), '/core')
 require 'resources'
 
 require 'vector_utilities'
+require 'rotation'
 require 'initializer_hooks'
 
 require 'trait'
 require 'traits'
 require 'it_is_a'
 
+require 'background'
 require 'moveables'
 require 'remove_shapes'
 require 'wave'

data/lib/traits/shooter.rb

@@ -1,5 +1,32 @@
 module Shooter extend Trait
   
+  module Position
+    def self.front x, y = nil
+      # y || (y, x = x, 0)
+      y ||= 0
+      relative x, y
+    end
+    def self.relative x, y
+      relative_position = CP::Vec2.new x, y
+      relative_length   = relative_position.length
+      relative_rotation = relative_position.to_angle
+      lambda { self.position + (self.rotation - relative_rotation).radians_to_vec2*relative_length }
+    end
+  end
+  module Velocity
+    def self.front initial_speed
+      lambda { |_| self.rotation_vector*initial_speed }
+    end
+  end
+  module Rotation
+    def self.custom rotation; lambda { |_| rotation } end
+    Frontal   = lambda { |_| self.rotation }
+    Right     = lambda { |_| self.rotation + Rotation::Half }
+    Backwards = lambda { |_| -self.rotation }
+    Left      = lambda { |_| self.rotation - Rotation::Half }
+    Default   = Frontal
+  end
+  
   Shoot = :shoot
   
   manual <<-MANUAL
@@ -51,17 +78,20 @@ module Shooter extend Trait
         self.shot_type = type
       end
     end
-    def muzzle_position &block
+    def muzzle_position lam = nil, &block
+      block ||= lam
       InitializerHooks.register self do
         muzzle_position_func &block
       end
     end
-    def muzzle_velocity &block
+    def muzzle_velocity lam = nil, &block
+      block ||= lam
       InitializerHooks.register self do
         muzzle_velocity_func &block
       end
     end
-    def muzzle_rotation &block
+    def muzzle_rotation lam = nil, &block
+      block ||= lam
       InitializerHooks.register self do
         muzzle_rotation_func &block
       end

data/lib/units/sprite.rb

@@ -28,7 +28,7 @@ class Sprite
   # Default rotation is upwards.
   #
   def rotation
-    @rotation || -Math::PI/2
+    @rotation || -Rotation::Half
   end
   
   class << self
@@ -44,11 +44,9 @@ class Sprite
     #
     #
     def rotation amount = nil, &block
-      # Override default.
-      #
-      to_execute = block || lambda { amount }
+      block ||= lambda { amount }
       InitializerHooks.append self do
-        self.rotation = to_execute[]
+        self.rotation = block[]
       end
     end
     def random_rotation
@@ -148,7 +146,7 @@ class Sprite
     self.rotation.radians_to_vec2
   end
   def current_speed
-    speed.length
+    speed.length # Hm, speed should already be the absolute value.
   end
   
   # Movement and Position.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
-default_executable: 
+date: 2010-04-13 00:00:00 +02:00
+default_executable: gogogosu
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gosu
@@ -44,8 +44,8 @@ dependencies:
   version_requirements: *id002
 description: ""
 email: florian.hanke@gmail.com
-executables: []
-
+executables: 
+- gogogosu
 extensions: []
 
 extra_rdoc_files: []
@@ -54,6 +54,7 @@ files:
 - Rakefile
 - VERSION
 - generator/gogogosu.rb
+- lib/core/background.rb
 - lib/core/collision.rb
 - lib/core/control.rb
 - lib/core/controls.rb
@@ -65,12 +66,14 @@ files:
 - lib/core/moveables.rb
 - lib/core/remove_shapes.rb
 - lib/core/resources.rb
+- lib/core/rotation.rb
 - lib/core/scheduling.rb
 - lib/core/trait.rb
 - lib/core/traits.rb
 - lib/core/vector_utilities.rb
 - lib/core/wave.rb
 - lib/core/waves.rb
+- lib/extensions/math.rb
 - lib/extensions/module.rb
 - lib/extensions/numeric.rb
 - lib/gosu_extensions.rb