chingu 0.7.6.6 → 0.7.6.7

data/lib/chingu/traits/velocity.rb

@@ -59,8 +59,11 @@ module Chingu
       # Sets X and Y velocity with one single call. Takes an Array-argument with 2 values.
       #
       def velocity=(value)
-        @velocity_x, @velocity_y = value && return    if value.is_a? Array
-        @velocity_x, @velocity_y = value, value
+        if value.is_a? Array
+          @velocity_x, @velocity_y = value
+        else
+          @velocity_x, @velocity_y = value, value
+        end
       end
 			
       def velocity; [@velocity_x, @velocity_y]; end
@@ -69,8 +72,11 @@ module Chingu
       # Sets X and Y acceleration with one single call. Takes an Array-argument with 2 values.
       #
       def acceleration=(value)
-        @acceleration_x, @acceleration_y = value && return    if value.is_a? Array
-        @acceleration_x, @acceleration_y = value, value
+        if value.is_a? Array
+          @acceleration_x, @acceleration_y = value
+        else
+          @acceleration_x, @acceleration_y = value, value
+        end
       end
 	
       def acceleration; [@acceleration_x, @acceleration_y]; end
@@ -92,20 +98,25 @@ module Chingu
         @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_x = @x
-        @previous_y = @y
+        @previous_x = self.x
+        @previous_y = self.y
         
         #
         # if option :apply is false, just calculate velocities, don't apply them to x/y
         #
-        unless trait_options[:velocity][:apply] == false
-          self.x += @velocity_x
-          self.y += @velocity_y
-        end
+        move(@velocity_x, @velocity_y)  unless trait_options[:velocity][:apply] == false
         
         super
       end
       
+      #
+      # Move game object
+      #
+      def move(x, y)
+        self.x += x
+        self.y += y
+      end
+      
       #
       # Setts velocity_x and velocity_y to 0, stopping the game object
       # Note it doesn't reset the acceleration!
@@ -127,7 +138,7 @@ module Chingu
       # Did game object move last tick
       #
       def moved?
-        @x != @previous_x || @y != @previous_y
+        self.x != @previous_x || self.y != @previous_y
       end
     end
   end

data/lib/chingu/traits/viewport.rb

@@ -69,8 +69,8 @@ module Chingu
       # It only draws game objects inside the viewport. (GOSU does no such optimizations)
       #
       def draw
-        self.game_objects.draw_relative(-@viewport.x, -@viewport.y)
-        #@viewport.apply { super }
+        #self.game_objects.draw_relative(-@viewport.x, -@viewport.y)
+        @viewport.apply { super }
       end      
     end
   end

data/lib/chingu/viewport.rb

@@ -21,7 +21,11 @@
 
 module Chingu
   #
-  # A basic viewport class
+  # A basic viewport class. Coordinates X and Y are relative to game
+  # area that can be specified by any arguments acceptable by
+  # Chingu::Rect#new method. By default, the game_area is the same
+  # as window and thus the vieport has no effect.
+  #
   #
   # TODO:
   # Implement use of viewports angle, center_x, center_y, factor_x, factor_y
@@ -32,11 +36,11 @@ module Chingu
     def initialize(options = {})
       @x = options[:x] || 0
       @y = options[:y] || 0 
-      @x_target = options[:x_target]
-      @y_target = options[:y_target]
+      @x_target = options[:x_target] || @x
+      @y_target = options[:y_target] || @y
       @x_lag = options[:x_lag] || 0
       @y_lag = options[:y_lag] || 0
-      @game_area = Chingu::Rect.new(options[:game_area]||[@x, @y, $window.width, $window.height])       
+      @game_area = Chingu::Rect.new(options[:game_area] || [@x, @y, $window.width, $window.height])       
     end
     
     #
@@ -68,11 +72,7 @@ module Chingu
     # The game objects image will be the rectangle the viewport can move within.
     #
     def game_area_object=(game_object)
-      image = (game_object.is_a? Gosu::Image) ? game_object : game_object.image
-      @game_area = Rect.new(0,0,
-                            (image.width*$window.factor) - $window.width, 
-                            (image.height*$window.factor) - $window.height
-                            )
+      @game_area = Rect.new(0, 0, game_object.width, game_object.height)
     end
     
     #
@@ -83,7 +83,7 @@ module Chingu
     # height,width,factor_x,factor_y,center_x,center_y as well...
     #
     def inside?(object, y = nil)
-      x, y = y ? [object,y] : [object.x, object.y]
+      x, y = y ? [object,y] : [object.x, object.y]      
       x >= @x && x <= (@x + $window.width) &&
       y >= @y && y <= (@y + $window.height)
     end
@@ -99,8 +99,8 @@ module Chingu
     # The viewport can't show anything outside the game area
     #
     def inside_game_area?(object)        
-      object.x >= @game_area.x && object.x <= (@game_area.width + $window.width) &&
-      object.y >= @game_area.x && object.y <= (@game_area.height + $window.height)
+      object.x >= @game_area.x && object.x <= @game_area.width &&
+      object.y >= @game_area.x && object.y <= @game_area.height
     end
       
     # Returns true object is outside the game area
@@ -130,25 +130,36 @@ module Chingu
     def x=(x)
       @x = x
       if @game_area
-        @x = @game_area.x       if @x < @game_area.x
-        @x = @game_area.width   if @x > @game_area.width
+        @x = @game_area.x                     if @x < @game_area.x
+        @x = @game_area.width-$window.width   if @x > @game_area.width-$window.width
       end 
     end
 
-		#
-		# Viewports Y setter with boundschecking
-		#
+    #
+    # Viewports Y setter with boundschecking
+    #
     def y=(y)
       @y = y
       if @game_area
-        @y = @game_area.y       if @y < @game_area.y
-        @y = @game_area.height  if @y > @game_area.height
+        @y = @game_area.y                       if @y < @game_area.y
+        @y = @game_area.height-$window.height   if @y > @game_area.height-$window.height
       end
     end
     
     def apply(&block)
       $window.translate(-@x, -@y, &block)
-    end    
+    end
+
+    def to_s
+      a = @game_area
+      %/
+Vieport
+ Position: #{@x}, #{y}
+ Game area: #{a.x},#{a.y},#{a.width},#{a.height}"        
+ Target: #{@target_x}, #{@target_y}
+      /
+    end
+    
     
   end
-end
+end

data/lib/chingu/window.rb

@@ -46,11 +46,12 @@ module Chingu
       $window = super(width, height, fullscreen, update_interval)
 			
       @root = File.dirname(File.expand_path($0))
-      Chingu::Asset.autoload_dirs = [".", File.join(@root, "assets"), File.join(@root, "media")]
-      Gosu::Image.autoload_dirs = [".", File.join(@root, "images"), File.join(@root, "gfx"), File.join(@root, "media")]
-      Gosu::Sample.autoload_dirs = [".", File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
-      Gosu::Song.autoload_dirs = [".", File.join(@root, "songs"), File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
-			
+      
+      Chingu::Asset.autoload_dirs += [".", File.join(@root, "assets"), File.join(@root, "media")]
+      Gosu::Image.autoload_dirs   += [".", File.join(@root, "images"), File.join(@root, "gfx"), File.join(@root, "media")]
+      Gosu::Sample.autoload_dirs  += [".", File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
+      Gosu::Song.autoload_dirs    += [".", File.join(@root, "songs"), File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
+      			
       @game_objects = GameObjectList.new
       @input_clients = Array.new
       

data/spec/chingu/helpers/options_setter_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+class Car  
+  include Chingu::Helpers::OptionsSetter
+
+  attr_accessor :angle, :speed
+  attr_reader :color
+  
+  def initialize(params)
+    set_options(params, { :angle => 11, :speed => 22 })
+  end
+end
+
+
+module Chingu
+  module Helpers   
+    describe OptionsSetter do
+      
+      describe "using without defaults" do
+        before do
+          @car = Car.new(:angle => 44)
+        end
+
+        it "should set angle from options" do
+          @car.angle.should == 44
+        end
+
+        it "should set speed from defaults" do
+          @car.speed.should == 22  
+        end
+
+        it "should handle attribute without writer" do
+          Car.new(:color => :green).color.should == :green
+        end
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+
 # encoding: utf-8
 require 'rubygems'
 require 'rspec'
+require 'require_all'
 
 require 'chingu'
+require 'chingu/helpers/options_setter'
 
 def media_path(file)
   File.join($window.root, "..", "..", "examples", "media", file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 97
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  - 6
-  version: 0.7.6.6
+  - 7
+  version: 0.7.6.7
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1054406665
+        hash: -389188292
         segments: 
         - 2
         - 0
@@ -123,6 +123,7 @@ files:
 - examples/example21.yml
 - examples/example21_sidescroller_with_edit.rb
 - examples/example22_text.rb
+- examples/example23_chipmunk.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb
@@ -185,6 +186,7 @@ files:
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
 - lib/chingu/game_object_list.rb
+- lib/chingu/game_object_map.rb
 - lib/chingu/game_state.rb
 - lib/chingu/game_state_manager.rb
 - lib/chingu/game_states/debug.rb
@@ -198,6 +200,7 @@ files:
 - lib/chingu/helpers/gfx.rb
 - lib/chingu/helpers/input_client.rb
 - lib/chingu/helpers/input_dispatcher.rb
+- lib/chingu/helpers/options_setter.rb
 - lib/chingu/helpers/rotation_center.rb
 - lib/chingu/high_score_list.rb
 - lib/chingu/inflector.rb
@@ -215,6 +218,7 @@ files:
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
 - lib/chingu/traits/retrofy.rb
+- lib/chingu/traits/sprite.rb
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb
 - lib/chingu/traits/viewport.rb
@@ -222,6 +226,7 @@ files:
 - lib/chingu/window.rb
 - spec/chingu/fpscounter_spec.rb
 - spec/chingu/game_object_spec.rb
+- spec/chingu/helpers/options_setter_spec.rb
 - spec/chingu/inflector_spec.rb
 - spec/chingu/rect_20x20.png
 - spec/chingu/text_spec.rb
@@ -264,6 +269,7 @@ summary: OpenGL accelerated 2D game framework for Ruby
 test_files: 
 - spec/chingu/fpscounter_spec.rb
 - spec/chingu/game_object_spec.rb
+- spec/chingu/helpers/options_setter_spec.rb
 - spec/chingu/inflector_spec.rb
 - spec/chingu/text_spec.rb
 - spec/spec_helper.rb
@@ -281,6 +287,7 @@ test_files:
 - examples/example20_trait_inheritence_test.rb
 - examples/example21_sidescroller_with_edit.rb
 - examples/example22_text.rb
+- examples/example23_chipmunk.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb