chingu 0.5.9.2 → 0.5.9.3

data/chingu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.9.2"
+  s.version = "0.5.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-11-11}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}

data/lib/chingu.rb

@@ -28,5 +28,5 @@ require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.9.2"
+  VERSION = "0.5.9.3"
 end

data/lib/chingu/basic_game_object.rb

@@ -35,11 +35,12 @@ module Chingu
     #
     def initialize(options = {})
       @options = options
+      @parent = options[:parent]
       
       #
       # A GameObject either belong to a GameState or our mainwindow ($window)
       #
-      if $window && $window.respond_to?(:game_state_manager)
+      if !@parent && $window && $window.respond_to?(:game_state_manager)
         @parent = $window.game_state_manager.inside_state || $window
       end
       

data/lib/chingu/game_states/edit.rb

@@ -32,16 +32,25 @@ module Chingu
     class Edit < Chingu::GameState
       def initialize(options = {})
         super
+        @grid = options[:grid]
+        @classes = options[:classes] || []
+        
         @color = Gosu::Color.new(200,0,0,0)
         @red = Gosu::Color.new(0xFFFF0000)
         @white = Gosu::Color.new(0xFFFFFFFF)
         @selected_game_object = nil        
         self.input =  { :left_mouse_button => :left_mouse_button, 
                         :released_left_mouse_button => :released_left_mouse_button,
+                        :delete => :destroy_selected_game_objects,
                         :e => :save_and_quit,
                         :s => :save,
-                        :esc => :quit 
-          }
+                        :esc => :quit,
+                        :"1" => :create_object_1,
+                        :"2" => :create_object_2,
+                        :"3" => :create_object_3,
+                        :"4" => :create_object_4,
+                        :"5" => :create_object_5,
+                      }
       end
 
       def setup
@@ -51,26 +60,45 @@ module Chingu
           "#{previous_game_state.class.to_s.downcase}.yml"
         end
         @filename = File.join($window.root, name)
-        @title = Text.create("Editing #{@filename}", :x => 5, :y => 10)
-        @title2 = Text.create("(S) Save  (E) Save and Quit  (ESC) Quit without saving", :x => 5, :y => 30)
-        @text = Text.create("", :x => 5, :y => 50)
+        @title = Text.create("File: #{@filename}", :x => 5, :y => 10)
+        @title.text += " - Grid: #{@grid}" if @grid
+        @title2 = Text.create("(1-10) Create object at mouse pos  (DEL) Delete selected object  (S) Save  (E) Save and Quit  (ESC) Quit without saving", :x => 5, :y => 30)        
+        @text = Text.create("", :x => 5, :y => 50)        
       end
       
+      def create_object_nr(number)
+        @classes[number].create(:x => $window.mouse_x, :y => $window.mouse_y, :parent => previous_game_state)  if @classes[number]
+      end
+      
+      def create_object_1; create_object_nr(0); end
+      def create_object_2; create_object_nr(1); end
+      def create_object_3; create_object_nr(2); end
+      def create_object_4; create_object_nr(3); end
+      def create_object_5; create_object_nr(4); end
+      
+        
+      
       def draw
-        previous_game_state.draw    # Draw prev game state onto screen (in this case our level)
+        # Draw prev game state onto screen (the level we're editing for example)
+        previous_game_state.draw 
         
+        #
+        # Draw an edit HUD
+        #
         $window.draw_quad(  0,0,@color,
                             $window.width,0,@color,
                             $window.width,100,@color,
                             0,100,@color,10)
+        #
+        # Draw debug Texts etc..
+        #
         super
         
-        previous_game_state.game_objects.select { |o| o.options[:selected] }.each do |game_object|
-          
-        #  rect = game_object.bounding_box
-        #  rect.x *= $window.factor
-        #  rect.y *= $window.factor
-        #  $window.fill_rect(rect, @red, game_object.zorder - 1)
+        #
+        # Draw a red rectangle around all selected game objects
+        #
+        selected_game_objects.each do |game_object|
+          draw_rect(game_object.bounding_box.inflate(2,2), @red, 999)
         end
         
         #
@@ -79,34 +107,64 @@ module Chingu
         $window.draw_triangle( $window.mouse_x, $window.mouse_y, @white, 
                                $window.mouse_x, $window.mouse_y + 10, @white, 
                                $window.mouse_x + 10, $window.mouse_y + 10, @white, 9999)
-                               
+        
+      end
+      
+      def update
+        super
+        
         if @left_mouse_button && @selected_game_object
-          @selected_game_object.x = $window.mouse_x / $window.factor
-          @selected_game_object.y = $window.mouse_y / $window.factor
+          @selected_game_object.x = ($window.mouse_x + @mouse_x_offset) / $window.factor
+          @selected_game_object.y = ($window.mouse_y + @mouse_y_offset) / $window.factor
+          @selected_game_object.x -= @selected_game_object.x % @grid[0]
+          @selected_game_object.y -= @selected_game_object.y % @grid[1]
           
-          #
-          # Can we abstract this out somehow?
-          #
+          # 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
         end
-      end  
+      end
+
+      def selected_game_objects
+        previous_game_state.game_objects.select { |o| o.options[:selected] }
+      end
+      
+      def destroy_selected_game_objects
+        selected_game_objects.each(&:destroy)
+      end
        
       def left_mouse_button
         @left_mouse_button = true
         x = $window.mouse_x / $window.factor
         y = $window.mouse_y / $window.factor
+                
         @text.text = "Click @ #{x} / #{y}"
+        
+        #
+        # Deselect all objects
+        #
+        selected_game_objects.each do |game_object|         
+          game_object.options[:selected] = false
+        end
+        
+        #
+        # Get new object that was clicked at (if any)
+        #
         @selected_game_object = game_object_at(x, y)
+        
         if @selected_game_object
-          @text.text = "#{@text.text} : #{@game_object.class.to_s}"
+          @text.text = "#{@text.text} : #{@selected_game_object.class.to_s}"
           @selected_game_object.options[:selected] = true
+          
+          @mouse_x_offset = @selected_game_object.x - $window.mouse_x
+          @mouse_y_offset = @selected_game_object.y - $window.mouse_y
         end
+        
       end
       
-      def released_left_mouse_button
+      def released_left_mouse_button        
         @left_mouse_button = false
         @selected_game_object = false
       end
@@ -148,7 +206,7 @@ module Chingu
       end
       
       def quit
-        pop_game_state
+        pop_game_state(:setup => false)
       end
       
       #

data/lib/chingu/helpers/gfx.rb

@@ -97,7 +97,16 @@ module Chingu
       end
     end
     
-     
+    #
+    # Draws a unfilled rect in given color
+    #
+    def draw_rect(rect, color, zorder)
+      $window.draw_line(rect.x, rect.y, color, rect.right, rect.y, color, zorder)
+      $window.draw_line(rect.right, rect.y, color, rect.right, rect.bottom, color, zorder)
+      $window.draw_line(rect.right, rect.bottom, color, rect.x, rect.bottom, color, zorder)
+      $window.draw_line(rect.x, rect.bottom, color, rect.x, rect.y, color, zorder)
+    end
+    
     #
     # Fills a given Rect 'rect' with Color 'color', drawing with zorder 'zorder'
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.2
+  version: 0.5.9.3
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-09 00:00:00 +01:00
+date: 2009-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency