chingu 0.8.1 → 0.9rc1

data/lib/chingu/async/task_list.rb

@@ -0,0 +1,67 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module Async
+    
+    class TaskList
+      # extend Forwardable
+      # def_delegator :@queue, :push,  :enq
+      # def_delegator :@queue, :shift, :deq
+      # def_delegator :@queue, :first, :front
+      # def_delegator :@queue, :clear
+      
+      def initialize
+        @queue = []
+      end
+      
+      #
+      # Processes the first task on the queue, each tick removing the
+      # task once it has finished.
+      #
+      def update(object)
+        if task = front
+          task.update object
+          deq if task.finished?
+          task
+        end
+      end
+      
+      def front
+        @queue.first
+      end
+      
+      def enq(*tasks)
+        @queue.push(*tasks)
+      end
+      
+      def deq
+        @queue.shift
+      end
+      
+      def clear
+        @queue.clear
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/call.rb

@@ -0,0 +1,48 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module AsyncTasks
+    
+    #
+    # Single method call as an asynchronous task.
+    #
+    class Call < Chingu::Async::BasicTask
+      
+      def initialize(method, *args)
+        super()
+        @method, @args = method, args
+        @finished = false
+      end
+      
+      def update(object)
+        object.send(@method, *@args)
+        @finished = true
+      end
+      
+      def finished?
+        !!@finished
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/exec.rb

@@ -0,0 +1,48 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module AsyncTasks
+    
+    #
+    # Block execution as an asynchronous task.
+    #
+    class Exec < Chingu::Async::BasicTask
+      
+      def initialize(&block)
+        super()
+        @block = block
+        @finished = false
+      end
+      
+      def update(object)
+        @block[]
+        @finished = true
+      end
+      
+      def finished?
+        !!@finished
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/move.rb

@@ -0,0 +1,45 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+require "#{CHINGU_ROOT}/chingu/async_tasks/tween"
+
+module Chingu
+  module AsyncTasks
+    
+    # 
+    # Syntactic sugar for tween(duration, :x => x, :y => y, :angle => angle)
+    # 
+    class Move < Tween
+      
+      def initialize(duration, x, y, angle = nil)
+        properties = { }
+        
+        properties[:x]     = x unless x.nil?
+        properties[:y]     = y unless y.nil?
+        properties[:angle] = angle unless angle.nil?
+        
+        super(duration, properties)
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/parallel.rb

@@ -0,0 +1,63 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module AsyncTasks
+    
+    #
+    # Executes all subtasks in parallel.
+    #
+    class Parallel < Chingu::Async::BasicTask
+      
+      def initialize(&block)
+        @subtasks = []
+        
+        # Make @subtasks behave like a TaskList for the TaskBuilder.
+        # This is probably a dirty hack!
+        class <<@subtasks
+          alias :enq   :push
+          alias :deq   :shift
+          alias :front :first
+        end
+        
+        add_tasks(&block)
+      end
+      
+      def add_tasks(&block)
+        builder = Chingu::Async::TaskBuilder.new(@subtasks)
+        block[builder]
+      end
+      
+      #
+      # Returns true if all subtasks have finished executing.
+      #
+      def finished?
+        @subtasks.empty? or @subtasks.all?(&:finished?)
+      end
+      
+      def update(object)
+        @subtasks.each { |task| task.update(object) }
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/tween.rb

@@ -0,0 +1,73 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module AsyncTasks
+    
+    #
+    # Basic tweening for numerical properties.
+    #
+    # 	game_object.async.tween 1000, :property => new_value
+    #
+    class Tween < Chingu::Async::BasicTask
+      
+      # TODO Tweening is pretty dumb...make it smarter.
+      
+      def initialize(duration, properties)
+        super()
+        @have_initial_values = false
+        @age, @life = 0, duration
+        @properties = properties
+      end
+      
+      def update(object)
+        set_initial_values(object) unless have_initial_values?
+        
+        @age += $window.milliseconds_since_last_tick
+        t = @age.to_f / @life
+        t = 1.0 if t > 1
+        @properties.each do |name, range|
+          object.send "#{name}=", range.interpolate(t)
+        end
+      end
+      
+      def finished?
+        @age >= @life
+      end
+      
+      private
+      
+      def set_initial_values(object)
+        # TODO find a better and more general way to set up tweening.
+        @properties.each do |name, value|
+          @properties[name] = object.send(name) .. value
+        end
+        @have_initial_values = true
+      end
+      
+      def have_initial_values?
+        !!@have_initial_values
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/async_tasks/wait.rb

@@ -0,0 +1,54 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module AsyncTasks
+    
+    #
+    # Halts processing of tasks until the passed-in block returns a
+    # true value, or the timeout expires. If no block is given, behaves as if
+    # the block returned nil.
+    #
+    class Wait < Chingu::Async::BasicTask
+      
+      attr_accessor :timeout, :condition
+      attr_reader :result
+      
+      def initialize(timeout = nil, &condition)
+        super()
+        @result     = nil
+        @age, @life = 0, timeout
+        @condition  = condition
+      end
+      
+      def update(object)
+        @age += $window.milliseconds_since_last_tick
+        @result = (@condition and @condition[])
+      end
+      
+      def finished?
+        !!@result or (@life != nil and @age >= @life)
+      end
+      
+    end
+    
+  end
+end

data/lib/chingu/classic_game_object.rb

@@ -180,7 +180,7 @@ module Chingu
     def alpha=(value)
       value = 0   if value < 0
       value = 255 if value > 255
-      @color.alpha = value
+      @color.alpha = value.to_i
     end
 
     #

data/lib/chingu/core_ext/range.rb

@@ -0,0 +1,13 @@
+class Range
+  
+  #
+  # Linearly interpolates a value between begin and end.
+  #
+  def interpolate(t)
+    # TODO possibly allow geometric or arbitrary interpolation
+    a,  b  = self.begin, self.end
+    ta, tb = (1.0 - t), t
+    a * ta  + b * tb
+  end
+  
+end

data/lib/chingu/game_states/enter_name.rb

@@ -30,8 +30,9 @@ module Chingu
   
       def initialize(options = {})
         super
-    
-        Text.create("<u>Please enter your name</u>", :rotation_center => :top_center, :x => $window.width/2, :y => 10, :size => 40)
+        
+        #@title = options[:title] || "<u>Please enter your name</u>"
+        #Text.create(@title, :rotation_center => :top_center, :x => $window.width/2, :y => 10, :size => 40)
 
         on_input([:holding_up, :holding_w, :holding_gamepad_up], :up)
         on_input([:holding_down, :holding_s, :holding_gamepad_down], :down)
@@ -41,16 +42,16 @@ module Chingu
         on_input(:esc, :pop_game_state)
         
         @callback = options[:callback]
-        @columns = options[:columns] || 10
+        @columns = options[:columns] || 14
         
         @string = []
         @texts = []
-        @index = 1
+        @index = 0
         @letter_size = 30
-        @letters = %w[ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ! " # % & ( ) [ ] / \\ - = * SPACE DEL ENTER ]
+        @letters = %w[ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ! " # % & $ ( ) [ ] / \\ - + = * . 1 2 3 4 5 6 7 8 9 0 SPACE DEL ENTER ]
 
         @y = 140
-        @x = ($window.width - 350)/2
+        @x = ($window.width - 600)/2
         
         @letters.each_with_index do |letter, index|
           @texts << Text.create(letter, :x => @x, :y => @y, :size => @letter_size)
@@ -62,7 +63,7 @@ module Chingu
           end
         end
       
-        @selected_color = Color::RED
+        @texts[@index].color = Color::RED
         @name = Text.create("", :rotaion_center => :top_center, :x => $window.width/2, :y => 60, :size => 80)
       end
     
@@ -80,14 +81,23 @@ module Chingu
 
       # Move cursor any given value (positive or negative). Used by left() and right()
       def move_cursor(amount = 1)
-        @index += amount
-        @index = 0                if @index >= @letters.size
-        @index = @letters.size-1  if @index < 0
+        #
+        # Curser will wrap
+        #
+        #@index += amount
+        #@index = 0                if @index >= @letters.size
+        #@index = @letters.size-1  if @index < 0
+        
+        #
+        # Cursor won't wrap
+        #
+        new_value = @index + amount
+        @index = new_value  if new_value < @letters.size && new_value >= 0
         
         @texts.each { |text| text.color = Color::WHITE }
         @texts[@index].color = Color::RED
         
-        sleep(0.1)
+        sleep(0.15)
       end
   
       def action