chingu 0.7.7.5 → 0.8rc1

data/lib/chingu.rb

@@ -24,6 +24,10 @@ ROOT = File.dirname(File.expand_path($0))
 
 require 'rubygems' unless RUBY_VERSION =~ /1\.9/
 require 'gosu'
+require 'yaml'
+require 'rest_client'
+require 'crack/xml'
+
 require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
 
 # Seems like we need to include chingu/helpers first for BasicGameObject
@@ -33,7 +37,8 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.7.7.5"
+  # VERSION = "0.7.7.5"
+  VERSION = "0.8rc1"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/animation.rb

@@ -86,7 +86,8 @@ module Chingu
     #
     def frame_names=(names)
       names.each do |key, value|
-        @sub_animations[key] = self.new_from_frames(value) if value.is_a? Range
+        @sub_animations[key] = self.new_from_frames(value)  if value.is_a? Range
+        @sub_animations[key] = @frames[value]               if value.is_a? Fixnum
         #
         # TODO: Add support for [1,4,5] array frame selection
         #
@@ -136,7 +137,7 @@ module Chingu
     def [](index)
       return @frames[index]               if  index.is_a?(Fixnum)
       return self.new_from_frames(index)  if  index.is_a?(Range)
-      return @sub_animations[index]          if  index.is_a?(Symbol)
+      return @sub_animations[index]       if  index.is_a?(Symbol)
     end
 
     #

data/lib/chingu/game_object.rb

@@ -93,7 +93,13 @@ module Chingu
       setup
       
     end
-   
+    
+    def to_s
+      "#{self.class.to_s} @ #{x.to_i} / #{y.to_i} " <<
+      "(#{width.to_i} x #{height.to_i}) - " <<
+      " ratio: #{sprintf("%.2f",width/height)} scale: #{sprintf("%.2f", factor_x)}/#{sprintf("%.2f", factor_y)} angle: #{angle.to_i} zorder: #{zorder} alpha: #{alpha}"
+    end
+    
     #
     # Get all settings from a game object in one array.
     # Complemented by the GameObject#attributes= setter.

data/lib/chingu/game_object_map.rb

@@ -62,17 +62,11 @@ module Chingu
     #
     def insert(game_object)
       start_x = ( game_object.bb.left / @grid[0] ).to_i
-      stop_x =  ( (game_object.bb.right) / @grid[0] ).to_i
-        
-      #if game_object.zorder == 80
-      #  puts "x: #{game_object.x}, y: #{game_object.y}"
-      #  puts "width: #{game_object.width}, height: #{game_object.height}"
-      #  puts "start_x: #{start_x}, stop_x: #{stop_x}"
-      #end
-        
+      stop_x =  ( game_object.bb.right / @grid[0] ).to_i
+      
       (start_x ... stop_x).each do |x|
-        start_y = (game_object.bb.top / @grid[1] ).to_i
-        stop_y =  ( (game_object.bb.bottom) / @grid[1] ).to_i
+        start_y = ( game_object.bb.top / @grid[1] ).to_i
+        stop_y =  ( game_object.bb.bottom / @grid[1] ).to_i
           
         @game_object_positions[game_object] = [(start_x ... stop_x), (start_y ... stop_y)]
           
@@ -119,11 +113,11 @@ module Chingu
       start_x = (game_object.bb.left / @grid[0]).to_i
       stop_x =  (game_object.bb.right / @grid[0]).to_i
       
-      (start_x ... stop_x).each do |x|
+      (start_x .. stop_x).each do |x|
         start_y = (game_object.bb.top / @grid[1]).to_i
         stop_y =  (game_object.bb.bottom / @grid[1]).to_i
           
-        (start_y ... stop_y).each do |y|
+        (start_y .. stop_y).each do |y|
           return @map[x][y]   if @map[x] && @map[x][y]
         end
         

data/lib/chingu/game_states/edit.rb

@@ -62,8 +62,13 @@ module Chingu
         @except = options[:except] || []
         @classes -= Array(@except)
         @debug = options[:debug]
-        @zorder = 10000
 
+        #
+        # Turn on cursor + turn it back to its original value in finalize()
+        #
+        @original_cursor = $window.cursor
+        $window.cursor = true
+        
         p @classes  if @debug
 
         @hud_color = Gosu::Color.new(200,70,70,70)
@@ -141,15 +146,13 @@ module Chingu
             game_object = klass.create(:paused => true)
             game_object.x = x + 10
             game_object.y = y
-            game_object.zorder = @zorder
             game_object.options[:toolbar] = true
             game_object.rotation_center = :center_center
 
             # Scale down object to fit our toolbar
             if game_object.image
-              Text.create("#{klass.to_s[0..9]}\n#{game_object.width.to_i}x#{game_object.height.to_i}", :size => 12, :x=>x-16, :y=>y+18, :zorder => @zorder, :max_width => 55, :rotation_center => :top_left, :align => :center, :factor => 1)
+              Text.create("#{klass.to_s[0..9]}\n#{game_object.width.to_i}x#{game_object.height.to_i}", :size => 12, :x=>x-16, :y=>y+18, :max_width => 55, :rotation_center => :top_left, :align => :center, :factor => 1)
               game_object.size = @toolbar_icon_size
-              game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
               x += 50
             else
               puts "Skipping #{klass} - no image" if @debug
@@ -212,10 +215,10 @@ END_OF_STRING
           start_y = -previous_game_state.viewport.y % @grid.last
         end
         (start_x .. $window.width).step(@grid.first).each do |x|
-          $window.draw_line(x, 1, @grid_color, x, $window.height, @grid_color, @zorder-10, :additive)
+          $window.draw_line(x, 1, @grid_color, x, $window.height, @grid_color, 0, :additive)
         end
         (start_y .. $window.height).step(@grid.last).each do |y|
-          $window.draw_line(1, y, @grid_color, $window.width, y, @grid_color, @zorder-10, :additive)
+          $window.draw_line(1, y, @grid_color, $window.width, y, @grid_color, 0, :additive)
         end
         
       end
@@ -226,10 +229,10 @@ END_OF_STRING
       def setup
         @scroll_border_thickness = 30
         @file = options[:file] || previous_game_state.filename + ".yml"
-        @title = Text.create("File: #{@file}", :x => 5, :y => 2, :factor => 1, :size => 16, :zorder => @zorder)
+        @title = Text.create("File: #{@file}", :x => 5, :y => 2, :factor => 1, :size => 16)
         @title.text += " - Grid: #{@grid}" if @grid
-        @text = Text.create("", :x => 300, :y => 20, :factor => 1, :size => 16, :zorder => @zorder)
-        @status_text = Text.create("-", :x => 5, :y => 20, :factor => 1, :size => 16, :zorder => @zorder)
+        @text = Text.create("", :x => 300, :y => 20, :factor => 1, :size => 16)
+        @status_text = Text.create("-", :x => 5, :y => 20, :factor => 1, :size => 16)
         
         if defined?(previous_game_state.viewport)
           @game_area_backup = previous_game_state.viewport.game_area.dup
@@ -249,12 +252,8 @@ END_OF_STRING
         super
         
         @status_text.text = "#{self.mouse_x.to_i} / #{self.mouse_y.to_i}"
-        
-        if s = @selected_game_object
-          @text.text = "#{s.class.to_s} @ #{s.x.to_i} / #{s.y.to_i}"
-          @text.text = "Size: #{s.width.to_i} x #{s.height.to_i} Ratio: #{sprintf("%.2f",s.width/s.height)}"
-          @text.text += " [Scale: #{sprintf("%.2f", s.factor_x)}/#{sprintf("%.2f", s.factor_y)} Angle: #{s.angle.to_i} Z: #{s.zorder} Alpha: #{s.alpha}]"
-        end
+    
+        @text.text = @selected_game_object.to_s
         
         #
         # We got a selected game object and the left mouse button is held down
@@ -269,12 +268,6 @@ END_OF_STRING
               selected_game_object.y -= selected_game_object.y % @grid[1]
             end
           end
-          
-          # TODO: better cleaner sollution
-          if @selected_game_object.respond_to?(:bounding_box)
-            @selected_game_object.bounding_box.x = @selected_game_object.x
-            @selected_game_object.bounding_box.y = @selected_game_object.y
-          end
         elsif @left_mouse_button
           if defined?(self.previous_game_state.viewport)
             self.previous_game_state.viewport.x = @left_mouse_click_at[0] - $window.mouse_x
@@ -297,33 +290,39 @@ END_OF_STRING
         # Draw prev game state onto screen (the level we're editing)
         previous_game_state.draw
         
-        super
-        
+        # Restart z-ordering, everything after this will be drawn on top
+        $window.flush
+                
         draw_grid if @draw_grid
         
         #
         # Draw an edit HUD
         #
-        $window.draw_quad(  0,0,@hud_color,
-                            $window.width,0,@hud_color,
-                            $window.width,@hud_height,@hud_color,
-                            0,@hud_height,@hud_color, @zorder-1)
+        $window.draw_quad(  0,0,@hud_color, $window.width,0,@hud_color,
+                            $window.width,@hud_height,@hud_color,0,@hud_height,@hud_color)
+             
+        #
+        # Draw gameobjects
+        #
+        super
                 
         #
         # Draw red rectangles/circles around all selected game objects
-        #
+        #        
         if defined?(previous_game_state.viewport)
-          previous_game_state.viewport.apply {  selected_game_objects.each { |game_object| game_object.draw_debug } }
+          previous_game_state.viewport.apply { draw_selections }
         else
-          selected_game_objects.each { |game_object| game_object.draw_debug }
-        end
-        
-        if @cursor_game_object
-          @cursor_game_object.draw_at($window.mouse_x, $window.mouse_y)
-        else
-          draw_cursor_at($window.mouse_x, $window.mouse_y)
+          draw_selections
         end
         
+        @cursor_game_object.draw_at($window.mouse_x, $window.mouse_y)   if @cursor_game_object
+      end
+      
+      #
+      # Draw a red rectangle around all selected objects
+      #
+      def draw_selections
+        selected_game_objects.each { |game_object| draw_rect(bounding_box(game_object), Color::RED, 10000) }
       end
       
       #
@@ -340,7 +339,7 @@ END_OF_STRING
         end
         
         # Put out a new game object in the editor window and select it right away
-        @selected_game_object = create_new_game_object_from(@cursor_game_object)  if @cursor_game_object
+        @selected_game_object = copy_game_object(@cursor_game_object)  if @cursor_game_object
         
         # Check if user clicked on anything in the icon-toolbar of available game objects
         @cursor_game_object = game_object_icon_at($window.mouse_x, $window.mouse_y)
@@ -368,7 +367,6 @@ END_OF_STRING
           end
           
           if holding?(:left_shift)
-            #puts @selected_game_object.class.all.size
             previous_game_state.game_objects.select { |x| x.class == @selected_game_object.class }.each do |game_object|
               game_object.options[:selected] = true
             end
@@ -387,11 +385,7 @@ END_OF_STRING
       end
       
       def right_mouse_button
-        if @cursor_game_object
-          @cursor_game_object = nil
-        else
-          @cursor_game_object = game_object_at(self.mouse_x, self.mouse_y)
-        end
+        @cursor_game_object = @cursor_game_object ?  nil : game_object_at(mouse_x, mouse_y)
       end
       def released_right_mouse_button
       end
@@ -471,8 +465,9 @@ END_OF_STRING
       end
 
       def game_object_icon_at(x, y)
-        game_objects.select do |game_object| 
-          game_object.respond_to?(:collision_at?) && game_object.collision_at?(x,y)
+        game_objects.select do |game_object|
+          next if game_object.is_a? Text
+          bounding_box(game_object).collide_point?(x,y)
         end.first
       end
 
@@ -481,27 +476,18 @@ END_OF_STRING
       # .. get the one with highest zorder.
       #
       def game_object_at(x, y)
-        editable_game_objects.select do |game_object| 
-          game_object.respond_to?(:collision_at?) && game_object.collision_at?(x,y)
+        editable_game_objects.select do |game_object|
+          next if game_object.is_a? Text
+          bounding_box(game_object).collide_point?(x,y)
         end.sort {|x,y| y.zorder <=> x.zorder }.first
       end
 
-      #
-      # draw a simple triangle-shaped cursor
-      #
-      def draw_cursor_at(x, y, c = Color::WHITE)
-        c2 = Color::BLACK
-        $window.draw_triangle(x-2, y-4, c2, x-2, y+12, c2, x+14, y+12, c2, @zorder + 5)
-        $window.draw_triangle(x, y, c, x, y+10, c, x+10, y+10, c, @zorder + 10)
-      end
-
       def try_select_all
         editable_game_objects.each { |x| x.options[:selected] = true }  if holding?(:left_ctrl)
       end
       def try_save
         save if holding?(:left_ctrl)
       end
-      
       def quit
         pop_game_state
       end
@@ -517,6 +503,7 @@ END_OF_STRING
         if defined?(previous_game_state.viewport)
           previous_game_state.viewport.game_area = @game_area_backup
         end
+        $window.cursor = @original_cursor
       end
             
       def move_left
@@ -571,9 +558,6 @@ END_OF_STRING
         end
       end
       
-      def recache_bounding_boxes
-        selected_game_objects.each { |game_object| game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)}
-      end
       def tilt_left
         selected_game_objects.each { |game_object| game_object.angle -= 5 }
       end
@@ -582,11 +566,9 @@ END_OF_STRING
       end
       def scale_up
         scale_up_x && scale_up_y
-        recache_bounding_boxes
       end
       def scale_down
         scale_down_x && scale_down_y
-        recache_bounding_boxes
       end
       
       def inc_zorder
@@ -653,7 +635,7 @@ END_OF_STRING
         x >= 0 && x <= $window.width && y >= 0 && y <= $window.height
       end
 
-      def create_new_game_object_from(template)
+      def copy_game_object(template)
         game_object = template.class.create(:parent => previous_game_state)
         # If we don't create it from the toolbar, we're cloning another object
         # When cloning we wan't the cloned objects attributes
@@ -665,10 +647,25 @@ END_OF_STRING
         game_object.options[:mouse_x_offset] = (game_object.x - self.mouse_x) rescue 0
         game_object.options[:mouse_y_offset] = (game_object.y - self.mouse_y) rescue 0
         
-        game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
         return game_object
-     end
-
+      end
+      
+      CENTER_TO_FACTOR = { 0 => -1, 0.5 => 0, 1 => 1 }
+      #
+      # Returns a bounding box (Rect-class) for any gameobject
+      # It will take into considerations rotation_center and scaling
+      #      
+      def bounding_box(game_object)
+        width, height = game_object.width, game_object.height
+        x = game_object.x - width * game_object.center_x
+        y = game_object.y - height * game_object.center_y
+        x += width * CENTER_TO_FACTOR[game_object.center_x]   if game_object.factor_x < 0
+        y += height * CENTER_TO_FACTOR[game_object.center_y]  if game_object.factor_y < 0
+        return Rect.new(x, y, width, height)
+      end
+      alias :bb :bounding_box
+        
+      
       #
       # If we're editing a game state with automaticly called special methods, 
       # the following takes care of those.

data/lib/chingu/game_states/enter_name.rb

@@ -0,0 +1,97 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu  
+  module GameStates
+    #
+    # A Chingu::GameState for showing a classic arcade "enter name" screen.
+    # Will let the user enter his alias or name with the keyboard or game_pad
+    # Intended to be minimalistic. If you wan't something flashy you probably want to do this class yourself.
+    #  
+    class EnterName < Chingu::GameState
+  
+      def initialize(options = {})
+        super
+    
+        Text.create("Please enter your name:", :x => 0, :y => 0, :size => 40)
+    
+        on_input([:holding_left, :holding_a, :holding_gamepad_left], :left)
+        on_input([:holding_right, :holding_d, :holding_gamepad_right], :right)
+        on_input([:space, :x, :enter, :gamepad_button_1, :return], :action)
+        
+        @callback = options[:callback]
+        
+        @string = []
+        @texts = []
+        @start_y = 200
+        @start_x = 0
+        @index  = 0
+        #@letters = %w[ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ! " # % & ( ) [ ] = * _ < GO! ]
+        @letters = %w[ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ! _ < GO! ]
+        x = @start_x
+        
+        @letters.each do |letter|
+          @texts << Text.create(letter, :x => x, :y => @start_y, :rotation_center => :bottom_left, :size => 25)
+          x += 25
+        end
+      
+        @selected_color = Color::RED
+        @signature = Text.create("", :x => $window.width/2, :y => $window.height/2, :size => 80, :align => :center)
+      end
+    
+      # Move cursor 1 step to the left
+      def left; move_cursor(-1); end
+      
+      # Move cursor 1 step to the right
+      def right; move_cursor(1); end
+      
+      # Move cursor any given value (positive or negative). Used by left() and right()
+      def move_cursor(amount = 1)
+        @index += amount
+        @index = 0  if @index >= @letters.size
+        sleep(0.1)
+      end
+  
+      def action
+        case @letters[@index]
+          when "<"    then  @string.pop
+          when "_"    then  @string << " "
+          when "GO!"  then  go
+          else              @string << @letters[@index]
+        end
+    
+        @signature.text = @string.join
+        @signature.x = $window.width/2 - @signature.width/2
+      end
+    
+      def draw
+        @rect = Rect.new(@start_x + (25 * @index), @start_y+25, @texts[@index].width, 10)
+        fill_rect(@rect, @selected_color, 0)
+        super
+      end
+  
+      def go
+        pop_game_state(:name => @string.join)
+      end
+      
+    end
+  end
+end