chingu 0.7.6.3 → 0.7.6.4

data/chingu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.6.3"
+  s.version = "0.7.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]

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.3"
+  VERSION = "0.7.6.4"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_states/edit.rb

@@ -53,10 +53,11 @@ module Chingu
         @classes = Array(options[:classes] || game_object_classes)
         @except = options[:except] || []
         @classes -= Array(@except)        
-        
         @debug = options[:debug]
         @zorder = 10000
                 
+        p @classes  if @debug
+        
         @hud_color = Gosu::Color.new(180,70,70,70)
         @selected_game_object = nil        
         self.input =  { 
@@ -124,19 +125,22 @@ module Chingu
           
           # We initialize x,y,zorder,rotation_center after creation
           # so they're not overwritten by the class initialize/setup or simular
-          game_object = klass.create(:paused => true)
-          game_object.x = x
-          game_object.y = y
-          game_object.zorder = @zorder
-          game_object.options[:toolbar] = true
-          
-          # Scale down big objects, don't scale objects under [32, 32]
-          if game_object.image
-            game_object.factor_x = 32.0 / game_object.image.width   if game_object.image.width > 32
-            game_object.factor_y = 32.0 / game_object.image.height  if game_object.image.height > 32
-            game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
-          end          
-          x += 40
+          begin
+            game_object = klass.create(:paused => true)
+            game_object.x = x
+            game_object.y = y
+            game_object.zorder = @zorder
+            game_object.options[:toolbar] = true
+            
+            # Scale down object to fit our toolbar
+            if game_object.image
+              game_object.size = [32,32]
+              game_object.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
+            end
+            x += 40
+          rescue
+            puts "Couldn't use #{klass} in editor."
+          end
         end
       end
       
@@ -272,6 +276,13 @@ module Chingu
             @selected_game_object.options[:selected] = true
           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
+          end
+            
           #
           # Re-align all objects x/y offset in relevance to the cursor
           #

data/lib/chingu/text.rb

@@ -80,7 +80,7 @@ module Chingu
       create_image  unless @image
 
       if options[:background]
-        @background = GameObject.create(:image => options[:background])
+        @background = GameObject.new(:image => options[:background])
         @background.attributes = self.attributes
         @background.color = Color::WHITE
         @background.zorder -= 1

data/lib/chingu/traits/velocity.rb

@@ -28,7 +28,7 @@ module Chingu
     # Can be useful for example collision detection
     #
     module Velocity
-      attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
+      attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity_x, :max_velocity_y
       attr_reader :previous_x, :previous_y
       
       module ClassMethods
@@ -47,8 +47,11 @@ module Chingu
         @acceleration_x = options[:acceleration_x] || 0
         @acceleration_y = options[:acceleration_y] || 0
         self.acceleration = options[:acceleration] if options[:acceleration]
-				
-        @max_velocity = options[:max_velocity] || 1000
+
+        @max_velocity_x = options[:max_velocity_x] || 1000
+        @max_velocity_y = options[:max_velocity_y] || 1000
+        self.max_velocity = options[:max_velocity] if options[:max_velocity]
+        
         super
       end
       
@@ -70,22 +73,31 @@ module Chingu
 	
       def acceleration; [@acceleration_x, @acceleration_y]; end
 
+      #
+      # Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
+      #
+      def max_velocity=(max_velocity)
+        @max_velocity_x, @max_velocity_y = max_velocity
+      end
+	
+      def max_velocity; [@max_velocity_x, @max_velocity_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_x += @acceleration_x  if  (@velocity_x + @acceleration_x).abs < @max_velocity_x
+        @velocity_y += @acceleration_y  if  (@velocity_y + @acceleration_y).abs < @max_velocity_y
         
-        @previous_y = @y
         @previous_x = @x
+        @previous_y = @y
         
         #
         # if option :apply is false, just calculate velocities, don't apply them to x/y
         #
         unless trait_options[:velocity][:apply] == false
-          self.y += @velocity_y
           self.x += @velocity_x
+          self.y += @velocity_y
         end
         
         super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 103
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  - 3
-  version: 0.7.6.3
+  - 4
+  version: 0.7.6.4
 platform: ruby
 authors: 
 - ippa