ippa-chingu 0.5 → 0.5.1

data/games/triangle_wars/src/power_up.rb

@@ -0,0 +1,67 @@
+class PowerUp < Chingu::GameObject
+  attr_reader :type, :radius, :status
+  
+  def initialize(options)
+    super
+    @speed_x = options[:speed_x] 
+    @speed_y = options[:speed_y]
+    @type = options[:type]
+
+    @powerup_bg = Image["powerup_bg.png"]
+    @powerup = Image["#{@type}.png"]
+    #@image = Image["#{@type}.png"]
+    
+    @radius = (@powerup_bg.width + @powerup_bg.height) / 2 * 0.70
+        
+    @white = Gosu::Color.new(150,255,255,255)
+    @transparent = Gosu::Color.new(255,255,255,255)
+    @status = :default
+    
+    @zoom_seed_x = 0
+    @zoom_seed_y = Math::PI    
+  end
+
+  #
+  # Creates a powerup with objects x/y-coords and speed_x/speed_y
+  #
+  def self.new_from(object)
+    power_ups = ["plasma_up", "1up", "laser_up", "rocket_up", "bigbomb", "autofire"]
+    type = power_ups[rand(power_ups.size)]
+    PowerUp.new(:type => type, :x => object.x, :y => object.y,
+                :speed_x => object.speed_x, :speed_y => object.speed_y)
+  end
+
+  def die!
+    @status = :dead
+    destroy!
+    ##$window.remove_game_object(self)
+  end
+  def alive?
+    @status == :default
+  end
+  def dead?
+    @status == :dead
+  end
+  
+  def update
+    self.factor_x = 1.1 + Math::sin(@zoom_seed_x += 0.3)/20
+    self.factor_y = 1.1 + Math::sin(@zoom_seed_y += 0.3)/20
+  end
+  
+  def draw
+    @color = @transparent
+    @image = @powerup_bg
+    super
+    @image = @powerup
+    #@color = ($window.ticks % 2 == 0) ? @white : @transparent
+    super
+  end
+  
+  private
+  
+  def move
+    base = $windows.dt/100.0
+    @x += @speed_x * base
+    @y += @speed_y * base
+  end
+end

data/games/triangle_wars/triangle_wars.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require File.join("..", "..", "lib", "chingu.rb")
+require File.join("src", "menu_state")
+require File.join("src", "level_state")
+require File.join("src", "pause_state")
+require File.join("src", "game_over_state")
+
+require File.join("src", "my_game_object")
+require File.join("src", "enemy")
+require File.join("src", "player")
+require File.join("src", "power_up")
+
+require 'gosu'
+include Gosu
+include Chingu
+
+#
+# When a missing method is called on an array...
+# .. Go through each item in the array and call that method on the items.
+#
+class Set
+	def collide_by_radius(items = [])
+		self.each do |item|
+			items.each do |item2|
+				if distance(item.x, item.y, item2.x, item2.y) < item.radius
+					yield item, item2
+				end
+			end
+		end
+	end
+
+	def method_missing(method, *arg)
+		self.each { |item| item.send(method, *arg) }
+	end
+end
+
+class Array
+	def collide_by_radius(items = [])
+		self.each do |item|
+			items.each do |item2|
+				if distance(item.x, item.y, item2.x, item2.y) < item.radius
+					yield item, item2
+				end
+			end
+		end
+	end
+
+	def method_missing(method, *arg)
+		self.each { |item| item.send(method,  *arg) }
+	end
+end
+
+class Game < Chingu::Window
+  def initialize
+    super(1024, 768)
+    Gosu::Image.autoload_dirs << File.join(@root, "media", "backgrounds")
+    self.input = { :escape => :close }
+    push_game_state(Menu)
+    transitional_game_state(Chingu::GameStates::FadeTo)
+	end
+
+  def update
+    super
+    self.caption = "Triangle Wars [framerate: #{framerate}] [game objects: #{current_game_state.game_objects.size}]"
+  end  
+end
+
+Game.new.show

data/lib/chingu.rb

@@ -13,7 +13,7 @@ require 'set'
     input
 		}.each do |lib|
       root ||= File.dirname(File.expand_path(__FILE__))
-      require File.join(root,"chingu","components",lib)
+      require File.join(root,"chingu","traits",lib)
     end
 
 %w{	helpers
@@ -49,5 +49,5 @@ require 'set'
     end
 
 module Chingu
-  VERSION = "0.4.9"
+  VERSION = "0.5.1"
 end

data/lib/chingu/actor.rb

@@ -3,13 +3,13 @@ module Chingu
   # A game object class with most components included, nice for quick prototypes
   #
   class Actor < Chingu::GameObject
-    #add_component :visual, :effect, :input
-  
-    #def initialize(options = {})
-    #  super
-    #  visual_setup(options)
-    #  effect_setup(options)
-    #  input_setup(options)
-    #end
+    has_traits :effect, :velocity, :input
+
+    def update
+      # needed for traits to work
+      super     
+      
+      # your game logic Here
+    end    
   end
 end

data/lib/chingu/animation.rb

@@ -61,8 +61,8 @@ module Chingu
     #   @animation[0..2]    # returns a new Animation-instance with first, second and third frame
     #
     def [](index)
-      return @frames[index]               if  index.is_a? (Fixnum)
-      return self.new_from_frames(index)  if  index.is_a? (Range)
+      return @frames[index]               if  index.is_a?(Fixnum)
+      return self.new_from_frames(index)  if  index.is_a?(Range)
     end
 		
     #

data/lib/chingu/basic_game_object.rb

@@ -3,38 +3,45 @@ module Chingu
   # BasicGameObject. Resonating with 1.9.1, this is our most basic class that all game objects ultimate should build on.
   #
   # All objects that inherits from this class will by default be automaticly be updated and drawn.
-  # It will also acts as a container for the component-system of chingu.
+  # It will also acts as a container for the trait-system of chingu.
   #
   class BasicGameObject
     attr_reader :options, :parent
     
     #
-    # Create class variable @components in every new class derived from GameObject
+    # Create class variable @traits in every new class derived from GameObject
     #
     def self.inherited(subclass)
-      subclass.instance_variable_set("@components", Set.new)
+      subclass.instance_variable_set("@traits", Set.new)
     end
    
     class << self
-      attr_accessor :components
+      attr_accessor :traits
     end
     
     #
-    # adds a component to a certain game class
+    # adds a trait or traits to a certain game class
     # 
     # Executes a ruby "include" the specified module
     # and sets up update and draw hooks.
     #
-    def self.add_component(*components)
-      Array(components).each do |component|
+    def self.has_trait(*traits)
+      has_traits(*traits)
+    end
+    
+    #
+    # See #has_trait
+    #
+    def self.has_traits(*traits)
+      Array(traits).each do |trait|
         
-        if component.is_a?(::Symbol) || component.is_a?(::String)
-          string = "Chingu::Components::#{component.to_s.downcase.capitalize}"
+        if trait.is_a?(::Symbol) || trait.is_a?(::String)
+          string = "Chingu::Traits::#{trait.to_s.downcase.capitalize}"
           klass_or_module = eval(string)
           
           if klass_or_module.is_a?(Class)
-            component = klass_or_module.new(self, {})
-            @components << component
+            trait = klass_or_module.new(self, {})
+            @traits << trait
           elsif klass_or_module.is_a?(Module)
             include klass_or_module
           end
@@ -46,17 +53,17 @@ module Chingu
     #
     # BasicGameUnit initialize
     #
-    # - caches component methods for fast calls later on
-    # - call .setup() on components that implements it
+    # - caches all trait methods for fast calls later on
+    # - call .setup() on all traits that implements it
     # - adds game object to correct game state or $window if no game state exists
     #
     def initialize(options = {})
       @options = options
-      setupable_components
-      updateable_components
-      drawable_components
+      setupable_traits
+      updateable_traits
+      drawable_traits
       
-      @setupable_components.each { |c| c.setup(self, options) }
+      @setupable_traits.each { |c| c.setup(self, options) }
       
       #
       # A GameObject can either belong to a GameState or our mainwindow ($window)
@@ -70,32 +77,32 @@ module Chingu
     end
     
     #
-    # Get all components
+    # Get all traits
     #
-    def components; self.class.components || [];  end
+    def traits; self.class.traits || [];  end
     
-    def setupable_components
-      @setupable_components ||= components.select { |c| c.respond_to?(:setup) }
+    def setupable_traits
+      @setupable_traits ||= traits.select { |c| c.respond_to?(:setup) }
     end
-    def updateable_components
-      @updateable_components ||= components.select { |c| c.respond_to?(:update) }
+    def updateable_traits
+      @updateable_traits ||= traits.select { |c| c.respond_to?(:update) }
     end
-    def drawable_components
-      @drawable_components ||= components.select { |c| c.respond_to?(:draw) }
+    def drawable_traits
+      @drawable_traits ||= traits.select { |c| c.respond_to?(:draw) }
     end
     
     #
-    # Call .update on all components that implements it
+    # Call .update on all traits that implements it
     #
     def update
-      @updateable_components.each { |c| c.update(self) }
+      @updateable_traits.each { |c| c.update(self) }
 		end
     
     #
-    # Call .draw on all components that implements it
+    # Call .draw on all traits that implements it
     #    
     def draw
-      @drawable_components.each { |c| c.draw(self) }
+      @drawable_traits.each { |c| c.draw(self) }
     end
     
         

data/lib/chingu/particle.rb

@@ -1,23 +1,20 @@
 #
-# Our basic particle class
+# Our basic particle class, basicly just a GameObject with trait "effect"
+# 
+# TODO: expand on this further, as it is now it doesn't add much.
 #
 module Chingu
   class Particle < Chingu::GameObject
-    add_component :effect
+    has_trait :effect
     
     def initialize(options)
       super({:mode => :additive}.merge(options))
-      @rotation = options[:rotation] || 0
-      @zoom = options[:zoom] || 0
-      @fade = options[:fade] || 0
       @animation = options[:animation] || nil      
     end
       
     def update
+      super
       self.image = @animation.next!   if @animation
-      self.rotate(@rotation)
-      self.zoom(@zoom)
-      self.fade(@fade)
     end
     
   end

data/lib/chingu/traits/collision_detection.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     #
     # TODO: everything. convert to class?
     # 

data/lib/chingu/traits/deprecated_module_visual.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     module Visual
       attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
 

data/lib/chingu/traits/deprecated_visual.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     class Visual
       
       def initialize(parent_class, options)

data/lib/chingu/traits/effect.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     class Effect
       #
       # Adds .rotating .fading and .zooming to any GameObject.

data/lib/chingu/traits/input.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     module Input
     
       def input=(input_map)

data/lib/chingu/traits/velocity.rb

@@ -1,5 +1,5 @@
 module Chingu
-  module Components
+  module Traits
     #
     # A chingu component providing velocity and acceleration logic. 
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ippa-chingu
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - ippa
@@ -32,11 +32,19 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
+- benchmarks/README.txt
+- games/triangle_wars/NOT_DONE_YET.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- benchmarks/README.txt
+- benchmarks/benchmark.rb
+- benchmarks/benchmark3.rb
+- benchmarks/benchmark4.rb
+- benchmarks/meta_benchmark.rb
+- benchmarks/meta_benchmark2.rb
 - chingu.gemspec
 - examples/example1.rb
 - examples/example2.rb
@@ -60,6 +68,58 @@ files:
 - examples/media/stickfigure.bmp
 - examples/media/stickfigure.png
 - examples/media/video_games.png
+- games/triangle_wars/NOT_DONE_YET.txt
+- games/triangle_wars/media/1up.png
+- games/triangle_wars/media/33487__CosmicD__006.wav
+- games/triangle_wars/media/Thumbs.db
+- games/triangle_wars/media/autofire.png
+- games/triangle_wars/media/backgrounds/GPN-2000-000933.jpg
+- games/triangle_wars/media/backgrounds/Thumbs.db
+- games/triangle_wars/media/backgrounds/background10.png
+- games/triangle_wars/media/backgrounds/background10.svg
+- games/triangle_wars/media/backgrounds/background2.jpg
+- games/triangle_wars/media/backgrounds/background2.png
+- games/triangle_wars/media/backgrounds/hubble_deep_field.jpg
+- games/triangle_wars/media/backgrounds/hubble_deep_field.png
+- games/triangle_wars/media/backgrounds/intro_bg.png
+- games/triangle_wars/media/backgrounds/star_4.jpg
+- games/triangle_wars/media/backgrounds/star_5.jpg
+- games/triangle_wars/media/backgrounds/star_6.jpg
+- games/triangle_wars/media/backgrounds/supernova_1.jpg
+- games/triangle_wars/media/bigbomb.png
+- games/triangle_wars/media/bullets.svg
+- games/triangle_wars/media/enemy.png
+- games/triangle_wars/media/enemy.svg
+- games/triangle_wars/media/enemy_dying.png
+- games/triangle_wars/media/enemy_small.svg
+- games/triangle_wars/media/explosion.wav
+- games/triangle_wars/media/hit.wav
+- games/triangle_wars/media/hit2.wav
+- games/triangle_wars/media/hit3.wav
+- games/triangle_wars/media/laser.png
+- games/triangle_wars/media/laser.svg
+- games/triangle_wars/media/laser_up.png
+- games/triangle_wars/media/plasma.png
+- games/triangle_wars/media/plasma.wav
+- games/triangle_wars/media/plasma_up.png
+- games/triangle_wars/media/powerup_bg.png
+- games/triangle_wars/media/powerups.svg
+- games/triangle_wars/media/rocket_up.png
+- games/triangle_wars/media/spaceship.png
+- games/triangle_wars/media/spaceship.svg
+- games/triangle_wars/media/triangle_logo.svg
+- games/triangle_wars/media/triangle_wars.png
+- games/triangle_wars/media/triangle_wars_intro.mp3
+- games/triangle_wars/media/triangle_wars_intro.ogg
+- games/triangle_wars/src/enemy.rb
+- games/triangle_wars/src/game_over_state.rb
+- games/triangle_wars/src/level_state.rb
+- games/triangle_wars/src/menu_state.rb
+- games/triangle_wars/src/my_game_object.rb
+- games/triangle_wars/src/pause_state.rb
+- games/triangle_wars/src/player.rb
+- games/triangle_wars/src/power_up.rb
+- games/triangle_wars/triangle_wars.rb
 - lib/chingu.rb
 - lib/chingu/actor.rb
 - lib/chingu/animation.rb
@@ -91,7 +151,6 @@ files:
 - lib/chingu/window.rb
 has_rdoc: false
 homepage: http://github.com/ippa/chingu/tree/master
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -113,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: chingu
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Game framework built on top of the OpenGL accelerated game lib Gosu