chingu 0.7.5 → 0.7.6

data/lib/chingu/helpers/game_object.rb

@@ -52,21 +52,23 @@ module Chingu
     # Creates game objects from a Chingu-spezed game objects file (created with game state 'Edit')
     #
     def load_game_objects(options = {})
-      file = options[:file] || "#{self.class.to_s.downcase}.yml"
+      file = options[:file] || self.filename + ".yml"
       debug = options[:debug]
+      except = Array(options[:except]) || []
       
       require 'yaml'
       
       puts "* Loading game objects from #{file}" if debug
       if File.exists?(file)
-        game_objects = YAML.load_file(file)
-        game_objects.each do |game_object|
-          game_object.each_pair do |klassname, attributes|
+        objects = YAML.load_file(file)
+        objects.each do |object|
+          object.each_pair do |klassname, attributes|
             begin
               klass = Kernel::const_get(klassname)
-              unless klass.class == "GameObject"
+              unless klass.class == "GameObject" && !except.include?(klass)
                 puts "Creating #{klassname.to_s}: #{attributes.to_s}" if debug
-                klass.create(attributes)
+                object = klass.create(attributes)
+                object.options[:created_with_editor] = true if object.options
               end
             rescue
               puts "Couldn't create class '#{klassname}'"
@@ -74,6 +76,7 @@ module Chingu
           end
         end
       end
+      self.game_objects.sync
     end
     
     #
@@ -91,7 +94,8 @@ module Chingu
       require 'yaml'
       objects = []
       game_objects.each do |game_object|
-        next if classes and !classes.include?(game_object.class)
+        # Only save specified classes, if given.
+        next if classes and !classes.empty? and !classes.include?(game_object.class)
         
         objects << {game_object.class.to_s  => 
                       {
@@ -99,8 +103,10 @@ module Chingu
                       :y => game_object.y,
                       :angle => game_object.angle,
                       :zorder => game_object.zorder,
-                      #:factor_x => game_object.factor_x,
-                      #:factor_y => game_object.factor_y,
+                      :factor_x => game_object.factor_x,
+                      :factor_y => game_object.factor_y,
+                      :color => game_object.color.argb,
+                      #:color => sprintf("0x%x",game_object.color.argb)
                       #:center_x => game_object.center_x,
                       #:center_y => game_object.center_y,
                       }

data/lib/chingu/input.rb

@@ -53,10 +53,10 @@ module Chingu
       KbLeftShift   => [:left_shift, :lshift],
       
       
-      KbNumpadAdd       => [:"+", :add],
+      KbNumpadAdd       => [:"+", :add, :plus],
       KbNumpadDivide    => [:"/", :divide],
       KbNumpadMultiply  => [:"*", :multiply],
-      KbNumpadSubtract  => [:"-", :subtract],
+      KbNumpadSubtract  => [:"-", :subtract, :minus],
       KbPageDown        => [:page_down],
       KbPageUp          => [:page_up],
       # KbPause           => [:pause],

data/lib/chingu/traits/animation.rb

@@ -54,16 +54,17 @@ module Chingu
       #
       def load_animations
         animations = {}
-        glob = "#{trait_options[:animation][:directory]}/#{self.filename}_*"
+        glob = "#{trait_options[:animation][:directory]}/#{self.filename}*"
         puts "Animations? #{glob}" if trait_options[:animation][:debug]
         Dir[glob].each do |tile_file|
-          #state = :default
+          puts tile_file if trait_options[:animation][:debug]
           if tile_file =~ /[a-zA-Z\_+]_*(\d+)x(\d+)_*([a-zA-Z]*)\.(bmp|png)/
-          #if tile_file =~ /_*([a-zA-Z]*)\.(bmp|png)\Z/
-          #if tile_file =~ /#{self.filename}\.(bmp|png)/
             state = $3.length > 0 ? $3 : "default"            
             animations[state.to_sym] = Chingu::Animation.new(trait_options[:animation].merge(:file => tile_file))
+          elsif tile_file =~ /[a-zA-Z\_+]\.(bmp|png)/
+            animations[:default] = Chingu::Animation.new(trait_options[:animation].merge(:file => tile_file))
           end
+          
         end
         return animations
       end

data/lib/chingu/traits/bounding_box.rb

@@ -26,6 +26,8 @@ module Chingu
     # x, y, factor_x, factor_y and rotation_center
     #
     module BoundingBox
+      CENTER_TO_FACTOR = { 0 => -1, 0.5 => 0, 1 => 1 }
+      attr_accessor :collidable
     
       module ClassMethods
         def initialize_trait(options = {})
@@ -35,6 +37,7 @@ module Chingu
       
       def setup_trait(options)
         @cached_bounding_box = nil
+        @collidable = true
         super
       end
       
@@ -60,10 +63,12 @@ module Chingu
           width = width * trait_options[:bounding_box][:scale]
           height = height * trait_options[:bounding_box][:scale]
         end
-        
-        x = self.x - (width * self.center_x.abs)
-        y = self.y - (height * self.center_y.abs)
-        
+                
+        x = self.x - width * self.center_x
+        y = self.y - height * self.center_y
+        x += width * CENTER_TO_FACTOR[self.center_x]   if self.factor_x < 0
+        y += height * CENTER_TO_FACTOR[self.center_y]  if self.factor_y < 0
+
         return Rect.new(x, y, width, height)
       end
       alias :bb :bounding_box

data/lib/chingu/traits/bounding_circle.rb

@@ -28,6 +28,7 @@ module Chingu
     # ...this usually only makes sense with rotation_center = :center
     #
     module BoundingCircle
+      attr_accessor :collidable
     
       module ClassMethods
         def initialize_trait(options = {})
@@ -37,6 +38,7 @@ module Chingu
       
       def setup_trait(options)
         @cached_radius = nil
+        @collidable = true
         super
       end
       

data/lib/chingu/traits/collision_detection.rb

@@ -33,6 +33,7 @@ module Chingu
     #   radius            - a number
     #
     module CollisionDetection
+      attr_accessor :collidable
       
       module ClassMethods
         def initialize_trait(options = {})
@@ -40,6 +41,11 @@ module Chingu
         end
       end
       
+      def setup_trait(options)
+        @collidable = true
+        super
+      end
+      
       #
       # The standard method called when self needs to be checked for a collision with another object
       # By default it calls bounding_box_collision? which will check for intersectons between the 
@@ -61,6 +67,7 @@ module Chingu
       # Returns true if colliding.
       #
       def bounding_box_collision?(object2)
+        return false  unless self.collidable && object2.collidable
         self.bounding_box.collide_rect?(object2.bounding_box)
       end
       
@@ -69,6 +76,7 @@ module Chingu
       # Returns true if colliding.
       #
       def bounding_circle_collision?(object2)
+        return false  unless self.collidable && object2.collidable
         Gosu.distance(self.x, self.y, object2.x, object2.y) < self.radius + object2.radius
       end
       
@@ -78,6 +86,8 @@ module Chingu
       # http://stackoverflow.com/questions/401847/circle-rectangle-collision-detection-intersection
       #
       def bounding_box_bounding_circle_collision?(object2)
+        return false  unless self.collidable && object2.collidable
+        
         rect = self.respond_to?(:bounding_box) ? self.bounding_box : object2.bounding_box
         circle = self.respond_to?(:radius) ? self : object2
         radius = circle.radius.to_i
@@ -101,7 +111,7 @@ module Chingu
       #
       def each_collision(*klasses)
         Array(klasses).each do |klass|
-          klass.all.each do |object|
+          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
             yield(self, object)   if collides?(object)
           end
         end
@@ -109,7 +119,7 @@ module Chingu
 
       def first_collision(*klasses)
         Array(klasses).each do |klass|
-          klass.all.each do |object|
+          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
             return object   if collides?(object)
           end
         end
@@ -122,7 +132,8 @@ module Chingu
       #
       def each_bounding_circle_collision(*klasses)
         Array(klasses).each do |klass|
-          klass.all.each do |object|
+          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+            next  unless self.collidable && object.collidable
             yield(self, object) if Gosu.distance(self.x, self.y, object.x, object.y) < self.radius + object.radius
           end
         end
@@ -134,7 +145,8 @@ module Chingu
       #
       def each_bounding_box_collision(*klasses)
         Array(klasses).each do |klass|
-          klass.all.each do |object|
+          (klass.respond_to?(:all) ? klass.all : klass).each do |object|
+            return false  unless self.collidable && object.collidable
             yield(self, object) if self.bounding_box.collide_rect?(object.bounding_box)
           end
         end
@@ -147,12 +159,13 @@ module Chingu
         #
         def each_bounding_circle_collision(*klasses)
           Array(klasses).each do |klass|
-            object2_list = klass.all
+            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
             #total_radius = object1.radius + object2.radius  # possible optimization?
             
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves
+                next  unless object1.collidable && object2.collidable
                 yield object1, object2  if Gosu.distance(object1.x, object1.y, object2.x, object2.y) < object1.radius + object2.radius
               end
             end
@@ -164,10 +177,11 @@ module Chingu
         #
         def each_bounding_box_collision(*klasses)
           Array(klasses).each do |klass|
-            object2_list = klass.all
+            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves
+                next  unless object1.collidable && object2.collidable
                 yield object1, object2  if object1.bounding_box.collide_rect?(object2.bounding_box)
               end
             end
@@ -189,18 +203,20 @@ module Chingu
           # Make sure klasses is always an array.
           Array(klasses).each do |klass|
             
-            if self.instance_methods.include?(:radius) && klass.instance_methods.include?(:radius)
-              self.each_bounding_circle_collision(klass) do |o1, o2|
-                yield o1, o2
+            if self.respond_to?(:instance_methods) && klass.respond_to?(:instance_methods)
+              if self.instance_methods.include?(:radius) && klass.instance_methods.include?(:radius)
+                self.each_bounding_circle_collision(klass) do |o1, o2|
+                  yield o1, o2
+                end
+                next
               end
-              next
-            end
                 
-            if self.instance_methods.include?(:bounding_box) && klass.instance_methods.include?(:bounding_box)
-              self.each_bounding_box_collision(klass) do |o1, o2|
-                yield o1, o2
+              if self.instance_methods.include?(:bounding_box) && klass.instance_methods.include?(:bounding_box)
+                self.each_bounding_box_collision(klass) do |o1, o2|
+                  yield o1, o2
+                end
+                next
               end
-              next
             end
               
             #
@@ -217,7 +233,7 @@ module Chingu
             #    end
             #  end
             #end
-            object2_list = klass.all
+            object2_list = (klass.respond_to?(:all) ? klass.all : klass)
             self.all.each do |object1|
               object2_list.each do |object2|
                 next  if object1 == object2  # Don't collide objects with themselves

data/lib/chingu/traits/velocity.rb

@@ -42,40 +42,40 @@ module Chingu
         
         @velocity_x = options[:velocity_x] || 0
         @velocity_y = options[:velocity_y] || 0
-				self.velocity = options[:velocity] if options[:velocity]
+        self.velocity = options[:velocity] if options[:velocity]
 				
         @acceleration_x = options[:acceleration_x] || 0
         @acceleration_y = options[:acceleration_y] || 0
-				self.acceleration = options[:acceleration] if options[:acceleration]
+        self.acceleration = options[:acceleration] if options[:acceleration]
 				
         @max_velocity = options[:max_velocity] || 1000
         super
       end
       
-			#
-			# Sets X and Y velocity with one single call. Takes an Array-argument with 2 values.
-			#
-			def velocity=(velocity)
-				@velocity_x, @velocity_y = velocity
-			end
+      #
+      # Sets X and Y velocity with one single call. Takes an Array-argument with 2 values.
+      #
+      def velocity=(velocity)
+        @velocity_x, @velocity_y = velocity
+      end
 			
-			def velocity; [@velocity_x, @velocity_y]; end
+      def velocity; [@velocity_x, @velocity_y]; end
 
-			#
-			# Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
-			#
-			def acceleration=(acceleration)
-				@acceleration_x, @acceleration_y = acceleration
-			end
+      #
+      # Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
+      #
+      def acceleration=(acceleration)
+        @acceleration_x, @acceleration_y = acceleration
+      end
 	
-			def acceleration; [@acceleration_x, @acceleration_y]; end
+      def acceleration; [@acceleration_x, @acceleration_y]; end
 
       #
       # Modifies X & Y of parent
       #
       def update_trait
-        @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity
-        @velocity_x += @acceleration_x		if	(@velocity_x + @acceleration_x).abs < @max_velocity
+        @velocity_y += @acceleration_y  if  (@velocity_y + @acceleration_y).abs < @max_velocity
+        @velocity_x += @acceleration_x  if  (@velocity_x + @acceleration_x).abs < @max_velocity
         
         @previous_y = @y
         @previous_x = @x
@@ -91,11 +91,29 @@ module Chingu
         super
       end
       
+      #
+      # Setts velocity_x and velocity_y to 0, stopping the game object
+      # Note it doesn't reset the acceleration!
+      #
       def stop
         # @acceleration_y = @acceleration_x = 0
         @velocity_x = 0
         @velocity_y = 0
-      end      
+      end
+      
+      #
+      # Returns true if both velocity_x and velocity_y is 0
+      #
+      def stopped?
+        @velocity_x == 0 && @velocity_y == 0
+      end
+
+      #
+      # Did game object move last tick
+      #
+      def moved?
+        @x != @previous_x || @y != @previous_y
+      end
     end
   end
 end

data/lib/chingu/traits/viewport.rb

@@ -70,6 +70,7 @@ module Chingu
       #
       def draw
         self.game_objects.draw_relative(-@viewport.x, -@viewport.y)
+        #@viewport.apply { super }
       end      
     end
   end

data/lib/chingu/viewport.rb

@@ -82,14 +82,15 @@ module Chingu
     # This is a very flawed implementation, it Should take inte account objects 
     # height,width,factor_x,factor_y,center_x,center_y as well...
     #
-    def inside?(object)
-      object.x >= @x && object.x <= (@x + $window.width) &&
-      object.y >= @y && object.y <= (@y + $window.height)
+    def inside?(object, y = nil)
+      x, y = y ? [object,y] : [object.x, object.y]
+      x >= @x && x <= (@x + $window.width) &&
+      y >= @y && y <= (@y + $window.height)
     end
 
     # Returns true object is outside the view port
-    def outside?(object)
-      not inside_viewport?(object)
+    def outside?(object, y)
+      not inside?(object, y)
     end
       
     #
@@ -145,5 +146,9 @@ module Chingu
       end
     end
     
+    def apply(&block)
+      $window.translate(-@x, -@y, &block)
+    end    
+    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - ippa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +02:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 47
         segments: 
         - 0
         - 7
-        - 18
-        version: 0.7.18
+        - 22
+        version: 0.7.22
   type: :runtime
   version_requirements: *id001
 description: 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.
@@ -68,10 +68,12 @@ files:
 - examples/example16_online_high_scores.rb
 - examples/example17_gosu_tutorial.rb
 - examples/example18_animation_trait.rb
+- examples/example19.yml
 - examples/example19_edit_viewport.rb
-- examples/example19_game_objects.yml
 - examples/example1_basics.rb
 - examples/example20_trait_inheritence_test.rb
+- examples/example21.yml
+- examples/example21_sidescroller_with_edit.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb
@@ -90,11 +92,16 @@ files:
 - examples/media/Star.png
 - examples/media/Starfighter.bmp
 - examples/media/background1.png
+- examples/media/battery.png
+- examples/media/big_star.png
+- examples/media/big_stone_wall.bmp
+- examples/media/black_block.png
 - examples/media/bullet.png
 - examples/media/bullet_hit.wav
 - examples/media/circle.png
 - examples/media/city1.png
 - examples/media/city2.png
+- examples/media/cog_wheel.png
 - examples/media/droid.bmp
 - examples/media/droid_11x15.bmp
 - examples/media/droid_11x15.gal
@@ -111,11 +118,13 @@ files:
 - examples/media/ruby.png
 - examples/media/saucer.gal
 - examples/media/saucer.png
+- examples/media/saw.png
 - examples/media/spaceship.png
 - examples/media/star_25x25_default.png
 - examples/media/star_25x25_explode.gal
 - examples/media/star_25x25_explode.png
 - examples/media/stone_wall.bmp
+- examples/media/tube.png
 - examples/media/video_games.png
 - examples/media/wood.png
 - lib/chingu.rb
@@ -208,6 +217,7 @@ test_files:
 - examples/example19_edit_viewport.rb
 - examples/example1_basics.rb
 - examples/example20_trait_inheritence_test.rb
+- examples/example21_sidescroller_with_edit.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb