ippa-chingu 0.4.8 → 0.5

data/lib/chingu/core_extensions.rb

@@ -1,11 +1,21 @@
 #
-# Core extensions
-#
-# Extensions to the classes GOSU offers
+# Core extensions to GOSU
+# Some of these require the gem 'texplay'
 #
 module Gosu
-  class Color
-    def average(other, weight)
+  
+  class Image
+    #
+    # Returns true if the pixel at x, y is 100% transperant (good for collisiondetection)
+    # Requires texplay
+    #
+    def transparent_pixel?(x, y)
+      begin
+        self.get_pixel(x,y)[3] == 0
+      rescue
+        puts "Error in get_pixel at x/y: #{x}/#{y}"
+      end
     end
+    
   end
 end

data/lib/chingu/effects.rb

@@ -8,7 +8,7 @@ module Chingu
       @trail = options[:trail] || 10
     end
       
-    def update(time)
+    def update
     end    
   end
 end

data/lib/chingu/fpscounter.rb

@@ -31,7 +31,6 @@ module Chingu
 
       #
       # Calculate how many milliseconds passed since last game loop iteration.
-      # useful in update()-calls
       #
 			@milliseconds_since_last_tick = Gosu::milliseconds - @last_value
 			@last_value = Gosu::milliseconds

data/lib/chingu/game_object.rb

@@ -1,197 +1,127 @@
 module Chingu
   #
-  # A basic class, all your ingame objects should be built on this. Encapsulates
-  # Gosus draw_rot and it's parameters. 
+  # GameObject is our BasisGameObject (class with framespecific stuff)
   #
-  # All objects that inherits from this class will automaticly be updated and drawn.
+  # On top of that, it encapsulates GOSUs Image#draw_rot and all its parameters.
   #
-  class GameObject
+
+  class GameObject < Chingu::BasicGameObject
     attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
-    attr_accessor :update, :draw
-    attr_reader :options, :parent
-    
-    include Chingu::InputClient
     
     #
-    # Class-level default values. 
-    # This allows you to set default-values that affect all created GameObjects after that.
-    # You might want to draw gameobjects from the top-left @ x/y instead of putting it's center there:
-    # 
-    # in Gosu::Window#initialize: GameObject.center_x = GameObject.center_y = 0
+    # returns [center_x, center_y]
     #
-    @@x = nil
-    @@y = nil
-    @@zorder = 100
-    @@center_x = 0.5
-    @@center_y = 0.5
-    @@factor_x = 1.0
-    @@factor_y = 1.0
-
-    def self.x; @@x; end
-    def self.x=(value); @@x = value; end
-
-    def self.y; @@y; end
-    def self.y=(value); @@y = value; end
-
-    def self.zorder; @@zorder; end
-    def self.zorder=(value); @@zorder = value; end
-
-    def self.center_x; @@center_x; end
-    def self.center_x=(value); @@center_x = value; end
-
-    def self.center_y; @@center_y; end
-    def self.center_y=(value); @@center_y = value; end
-
-    def self.factor_x; @@factor_x; end
-    def self.factor_x=(value); @@factor_x = value; end
-
-    def self.factor_y; @@factor_y; end
-    def self.factor_y=(value); @@factor_y = value; end
-
+    @@rotation_centers = {
+      :top_left => [0,0],
+      :left_top => [0,0],
+      
+      :center_left => [0,0.5],
+      :left_center => [0,0.5],
+      
+      :bottom_left => [0,1],
+      :left_bottom => [0,1],
+      
+      :top_center => [0.5,0],
+      :center_top => [0.5,0],
+      
+      :center_center => [0.5,0.5],
+      :center => [0.5,0.5],
+      
+      :bottom_center => [0.5,1],
+      :center_bottom => [0.5,1],
+      
+      :top_right => [1,0],
+      :right_top => [1,0],
+      
+      :center_right => [1,0.5],
+      :right_center => [1,0.5],
+      
+      :bottom_right => [1,1],
+      :right_bottom => [1,1]
+    }
+    
     #
-    # Create a new GameObject. Arguments are given in hash-format:
-    # 
-    #   :x        screen x-coordinate (default 0, to the left)
-    #   :y        screen y-coordinate (default 0, top of screen)
-    #   :angle    angle of object, used in draw_rot, (default 0, no rotation)
-    #   :zorder   a gameclass "foo" with higher zorder then gameclass "bar" is drawn on top of "foo".
-    #   :center_x relative horizontal position of the rotation center on the image. 
-    #               0 is the left border, 1 is the right border, 0.5 is the center (default 0.5)
-    #   :center_y see center_x. (default 0.5)
-    #   :factor_x horizontal zoom-factor, use >1.0 to zoom in. (default 1.0, no zoom).
-    #   :factor_y vertical zoom-factor, use >1.0 to zoom in. (default 1.0, no zoom).
+    # Sets @center_x and @center_y according to given alignment. Available alignments are:
     #
-    #   :update [true|false] Automaticly call #update on object each gameloop. Default +true+.
-    #   :draw   [true|false] Automaticly call #update on object each gameloop. Default +true+.
+    #   :top_left, :center_left, :bottom_left, :top_center, 
+    #   :center_center, :bottom_center, :top_right, :center_right and :bottom_right
     #
+    # They're also available in the opposite order with the same meaning.
+    #
+    def rotation_center(alignment)
+      @center_x, @center_y = @@rotation_centers[alignment.to_sym]
+    end
+    
     def initialize(options = {})
-      @options = options
-      
-      # draw_rot arguments
-      @image = options[:image]          if options[:image].is_a? Gosu::Image
-      @image = Image[options[:image]]   if options[:image].is_a? String
+      super
+
+      # All encapsulated draw_rot arguments can be set with hash-options at creation time
+      if options[:image].is_a?(Gosu::Image)
+        @image = options[:image]
+      elsif options[:image].is_a? String
+        @image = Image[options[:image]]
+      end
       
-      @x = options[:x] || @@x || 0
-      @y = options[:y] || @@y || 0
+      @x = options[:x] || 0
+      @y = options[:y] || 0
       @angle = options[:angle] || 0
-      @zorder = options[:zorder] || @@zorder
-      @center_x = options[:center_x] || options[:center] || @@center_x
-      @center_y = options[:center_y] || options[:center] || @@center_y
-      @factor_x = options[:factor_x] || options[:factor] || @@factor_x
-      @factor_y = options[:factor_y] || options[:factor] || @@factor_y
-      @color = Gosu::Color.new(options[:color]) if options[:color].is_a? Bignum
-      @color = options[:color]                  if options[:color].respond_to?(:alpha)
-      @color = Gosu::Color.new(0xFFFFFFFF)      if @color.nil?
-      
-      @mode = options[:mode] || :default # :additive is also available.
       
-      # Shortcuts for draw_rot arguments
-      @factor = 1
+      @center_x = options[:center_x] || options[:center] || 0.5
+      @center_y = options[:center_y] || options[:center] || 0.5
+      @factor_x = options[:factor_x] || options[:factor] || 1.0
+      @factor_y = options[:factor_y] || options[:factor] || 1.0
+
+      # faster?
+      #self.center = options[:center] || 0.5
+      #self.factor = options[:factor] || 1.0
+      #@center_x = options[:center_x] || 0.5
+      #@center_y = options[:center_y] || 0.5
+      #@factor_x = options[:factor_x] || 1.0
+      #@factor_y = options[:factor_y] || 1.0
+
+      if options[:color].is_a?(Gosu::Color)
+        @color = options[:color]
+      elsif options[:color].is_a? Bignum
+        @color = Gosu::Color.new(options[:color])
+      else
+        @color = Gosu::Color.new(0xFFFFFFFF)
+      end
       
-      # gameloop/framework logic
+      @mode = options[:mode] || :default # :additive is also available.
+      @zorder = options[:zorder] || 100
+                        
+      # gameloop/framework logic (TODO: use or get rid of)
       @update = options[:update] || true
       @draw = options[:draw] || true
-      @input = options[:input] || nil
-      
-      #
-      # A GameObject can either belong to a GameState or our mainwindow ($window)
-      # .. or live in limbo with manual updates
-      #
-      if $window && $window.respond_to?(:game_state_manager)
-        @parent = $window.game_state_manager.inside_state || $window
-        @parent.add_game_object(self) if @parent
-      end
     end
     
-    #
     # Quick way of setting both factor_x and factor_y
-    #
     def factor=(factor)
       @factor_x = @factor_y = factor
     end
-
-    #
+          
     # Quick way of setting both center_x and center_y
-    #
     def center=(factor)
       @center_x = @center_y = factor
     end
 
-    #
-    # Zoom - increase @factor_x and @factor_y at the same time.
-    #
-    def zoom(amount = 0.1)
-      @factor_x += amount
-      @factor_y += amount
-    end
-
-    #
-    # Zoom Out - decrease @factor_x and @factor_y at the same time.
-    #
-    def zoom_out(amount = 0.1)
-      @factor_x -= amount
-      @factor_y -= amount
-    end
-
-    #
-    # Rotate object 'amount' degrees
-    #
-    def rotate(amount = 1)
-      @angle += amount
-    end
-
-    #
-    # Fade object by decreasing/increasing color.alpha
-    #
-    def fade(amount = 1)
-      return if amount == 0
-      
-      new_alpha = @color.alpha + amount
-      if amount < 0
-        @color.alpha =  [0, new_alpha].max
-      else
-        @color.alpha =  [0, new_alpha].min
-      end
-    end
-
-    #
-    # Fade out objects color by decreasing color.alpha
-    #
-    def fade_out(amount = 1)
-      fade(-amount)
-    end
-
-    #
-    # Fade in objects color by increasing color.alpha
-    #
-    def fade_in(amount = 1)
-      fade(amount)
-    end
-
-    #
     # Returns true if object is inside the game window, false if outside
-    #
     def inside_window?(x = @x, y = @y)
       x >= 0 && x <= $window.width && y >= 0 && y <= $window.height
     end
 
-    #
     # Returns true object is outside the game window 
-    #
     def outside_window?(x = @x, y = @y)
       not inside_window?(x,y)
     end
-
-    def update(time = 0)
-      # Objects gamelogic here, 'time' is the time passed between 2 iterations of the main game loop
-		end
     
-    #
-    # The core of the gameclass, the draw_rot encapsulation. Draws the sprite on screen.
-    # Calling #to_i on @x and @y enables thoose to be Float's, for subpixel slow movement in #update
-    #
+    def distance_to(object)
+      distance(self.x, self.y, object.x, object.y)
+    end
+    
     def draw
-      @image.draw_rot(@x.to_i, @y.to_i, @zorder, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode)
+      super
+      @image.draw_rot(@x, @y, @zorder, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode)
     end
-  end
+  end  
 end

data/lib/chingu/game_state.rb

@@ -95,11 +95,12 @@ module Chingu
     #
     # Calls update on each game object that has current game state as parent (created inside that game state)
     #
-    def update(time = 1)
+    def update
       dispatch_input_for(self)
+      
       @input_clients.each { |game_object| dispatch_input_for(game_object) }      
       
-      @game_objects.each { |object| object.update(time) }
+      @game_objects.each { |object| object.update }
     end
     
     #
@@ -108,7 +109,7 @@ module Chingu
     def draw
       @game_objects.each { |object| object.draw }
     end
-    
+        
     #
     # Closes game state by poping it off the stack (and activating the game state below)
     #

data/lib/chingu/game_state_manager.rb

@@ -7,7 +7,7 @@ module Chingu
   # http://www.gamedev.net/community/forums/topic.asp?topic_id=477320
   #
   # Chingu::Window automatically creates a @game_state_manager and makes it accessible in our game loop.
-  # By default the game loop calls update(dt), draw, button_up(id) and button_down(id) on the active state.
+  # By default the game loop calls update, draw, button_up(id) and button_down(id) on the active state.
   #
   # ==== Chingu Examples
   #
@@ -180,7 +180,6 @@ module Chingu
     # Returns the previous game state. Shortcut: "previous"
     #
     def previous_game_state
-      ##@game_states[@game_states.index(current_game_state)-1]
       @previous_game_state
     end
     alias :previous previous_game_state
@@ -229,8 +228,8 @@ module Chingu
     #
     # If you're using Chingu::Window instead of Gosu::Window this will automaticly be called.
     #
-    def update(time = nil)
-      current_game_state.update(time)   if current_game_state
+    def update
+      current_game_state.update         if current_game_state
     end
 
     #

data/lib/chingu/game_states/debug.rb

@@ -0,0 +1,43 @@
+#
+# Debug game state (F1 is default key to start/exit debug win, 'p' to pause game)
+#
+module Chingu
+  module GameStates
+    class Debug < Chingu::GameState
+      def initialize(options)
+        super
+        @white = Color.new(255,255,255,255)
+        @fade_color = Gosu::Color.new(100,255,255,255)
+        
+        @font = Gosu::Font.new($window, default_font_name, 15)
+        @paused = true
+        
+        self.input = {:p => :pause, :f1 => :return_to_game, :esc => :return_to_game}
+      end
+    
+      def return_to_game
+        game_state_manager.pop_game_state
+      end
+      
+      def pause
+        @paused = @paused ? false : true
+      end
+      
+      def update
+        game_state_manager.previous_game_state.update unless @paused
+      end
+      
+      def draw
+        game_state_manager.previous_game_state.draw
+
+        $window.draw_quad(  0,0,@fade_color,
+                            $window.width,0,@fade_color,
+                            $window.width,$window.height,@fade_color,
+                            0,$window.height,@fade_color,10)
+                       
+        text = "DEBUG CONSOLE"
+        @font.draw(text, $window.width - @font.text_width(text), @font.height, 999)
+      end  
+    end
+  end
+end

data/lib/chingu/game_states/fade_to.rb

@@ -20,10 +20,10 @@ module Chingu
         @color = Gosu::Color.new(0,0,0,0)
         @alpha = 0.0
         @fading_in = false
-        @new_game_state.update(0)      # Make sure states game logic is run Once (for a correct draw())
+        @new_game_state.update      # Make sure states game logic is run Once (for a correct draw())
       end
     
-      def update(dt)
+      def update
         @alpha += (@fading_in ? -@options[:speed] : @options[:speed])
         if @alpha >= 255
           @fading_in = true

data/lib/chingu/helpers.rb

@@ -12,6 +12,8 @@ module Chingu
   end
     
   module InputDispatcher
+    attr_reader :input_clients
+    
     def add_input_client(object)
       @input_clients << object
     end