chingu 0.7.6.7 → 0.7.6.8

data/README.rdoc

@@ -456,33 +456,39 @@ The biggest and most usable is GameStates::Edit which enables fast 'n easy level
 Start example19 and press 'E' to get a full example.
 
 Edit commands / shortcuts:
+  F1: Help screen
   1-5: create object 1..5 shown in toolbar at mousecursor
-  DEL: delete selected objects
-  BACKSPACE: reset selected objects to default values 
-  CTRL+A: select all objects (not code-created ones though)
+  CTRL+A: select all objects (not in-code-created ones though)
   CTRL+S: Save
   E: Save and Quit
+  Q: Quit (without saving)
   ESC: Deselect all objects
-  Right Mouse Button Click: Copy object that was clicked on for fast duplication
+  Right Mouse Button Click: Copy object bellow cursor for fast duplication
   Arrow-keys (with selected objects): Move objects 1 pixel at the time
   Arrow-keys (with no selected objects): Scroll within a viewport
-  Page up/down: Modify the zorder of selected game objects
-  
-  # The bellow keys works on all selected game objects
-  r: scale up
-  f: scale down
-  t: tilt left
-  g: tilt right
-  y: inc zorder
-  h: dec zorder
-  u: less transparency
-  j: more transparencty
   
+
+  Bellow keys operates on all currently selected game objects
+  -----------------------------------------------------------------------------------
+  DEL: delete selected objects
+  BACKSPACE: reset angle and scale to default values
+  Page Up: Increase zorder
+  Page Down: Decrease zorder
+  
+  R: scale up
+  F: scale down
+  T: tilt left
+  G: tilt right
+  Y: inc zorder
+  H: dec zorder
+  U: less transparency
+  J: more transparency
+
   Mouse Wheel (with no selected objects): Scroll viewport up/down
   Mouse Wheel: Scale up/down
   SHIFT + Mouse Wheel: Tilt left/right
   CTRL + Mouse Wheel: Zorder up/down
-  ALT + Mouse Wheel: Transperency less/more
+  ALT + Mouse Wheel: Transparency less/more
   
 Move mouse cursor close to the window border to scroll a viewport if your game state has one.
 

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.6.7"
+  s.version = "0.7.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-08-15}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [
@@ -119,6 +119,7 @@ Gem::Specification.new do |s|
      "lib/chingu/game_states/edit.rb",
      "lib/chingu/game_states/fade_to.rb",
      "lib/chingu/game_states/pause.rb",
+     "lib/chingu/game_states/popup.rb",
      "lib/chingu/gosu_ext/image.rb",
      "lib/chingu/helpers/class_inheritable_accessor.rb",
      "lib/chingu/helpers/game_object.rb",

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.7.6.7"
+  VERSION = "0.7.6.8"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_object_map.rb

@@ -34,7 +34,7 @@ module Chingu
   # ** This class is under heavy development, API will most likely change! **
   #
   class GameObjectMap
-    attr_reader :map
+    attr_reader :map, :game_object_positions
     
     def initialize(options = {})
       @game_objects = options[:game_objects]
@@ -49,15 +49,26 @@ module Chingu
     #
     def create_map
       @map = []
+      @game_object_positions = {}
+            
       @game_objects.each do |game_object|
         puts "#{game_object.class} @ #{game_object.x} / #{game_object.y}" if @debug
-        
+                
         start_x = (game_object.bb.left / @grid[0]).to_i
-        stop_x =  (game_object.bb.right / @grid[0]).to_i
-          
+        stop_x =  ( (game_object.bb.right-1) / @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
+        
+        
         (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-1) / @grid[1] ).to_i
+          
+          @game_object_positions[game_object] = [(start_x .. stop_x), (start_y .. stop_y)]
           
           @map[x] ||= []
           (start_y .. stop_y).each do |y|
@@ -67,6 +78,28 @@ module Chingu
       end
     end
     
+    #
+    # Removes a specific game object from the map
+    #
+    def clear_game_object(game_object)
+      range_x, range_y = @game_object_positions[game_object]
+      
+      range_x.each do |x|
+        range_y.each do |y|
+          @map[x][y] = nil
+        end
+      end
+    end
+      
+    #
+    # Clear game object from the array-map on a certain X/Y
+    #
+    def clear_at(x, y)
+      lookup_x = (x / @grid[0]).to_i
+      lookup_y = (y / @grid[1]).to_i
+      @map[lookup_x][lookup_y] = nil
+    end
+
     #
     # Gets a game object from the array-map on a certain X/Y
     #

data/lib/chingu/game_state.rb

@@ -57,7 +57,7 @@ module Chingu
     include Chingu::Helpers::ClassInheritableAccessor # adds classmethod class_inheritable_accessor
     
     attr_reader :options
-    attr_accessor :game_objects, :game_state_manager
+    attr_accessor :game_objects, :game_state_manager, :previous_game_state
     
     class_inheritable_accessor :trait_options
     @trait_options = Hash.new
@@ -107,9 +107,14 @@ module Chingu
       @options = options
       @game_objects = GameObjectList.new
       @input_clients = Array.new
-      
-      # Game state mamanger can be run alone
+  
+      # Game state manager can be run alone
       if defined?($window) && $window.respond_to?(:game_state_manager)
+        
+        # Since we place the init of previous_game_state here, game states can use it even 
+        # in initialize() if they call super first.
+        @previous_game_state = $window.game_state_manager.current_game_state
+        
         $window.game_state_manager.inside_state = self
       end
       

data/lib/chingu/game_states/edit.rb

@@ -49,7 +49,7 @@ module Chingu
 
       def initialize(options = {})
         super
-        
+                
         options = {:draw_grid => true, :snap_to_grid => true, :resize_to_grid => true}.merge(options)
         
         @grid = options[:grid] || [8,8]
@@ -69,6 +69,7 @@ module Chingu
         @hud_color = Gosu::Color.new(200,70,70,70)
         @selected_game_object = nil
         self.input =  {
+          :f1 => :display_help,
           :left_mouse_button => :left_mouse_button,
           :released_left_mouse_button => :released_left_mouse_button,
           :right_mouse_button => :right_mouse_button,
@@ -128,6 +129,7 @@ module Chingu
         }
 
         @hud_height = 140
+        @toolbar_icon_size = [32,32]
         x = 20
         y = 60
         @classes.each do |klass|
@@ -137,17 +139,18 @@ module Chingu
           # so they're not overwritten by the class initialize/setup or simular
           begin
             game_object = klass.create(:paused => true)
-            game_object.x = x
+            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}\n#{game_object.width.to_i}x#{game_object.height.to_i}", :size => 13, :x=>x-16, :y=>y+18, :zorder => @zorder)
-              game_object.size = [32,32]
+              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)
+              game_object.size = @toolbar_icon_size
               game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
-              x += 60
+              x += 50
             else
               puts "Skipping #{klass} - no image" if @debug
               game_object.destroy
@@ -158,10 +161,52 @@ module Chingu
         end
       end
       
+      def display_help
+text = <<END_OF_STRING
+  F1: This help screen
+  ESC: Return to Edit
+  
+  1-5: create object 1..5 shown in toolbar at mousecursor
+  CTRL+A: select all objects (not in-code-created ones though)
+  CTRL+S: Save
+  E: Save and Quit
+  Q: Quit (without saving)
+  ESC: Deselect all objects
+  Right Mouse Button Click: Copy object bellow cursor for fast duplication
+  Arrow-keys (with selected objects): Move objects 1 pixel at the time
+  Arrow-keys (with no selected objects): Scroll within a viewport
+  
+
+  Bellow keys operates on all currently selected game objects
+  -----------------------------------------------------------------------------------
+  DEL: delete selected objects
+  BACKSPACE: reset angle and scale to default values
+  Page Up: Increase zorder
+  Page Down: Decrease zorder
+  
+  R: scale up
+  F: scale down
+  T: tilt left
+  G: tilt right
+  Y: inc zorder
+  H: dec zorder
+  U: less transparency
+  J: more transparencty
+
+  Mouse Wheel (with no selected objects): Scroll viewport up/down
+  Mouse Wheel: Scale up/down
+  SHIFT + Mouse Wheel: Tilt left/right
+  CTRL + Mouse Wheel: Zorder up/down
+  ALT + Mouse Wheel: Transparency less/more
+END_OF_STRING
+        
+        push_game_state( GameStates::Popup.new(:text => text) )
+      end
+      
       def draw_grid
         return unless @grid
         
-        start_x = start_y = 0,0
+        start_x, start_y = 0,0
         if defined?(previous_game_state.viewport)
           start_x = -previous_game_state.viewport.x % @grid.first
           start_y = -previous_game_state.viewport.y % @grid.last
@@ -190,7 +235,7 @@ module Chingu
           @game_area_backup = previous_game_state.viewport.game_area.dup
           previous_game_state.viewport.game_area.x -= @hud_height
           previous_game_state.viewport.game_area.y -= @hud_height
-        end        
+        end
       end
                   
       #
@@ -243,7 +288,6 @@ module Chingu
           scroll_up     if $window.mouse_y < @scroll_border_thickness
           scroll_down   if $window.mouse_y > $window.height - @scroll_border_thickness
         end
-        
       end
       
       #
@@ -256,7 +300,7 @@ module Chingu
         super
         
         draw_grid if @draw_grid
-                
+        
         #
         # Draw an edit HUD
         #
@@ -264,7 +308,7 @@ module Chingu
                             $window.width,0,@hud_color,
                             $window.width,@hud_height,@hud_color,
                             0,@hud_height,@hud_color, @zorder-1)
-        
+                
         #
         # Draw red rectangles/circles around all selected game objects
         #
@@ -279,6 +323,7 @@ module Chingu
         else
           draw_cursor_at($window.mouse_x, $window.mouse_y)
         end
+        
       end
       
       #
@@ -589,13 +634,17 @@ module Chingu
       def scroll_right(amount = 10)
         self.previous_game_state.viewport.x += amount if defined?(self.previous_game_state.viewport)
       end
+      
       def mouse_x
         x = $window.mouse_x
         x += self.previous_game_state.viewport.x if defined?(self.previous_game_state.viewport)
+        return x
       end
+      
       def mouse_y
         y = $window.mouse_y
         y += self.previous_game_state.viewport.y if defined?(self.previous_game_state.viewport)
+        return y
       end
 
       def inside_window?(x = $window.mouse_x, y = $window.mouse_y)
@@ -609,7 +658,7 @@ module Chingu
         game_object.options[:created_with_editor] = true
         game_object.x = self.mouse_x
         game_object.y = self.mouse_y
-         
+                 
         unless template.options[:toolbar]
           game_object.angle = template.angle
           game_object.factor_x = template.factor_x
@@ -625,8 +674,8 @@ module Chingu
           game_object.factor_y = wanted_height.to_f / game_object.image.height.to_f
         end
         
-        game_object.options[:mouse_x_offset] = game_object.x - self.mouse_x
-        game_object.options[:mouse_y_offset] = game_object.y - self.mouse_y
+        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

data/lib/chingu/game_states/pause.rb

@@ -30,16 +30,17 @@ module Chingu
     # requires the global $window set to the instance of Gosu::Window (automaticly handled if you use Chingu::Window)
     #
     class Pause < Chingu::GameState
+      
       def initialize(options = {})
         super
         @white = Color.new(255,255,255,255)
         @color = Gosu::Color.new(200,0,0,0)
         @font = Gosu::Font.new($window, default_font_name, 35)
-        @text = "PAUSED - press key to continue"
+        @text = "PAUSED - press ESC to return to game."
       end
     
-      def button_down(id)
-        pop_game_state(:setup => false)    # Return the previous game state, dont call setup()
+      def button_up(id)
+        pop_game_state(:setup => false) if id == Gosu::KbEscape   # Return the previous game state, dont call setup()
       end
       
       def draw
@@ -47,9 +48,9 @@ module Chingu
         $window.draw_quad(  0,0,@color,
                             $window.width,0,@color,
                             $window.width,$window.height,@color,
-                            0,$window.height,@color,10)
+                            0,$window.height,@color, Chingu::DEBUG_ZORDER)
                             
-        @font.draw(@text, ($window.width/2 - @font.text_width(@text)/2), $window.height/2 - @font.height, 999)
+        @font.draw(@text, ($window.width/2 - @font.text_width(@text)/2), $window.height/2 - @font.height, Chingu::DEBUG_ZORDER + 1)
       end  
     end
   end

data/lib/chingu/game_states/popup.rb

@@ -0,0 +1,56 @@
+#--
+#
+# 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
+  
+    #
+    # Premade game state for chingu - A simple way if pausing the game + displaying a text.
+    # Usage:
+    #   push_game_state(Chingu::GameStates::Popup.new(:text => "bla bla bla"))
+    #
+    # TODO: Use Gosu's new flush() instead of mucking around with ZORDER + 1000...
+    #
+    class Popup < Chingu::GameState
+      
+      def initialize(options = {})
+        super
+        @white = Color.new(255,255,255,255)
+        @color = Gosu::Color.new(200,0,0,0)
+        @string = options[:text] || "Press ESC to return."
+        @text = Text.new(@string, :x => 20, :y => 10, :align => :left, :zorder => Chingu::DEBUG_ZORDER + 1001, :factor => 1)
+      end
+    
+      def button_up(id)
+        pop_game_state(:setup => false) if id == Gosu::KbEscape   # Return the previous game state, dont call setup()
+      end
+      
+      def draw
+        previous_game_state.draw          # Draw prev game state
+        $window.draw_quad(  0,0,@color,
+                            $window.width,0,@color,
+                            $window.width,$window.height,@color,
+                            0,$window.height,@color, Chingu::DEBUG_ZORDER + 1000)                            
+        @text.draw
+      end  
+    end
+  end
+end

data/lib/chingu/helpers/game_state.rb

@@ -34,37 +34,30 @@ module Chingu
     end
     
     def push_game_state(state, options = {})
-      #$window.game_state_manager.push_game_state(state, options)
       game_state_manager.push_game_state(state, options)
     end
   
     def pop_game_state(options = {})
-      #$window.game_state_manager.pop_game_state(options)
       game_state_manager.pop_game_state(options)
     end
 
     def switch_game_state(state, options = {})
-      #$window.game_state_manager.switch_game_state(state, options)
       game_state_manager.switch_game_state(state, options)
     end
 
     def transitional_game_state(state, options = {})
-      ##$window.game_state_manager.transitional_game_state(state, options)
       game_state_manager.transitional_game_state(state, options)
     end
 
     def current_game_state
-      ##$window.game_state_manager.current_game_state
       game_state_manager.current_game_state
     end
 
-    def previous_game_state
-      ##$window.game_state_manager.previous_game_state
-      game_state_manager.previous_game_state
-    end
+    #def previous_game_state
+    #  game_state_manager.previous_game_state
+    #end
     
     def clear_game_states
-      #$window.game_state_manager.clear_game_states
       game_state_manager.clear_game_states
     end
   end

data/lib/chingu/helpers/input_dispatcher.rb

@@ -86,7 +86,8 @@ module Chingu
     # * GameState-inherited class, create a new instance, cache it and push it on top of stack
     #
     def dispatch_action(action, object)
-      # puts "Dispatch Action: #{action} - Objects class: #{object.class.to_s}"
+      #puts "Dispatch Action: #{action} - Objects class: #{object.class.to_s}"
+      
       case action
       when Symbol, String
         object.send(action)

data/lib/chingu/rect.rb

@@ -49,8 +49,6 @@
 # 		union, union!
 # 		union_all, union_all!
 #
-#	class Surface
-#		make_rect
 # 
 #++
 
@@ -105,7 +103,6 @@ class Rect < Array
 	#  3. Elsif it has a +rect+ attribute., perform (1) and (2) on that.
 	#  4. Otherwise, raise TypeError.
 	# 
-	# See also Surface#make_rect()
 	def Rect.new_from_object(object)
 		case(object)
 		when Rect
@@ -620,12 +617,4 @@ class Rect < Array
 end # class Rect
 
 
-class Surface
-	# Return a Rect with the same width and height as the Surface, positioned
-	# at (0,0).
-	def make_rect()
-		return Rect.new(0,0,self.width,self.height)
-	end
-end
-
-end # module Rubygame
+end # module Chingu

data/lib/chingu/text.rb

@@ -109,11 +109,11 @@ module Chingu
     end
     
     #
-    #
+    # Draws @background if present + our text in @image
     #
     def draw
       @background.draw  if @background    # draw our background, if any
-      super                               # super -> GameObject#draw which draws out text
+      super                               # super -> GameObject#draw which draws out text in form of @image
     end
     
     private

data/lib/chingu/viewport.rb

@@ -146,8 +146,11 @@ module Chingu
       end
     end
     
+    #
+    # Apply the X/Y viewport-translation, used by trait "viewport"
+    #
     def apply(&block)
-      $window.translate(-@x, -@y, &block)
+      $window.translate(-@x.to_i, -@y.to_i, &block)
     end
 
     def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 97
+  hash: 127
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  - 7
-  version: 0.7.6.7
+  - 8
+  version: 0.7.6.8
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -389188292
+        hash: -957518095
         segments: 
         - 2
         - 0
@@ -193,6 +193,7 @@ files:
 - lib/chingu/game_states/edit.rb
 - lib/chingu/game_states/fade_to.rb
 - lib/chingu/game_states/pause.rb
+- lib/chingu/game_states/popup.rb
 - lib/chingu/gosu_ext/image.rb
 - lib/chingu/helpers/class_inheritable_accessor.rb
 - lib/chingu/helpers/game_object.rb