chingu 0.7.6.1 → 0.7.6.2

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.6.1"
+  s.version = "0.7.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-06-17}
+  s.date = %q{2010-06-18}
   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 = [

data/examples/example10_traits_retrofy.rb

@@ -13,7 +13,7 @@ class Game < Chingu::Window
     super(600,400)
     self.caption = "Testing out new module-based traits (SPACE for more spaceships)"
     self.input = { :space => :create_thing, :esc => :exit }
-		Gosu::enable_undocumented_retrofication
+		retrofy
     create_thing(200,200)
   end
 

data/examples/example11_animation.rb

@@ -14,8 +14,8 @@ class Game < Chingu::Window
     super    
     @factor = 6
     self.input = { :escape => :exit }
-		Gosu::enable_undocumented_retrofication
-    self.caption = "Chingu::Animation / retrofy example. Move with arrows!"
+		self.caption = "Chingu::Animation / retrofy example. Move with arrows!"
+    retrofy
     Droid.create(:x => $window.width/2, :y => $window.height/2)
   end
 end

data/examples/example21.yml

@@ -2,7 +2,7 @@
 - CogWheel: 
     :x: 1088.0
     :y: 352.0
-    :angle: 244.888555657521
+    :angle: 261.503276348003
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -10,7 +10,7 @@
 - CogWheel: 
     :x: 448.0
     :y: 416.0
-    :angle: 230.558601188561
+    :angle: 213.943880498079
     :zorder: 88
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -932,13 +932,13 @@
     :y: 64.0
     :angle: 0
     :zorder: 100
-    :factor_x: 1.44144144144144
-    :factor_y: 1.44144144144144
+    :factor_x: 1.15315315315315
+    :factor_y: 1.51496462905859
     :color: 4294967295
 - CogWheel: 
     :x: 1792.0
     :y: 320.0
-    :angle: 199.112003270741
+    :angle: 182.497282580259
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -954,7 +954,7 @@
 - CogWheel: 
     :x: 2464.0
     :y: 288.0
-    :angle: 357.54187620404
+    :angle: 14.156596894522
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -962,7 +962,7 @@
 - CogWheel: 
     :x: 2460.0
     :y: 960.0
-    :angle: 201.112003270741
+    :angle: 184.497282580259
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -1074,7 +1074,7 @@
 - Saw: 
     :x: 2304.0
     :y: 42973.9722397467
-    :angle: 244.651419558422
+    :angle: 148.973186119936
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
@@ -1082,7 +1082,7 @@
 - Saw: 
     :x: 2016.0
     :y: 32173.9806240522
-    :angle: 130.22068444929
+    :angle: 341.066180171485
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
@@ -1090,7 +1090,7 @@
 - Saw: 
     :x: 1696.0
     :y: 14500.9946086338
-    :angle: 324.233721499835
+    :angle: 51.8801650144799
     :zorder: 100
     :factor_x: 0.958395989974934
     :factor_y: 0.961002506265664
@@ -1098,7 +1098,7 @@
 - Saw: 
     :x: 1056.0
     :y: 24036.9954416873
-    :angle: 193.151996227564
+    :angle: 324.855862936146
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1106,7 +1106,7 @@
 - Saw: 
     :x: 1344.0
     :y: 24036.9954416873
-    :angle: 196.151996227565
+    :angle: 327.855862936147
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1362,7 +1362,7 @@
 - Saw: 
     :x: 2176.0
     :y: 42813.9722397467
-    :angle: 247.651419558422
+    :angle: 151.973186119936
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
@@ -1370,7 +1370,7 @@
 - Saw: 
     :x: 1280.0
     :y: 30824.098278027
-    :angle: 92.0967151668047
+    :angle: 268.052196057188
     :zorder: 100
     :factor_x: 0.47739348370927
     :factor_y: 0.48
@@ -1378,7 +1378,7 @@
 - Saw: 
     :x: 1055.0
     :y: 91481.6743590043
-    :angle: 202.536947145858
+    :angle: 19.6523317612529
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1386,7 +1386,7 @@
 - Saw: 
     :x: 960.0
     :y: 91545.6743590044
-    :angle: 205.536947145856
+    :angle: 22.6523317612509
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1394,7 +1394,7 @@
 - Saw: 
     :x: 1120.0
     :y: 91545.6743590044
-    :angle: 205.536947145856
+    :angle: 22.6523317612509
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1402,7 +1402,7 @@
 - Saw: 
     :x: 864.0
     :y: 91481.6743590043
-    :angle: 208.536947145856
+    :angle: 25.6523317612509
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1410,7 +1410,7 @@
 - Saw: 
     :x: 1247.0
     :y: 27755.9489495749
-    :angle: 107.917046020636
+    :angle: 283.946457785343
     :zorder: 100
     :factor_x: 0.477192982456137
     :factor_y: 0.479799498746867
@@ -1418,7 +1418,7 @@
 - Saw: 
     :x: 1088.0
     :y: 54674.3885593251
-    :angle: 248.721133764806
+    :angle: 243.763506646168
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1426,7 +1426,7 @@
 - Saw: 
     :x: 960.0
     :y: 54674.3885593251
-    :angle: 251.721133764807
+    :angle: 246.763506646169
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1545,88 +1545,88 @@
     :color: 4294967295
 - Saw: 
     :x: 2272.0
-    :y: 1486.65953699044
-    :angle: 295.794413689238
+    :y: 1545.89456467036
+    :angle: 146.639909411433
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :color: 4294967295
 - Saw: 
     :x: 1792.0
-    :y: 1457.122269646
-    :angle: 247.355008787115
+    :y: 1492.18378106955
+    :angle: 352.539543057765
     :zorder: 100
     :factor_x: 0.79859649122807
     :factor_y: 0.801203007518797
     :color: 4294967295
 - Saw: 
     :x: 2112.0
-    :y: 1515.61720067452
-    :angle: 57.317747058639
+    :y: 1472.55311973017
+    :angle: 50.5639527921968
     :zorder: 100
     :factor_x: 0.237794486215539
     :factor_y: 0.240401002506266
     :color: 4294967295
 - Saw: 
     :x: 1504.0
-    :y: 1509.95012679627
-    :angle: 10.0118343201395
+    :y: 1475.21132713439
+    :angle: 4.15384615445959
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 1344.0
-    :y: 1513.27726120035
-    :angle: 13.0118343201416
+    :y: 1470.10650887575
+    :angle: 7.15384615446169
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 1152.0
-    :y: 1544.73245984785
-    :angle: 16.0118343201395
+    :y: 1442.5380388842
+    :angle: 10.1538461544596
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 992.0
-    :y: 1447.47254150702
-    :angle: 215.427837857925
+    :y: 1484.67432950191
+    :angle: 30.4853091222945
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 800.0
-    :y: 1447.47254150702
-    :angle: 218.427837857925
+    :y: 1484.67432950191
+    :angle: 33.4853091222945
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 1248.0
-    :y: 1476.34100946372
-    :angle: 280.677823822402
+    :y: 1538.26656151419
+    :angle: 184.999590383916
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :color: 4294967295
 - Saw: 
     :x: 928.0
-    :y: 1415.77522349937
-    :angle: 221.427837857925
+    :y: 1516.67432950192
+    :angle: 36.4853091222945
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 672.0
-    :y: 1467.90102171139
-    :angle: 218.427837857925
+    :y: 1454.14495530015
+    :angle: 33.4853091222945
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734

data/examples/example21_sidescroller_with_edit.rb

@@ -162,13 +162,13 @@ class Droid < Chingu::GameObject
   def update    
     @image = @animation.next
     self.each_collision(Block.inside_viewport) do |me, stone_wall|
-      if self.velocity_y < 0
+      if self.velocity_y < 0  # Hitting the ceiling
         me.y = stone_wall.bb.bottom + me.image.height * self.factor_y
         self.velocity_y = 0
-      else
+      else  # Land on ground
+        @jumping = false        
         me.y = stone_wall.bb.top-1
       end
-      @jumping = false
     end
     
     @animation = @animations[:scan] unless moved?

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

data/lib/chingu/game_object.rb

@@ -32,7 +32,7 @@ module Chingu
   #
   class GameObject < Chingu::BasicGameObject
     attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
-    attr_reader :factor, :center
+    attr_reader :factor, :center, :height, :width
     
     include Chingu::Helpers::InputClient        # Adds input and input=
     include Chingu::Helpers::RotationCenter     # Adds easy and verbose modification of @center_x and @center_y
@@ -60,8 +60,8 @@ module Chingu
       @angle = options[:angle] || 0
       
       self.factor = options[:factor] || options[:scale] || $window.factor || 1.0
-      @factor_x = options[:factor_x] if options[:factor_x]
-      @factor_y = options[:factor_y] if options[:factor_y]
+      @factor_x = options[:factor_x].to_f if options[:factor_x]
+      @factor_y = options[:factor_y].to_f if options[:factor_y]
       
       self.center = options[:center] || 0.5
       
@@ -82,6 +82,11 @@ module Chingu
       @mode = options[:mode] || :default # :additive is also available.
       @zorder = options[:zorder] || 100
       
+      if @image
+        self.width = options[:width]   if options[:width]
+        self.height = options[:height] if options[:height]
+      end
+
       ### super ## This crashes
       # Call setup, this class holds an empty setup() to be overriden
       # setup() will be an easier method to override for init-stuff since you don't need to do super etc..
@@ -89,6 +94,45 @@ module Chingu
       
     end
     
+    #
+    # Set an effective width for the object on screen.
+    # Chingu does this by setting factor_x depending on imge.width and width given.
+    # Usually better to have a large image and make it smaller then the other way around.
+    #
+    def width=(width)
+      @factor_x = width.to_f / @image.width.to_f
+    end
+    
+    # Get effective on width by calculating it from image-width and factor
+    def width
+      (@image.width * @factor_x).abs
+    end
+
+    #
+    # Set an effective height for the object on screen.
+    # Chingu does this by setting factor_x depending on imge.width and width given.
+    # Usually better to have a large image and make it smaller then the other way around.
+    #
+    def height=(height)
+      @factor_y = height.to_f / @image.height.to_f
+    end
+    
+    # Get effective on heightby calculating it from image-width and factor
+    def height
+      (@image.height.to_f * @factor_y).abs
+    end
+
+    # Set width and height in one swoop
+    def size=(size)
+      self.width, self.height = *size
+    end
+    
+    # Get objects width and height in an array
+    def size
+      [self.width, self.height]
+    end
+      
+
     # Quick way of setting both factor_x and factor_y
     def factor=(factor)
       @factor = factor

data/lib/chingu/game_states/edit.rb

@@ -133,8 +133,8 @@ module Chingu
           # 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 > 3
-            game_object.cache_bounding_box  if game_object.respond_to?(:bounding_box)
+            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
         end
@@ -166,6 +166,7 @@ module Chingu
         
         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}]"
         end
         
@@ -275,8 +276,8 @@ module Chingu
           # Re-align all objects x/y offset in relevance to the cursor
           #
           selected_game_objects.each do |selected_game_object|
-            selected_game_object.options[:mouse_x_offset] = selected_game_object.x - self.mouse_x + 20
-            selected_game_object.options[:mouse_y_offset] = selected_game_object.y - self.mouse_y + 20
+            selected_game_object.options[:mouse_x_offset] = selected_game_object.x - self.mouse_x
+            selected_game_object.options[:mouse_y_offset] = selected_game_object.y - self.mouse_y
           end
         else
           deselect_selected_game_objects unless holding?(:left_ctrl)
@@ -459,7 +460,10 @@ module Chingu
           scale_down
         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
@@ -468,10 +472,13 @@ module Chingu
       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
         selected_game_objects.each { |game_object| game_object.zorder += 1 }
       end
@@ -485,33 +492,18 @@ module Chingu
         selected_game_objects.each { |game_object| game_object.alpha -= 1 }
       end
       def scale_up_x
-        selected_game_objects.each { |game_object| game_object.factor_x += grid_factor_x_for(game_object) }
+        selected_game_objects.each { |game_object| game_object.width += grid[0] }
       end
       def scale_up_y
-        selected_game_objects.each { |game_object| game_object.factor_y +=  grid_factor_x_for(game_object) }
+        selected_game_objects.each { |game_object| game_object.height += grid[1] }
       end
       def scale_down_x
-        selected_game_objects.each { |game_object| 
-          inc = grid_factor_x_for(game_object)
-          game_object.factor_x -= inc
-          game_object.factor_x = inc if game_object.factor_x <= 0.01
-        }
+        selected_game_objects.each { |game_object| game_object.width -= grid[0] if game_object.width > grid[0] }
       end
       def scale_down_y
-        selected_game_objects.each { |game_object| 
-          inc = grid_factor_y_for(game_object) 
-          game_object.factor_y -= inc
-          game_object.factor_y = inc if game_object.factor_y <= 0.01
-        }
+        selected_game_objects.each { |game_object| game_object.height -= grid[1] if game_object.height > grid[1] }
       end
-      
-      def grid_factor_x_for(object)
-        @grid[0].to_f / object.image.width.to_f
-      end
-      def grid_factor_y_for(object)
-        @grid[0].to_f / object.image.height.to_f
-      end
-      
+            
       def esc
         deselect_selected_game_objects
         @cursor_game_object = nil
@@ -572,6 +564,8 @@ module Chingu
         
         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.cache_bounding_box if game_object.respond_to?(:cache_bounding_box)
         return game_object
      end
 

data/lib/chingu/gosu_ext/image.rb

@@ -19,7 +19,6 @@
 #
 #++
 
-
 #
 # Core extensions to GOSU
 # Some of these require the gem 'texplay'
@@ -44,10 +43,19 @@ module Gosu
     # This could be used to make each pixel a sharp 4 pixelblock => retrofeeling.
     #
     def retrofy
-      glBindTexture(GL_TEXTURE_2D, self.gl_tex_info.tex_name)
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+      Gosu::enable_undocumented_retrofication
       self
+      
+      #
+      # The below code depends on the bad opengl gem
+      # And it could affect other images anyhow... 
+      # So let's use Gosu::enable_undocumented_retrofication until further notice.
+      #
+      
+      #glBindTexture(GL_TEXTURE_2D, self.gl_tex_info.tex_name)
+      #glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
+      #glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+      #self
     end
   end
 end

data/lib/chingu/traits/bounding_box.rb

@@ -56,8 +56,7 @@ module Chingu
           return @cached_bounding_box
         end
         
-        width = self.image.width * self.factor_x.abs
-        height = self.image.height * self.factor_y.abs
+        width, height = self.size
         
         if trait_options[:bounding_box][:scale]
           width = width * trait_options[:bounding_box][:scale]

data/lib/chingu/window.rb

@@ -65,6 +65,13 @@ module Chingu
     # Placeholder to be overwritten
     def setup; end;
     
+    #
+    # Make all old and future images use hard borders. Hard borders + scaling = retro feel!
+    #
+    def retrofy
+      Gosu::enable_undocumented_retrofication
+    end
+    
     #
     # Returns self inside GameState.initialize (a game state is not 'active' inside initialize())
     # Or returns current active game state (as in a switched to or pushed game state)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 107
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  - 1
-  version: 0.7.6.1
+  - 2
+  version: 0.7.6.2
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +02:00
+date: 2010-06-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency