gosu_extensions 0.1.21 → 0.1.22

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/lib/core/game_window.rb

@@ -45,8 +45,6 @@ class GameWindow < Gosu::Window
     
     setup_background
     
-    setup_menu
-    
     setup_steps
     setup_waves
     setup_scheduling
@@ -62,11 +60,12 @@ class GameWindow < Gosu::Window
     install_main_loop
   end
   
+  # This is the main game loop.
+  #
   def main_loop
     @main_loop ||= lambda do
+      # Smoother, but slower: GC.start if rand > 0.98
       next_step
-      # Step the physics environment SUBSTEPS times each update.
-      #
       SUBSTEPS.times do
         remove_shapes
         move
@@ -76,28 +75,10 @@ class GameWindow < Gosu::Window
       end
     end
   end
-  
   def install_main_loop
     @current_loop = main_loop
   end
   
-  def show_menu
-    suspend
-  end
-  
-  def suspend
-    return if @suspended
-    @current_loop = @menu.loop
-    @suspended = Time.now
-    p "suspended"
-  end
-  def continue
-    return unless @suspended
-    @current_loop = main_loop
-    @suspended = false
-    p "continued"
-  end
-  
   def media_path
     @media_path || 'media'
   end
@@ -177,10 +158,6 @@ class GameWindow < Gosu::Window
     end
   end
   
-  def setup_menu
-    @menu = Menu.new self
-  end
-  
   def setup_window
     self.caption = self.class.caption || ""
   end

data/lib/gosu_extensions.rb

@@ -57,8 +57,6 @@ require 'short_lived'
 $:.unshift File.join(File.dirname(__FILE__), '/units')
 require 'thing'
 
-require 'menu'
-
 DEFAULT_SCREEN_WIDTH  = 1200 unless defined?(DEFAULT_SCREEN_WIDTH)
 DEFAULT_SCREEN_HEIGHT =  700 unless defined?(DEFAULT_SCREEN_HEIGHT)
 SUBSTEPS              =   10 unless defined?(SUBSTEPS)

data/lib/traits/controllable.rb

@@ -1,4 +1,8 @@
+# This is a convenience trait.
 #
+# Instead of calling
+#   @controls << Control.new(self, @player1, :some_key_code => :action)
+# you can define the controls in the object itself.
 #
 module Controllable extend Trait
   
@@ -8,34 +12,22 @@ module Controllable extend Trait
   
   module ClassMethods
     
-    # TODO alternate controls handling!
+    # Enables to define the controls in the object itself, as in the Example:
+    # 
+    # class Spaceship < Thing
+    #   it_is Controllable
+    #   controls Gosu::Button::KbA     => Turnable::Left,
+    #            Gosu::Button::KbD     => Turnable::Right,
+    #            Gosu::Button::KbW     => Moveable::Accelerate,
+    #            Gosu::Button::KbS     => Moveable::Backwards,
+    #            Gosu::Button::KbSpace => Shooter::Shoot
     #
-    
     def controls mapping
       attr_accessor :controls_mapping
-      hook = lambda do
-        if self.controls_mapping
-          # primary controls taken, use alternate controls
-          self.controls_mapping = self.alternate_controls_mapping if self.respond_to? :alternate_controls_mapping
-        else
-          self.controls_mapping = mapping
-        end
+      InitializerHooks.register self do
+        self.controls_mapping = mapping
         self.window.add_controls_for self
       end
-      InitializerHooks.register self, &hook
-    end
-    
-    def alternate_controls mapping
-      attr_accessor :alternate_controls_mapping
-      hook = lambda do
-        if self.controls_mapping
-          # primary controls taken, use alternate controls
-          self.controls_mapping = self.alternate_controls_mapping if self.respond_to? :alternate_controls_mapping
-        else
-          self.controls_mapping = mapping
-        end
-      end
-      InitializerHooks.register self, &hook
     end
     
   end

data/spec/lib/traits/controllable_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Controllable do
+  
+  before(:each) do
+    @window = stub :window
+  end
+  
+  describe "add_controls_for" do
+    before(:each) do
+      @controllable_class = test_class_with Controllable do
+        controls :a => :b, :c => :d
+      end
+    end
+    it "should return the mapping" do
+      @window.should_receive(:add_controls_for).once
+      
+      @controllable_class.new @window
+    end
+  end
+  
+  describe "controls_mapping" do
+    before(:each) do
+      @window.stub! :add_controls_for => nil
+      @controllable = test_class_with Controllable do
+        controls :a => :b, :c => :d
+      end.new @window
+    end
+    it "should return the mapping" do
+      @controllable.controls_mapping.should == { :a => :b, :c => :d }
+    end
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 21
-  version: 0.1.21
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,7 +15,7 @@ bindir: bin
 cert_chain: []
 
 date: 2010-04-07 00:00:00 +02:00
-default_executable: gogogosu
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gosu
@@ -43,8 +43,8 @@ dependencies:
   version_requirements: *id002
 description: ""
 email: florian.hanke@gmail.com
-executables: 
-- gogogosu
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -70,7 +70,6 @@ files:
 - lib/extensions/module.rb
 - lib/extensions/numeric.rb
 - lib/gosu_extensions.rb
-- lib/menu.rb
 - lib/traits/attachable.rb
 - lib/traits/controllable.rb
 - lib/traits/damaging.rb
@@ -128,6 +127,7 @@ test_files:
 - spec/lib/extensions/module_spec.rb
 - spec/lib/extensions/numeric_spec.rb
 - spec/lib/traits/attachable_spec.rb
+- spec/lib/traits/controllable_spec.rb
 - spec/lib/traits/damaging_spec.rb
 - spec/lib/traits/imageable_spec.rb
 - spec/lib/traits/shooter_spec.rb

data/bin/gogogosu

@@ -1,33 +0,0 @@
-#!/usr/local/bin/ruby
-# TODO remove
-
-Signal.trap("INT") { puts; exit } # CTRL-C
-
-File.open(File.join(File.dirname(__FILE__), '../VERSION')) do |f|
-  puts "Gosu Extensions #{f.read}"
-end
-
-application = ARGV.first
-
-puts "Usage: gogogosu <application_name>" and exit(1) unless application
-
-require File.dirname(__FILE__) + '/../generator/gogogosu'
-
-generator = Generator::Gogogosu.new
-
-generator.dir application do
-  generator.dir 'lib' do
-    
-  end
-  generator.dir 'media' do
-    
-  end
-end
-
-puts <<-START
-Great!
-
-Now proceed as follows:
-1. cd #{application}
-2. 
-START

data/lib/menu.rb

@@ -1,30 +0,0 @@
-class Menu < Thing
-  
-  include Controllable
-  
-  # TODO Move away
-  #
-  controls Gosu::Button::KbP => :continue
-  
-  def initialize window
-    @controls = []
-    super window
-  end
-  
-  # TODO duplicate
-  #
-  def handle_input
-    @controls.each &:handle
-  end
-  
-  def continue
-    window.continue
-  end
-  
-  def loop
-    @loop ||= lambda do
-      # self.handle_input
-    end
-  end
-  
-end