.gitignore behaviour.rb behaviours/physical.rb conditional_trigger.rb config.rb drawer.rb drawing_manager.rb events/draw_event.rb events/game_start_event.rb events/object_added_event.rb events/resize_event.rb events/second_passed_event.rb events/tick_event.rb game_object.rb gosu_game.rb gosu_graphics_driver.rb main.rb objects/box.rb physics_manager.rb rubygame_game.rb @@ -13,10 +13,10 @@ class Dispatcher @types << type end - def remove(callable, type=nil) - if type + def remove(callable, options={}) + if options[:for] # Delete specific reference - @map[type].delete callable + @map[options[:for]].delete callable else # Delete all references @map.values.each do |a| @@ -26,6 +26,8 @@ class Dispatcher end def dispatch(event) + raise "Event must be an event!" unless event.is_a? Event + matching_types = @types.select {|type| type.match event } matching_types.each do |type| dispatcher.rb @@ -1,7 +1,11 @@ +require 'conditional_trigger' + class Event - def self.match(other) - other == self or other.class == self + def self.match(event) + event.is_a? self end - alias :match :== + def self.where(&blk) + ConditionalTrigger.new(self, blk) + end end event.rb @@ -1,16 +1,11 @@ -require 'queue' -require 'tick_event' -require 'world' +require 'config' +require 'rubygame_game' +require 'gosu_game' -class Game - def initialize - @world = World.new - end +Game = case Config::Engine + when :gosu + GosuGame.new + when :rubygame + RubygameGame.new + end - def run - loop do - Queue << TickEvent.new(@world) - Queue.resolve_all - end - end -end game.rb @@ -13,15 +13,14 @@ class EventQueue alias :add :<< def connect(hash={}) - # FUCK YEAH - hash.each(&@dispatcher.method(:add)) + hash.each {|k, v| @dispatcher.add(k, v) } end def resolve_all # Not sure about adding to an array while looping through it. - @dispatcher.dispatch(@queue.shift) while not @queue.empty? + @dispatcher.dispatch(@queue.shift) until @queue.empty? end end -Object.send(:remove_const, :Queue) # Whatever. +Object.send(:remove_const, :Queue) if Object.const_defined? :Queue # Whatever. Queue = EventQueue.new queue.rb @@ -1,6 +1,11 @@ +$: << File.expand_path(File.dirname(__FILE__)) + "/../jiggle/lib" + require 'game' require 'time_manager' +require 'objects/box' Queue.connect SecondPassedEvent => lambda { puts "TICK!" } -Game.new.run +Queue.connect GameStartEvent => lambda { World.add Box.new } + +Game.run test.rb @@ -1,5 +1,5 @@ require 'queue' -require 'second_passed_event' +require 'events/second_passed_event' class TimeManager def initialize time_manager.rb @@ -1,7 +1,18 @@ require 'time_manager' +require 'physics_manager' -class World +class WorldClass def initialize @time_manager = TimeManager.new + @physics_manager = PhysicsManager.new + + @objects = [] + end + + def add(object) + @objects << object + Queue << ObjectAddedEvent.new(object) end end + +World = WorldClass.new world.rb second_passed_event.rb tick_event.rb 5d39251cdbde92b1679c8ddbf818e2695b0e0c38 Mitchell Riley mitchell.v.riley@gmail.com http://github.com/mvr/upsurge/commit/1dcd9982b27039736eee14f13862e63ca3159b6d 1dcd9982b27039736eee14f13862e63ca3159b6d 2009-10-26T23:27:08-07:00 2009-10-26T23:27:08-07:00 A number of changes, too lazy to split them out: Add "behaviours", which game objects can use. Add conditional events Move events, objects and behaviours into their own directory Use gosu instead of rubygame, but make it so you can switch Give a more sensible Event#match 404f159e905a25b77fd48c39e4b71898503d7f8d Mitchell Riley mitchell.v.riley@gmail.com