chingu 0.7.6.2 → 0.7.6.3

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.6.2"
+  s.version = "0.7.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-06-18}
+  s.date = %q{2010-06-19}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
      "examples/example20_trait_inheritence_test.rb",
      "examples/example21.yml",
      "examples/example21_sidescroller_with_edit.rb",
+     "examples/example22_text.rb",
      "examples/example2_gamestate_basics.rb",
      "examples/example3_parallax.rb",
      "examples/example4_gamestates.rb",
@@ -97,6 +98,7 @@ Gem::Specification.new do |s|
      "examples/media/star_25x25_explode.gal",
      "examples/media/star_25x25_explode.png",
      "examples/media/stone_wall.bmp",
+     "examples/media/talk_bubble.png",
      "examples/media/tube.png",
      "examples/media/video_games.png",
      "examples/media/wood.png",
@@ -164,6 +166,7 @@ Gem::Specification.new do |s|
      "examples/example1_basics.rb",
      "examples/example20_trait_inheritence_test.rb",
      "examples/example21_sidescroller_with_edit.rb",
+     "examples/example22_text.rb",
      "examples/example2_gamestate_basics.rb",
      "examples/example3_parallax.rb",
      "examples/example4_gamestates.rb",

data/examples/example22_text.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+
+class Game < Chingu::Window
+  def initialize
+    super(640,480,false)              # leave it blank and it will be 800,600,non fullscreen
+    self.input = { :escape => :exit } # exits example on Escape    
+    self.caption = "Demonstration of Text"
+    push_game_state(Woff)
+  end  
+end
+
+class Woff < GameState
+  def setup
+    self.input = { [:space, :esc] => :exit }
+    
+    
+    # Some Text with adapting :background 
+    Text.create("tiny", :x => 200, :y => 200, :size => 20, :background => "talk_bubble.png", :color => Color::BLACK)
+    
+    Text.size = 50
+    Text.padding = 20
+    Text.create("Hello", :x => 100, :y => 30, :background => "talk_bubble.png", :color => Color::BLACK)
+    Text.create("YES YOU! Bla bla bla bla.", :size => 40, :x => 200, :y => 300, :background => "talk_bubble.png", :color => Color::BLACK)
+    
+    #
+    # TODO: More text examples!
+    # 
+  end
+  
+  def draw
+    fill_gradient(:from => Color::CYAN, :to => Color::BLUE)
+    super
+  end
+end
+
+
+Game.new.show

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.7.6.2"
+  VERSION = "0.7.6.3"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_object.rb

@@ -93,7 +93,24 @@ module Chingu
       setup
       
     end
-    
+   
+    #
+    # Get all settings from a game object in one array.
+    # Complemented by the GameObject#attributes= setter.
+    # Makes it easy to clone a objects x,y,angle etc.
+    #
+    def attributes
+      [@x, @y, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode, @zorder]
+    end
+
+    #
+    # Set all attributes on 1 line
+    # Mainly used in combination with game_object1.attributes = game_object2.attributes
+    #
+    def attributes=(attributes)
+      self.x, self.y, self.angle, self.center_x, self.center_y, self.factor_x, self.factor_y, self.color, self.mode, self.zorder = *attributes
+    end
+
     #
     # Set an effective width for the object on screen.
     # Chingu does this by setting factor_x depending on imge.width and width given.

data/lib/chingu/text.rb

@@ -34,17 +34,19 @@ module Chingu
   #
   class Text < Chingu::GameObject
     attr_accessor :text
-    attr_reader :height, :gosu_font, :line_spacing, :align, :max_width
+    attr_reader :height, :gosu_font, :line_spacing, :align, :max_width, :background
 
     @@size = nil
     @@font = nil
+    @@padding = 5
     def self.font; @@font; end
     def self.font=(value); @@font = value; end
-
     def self.size; @@size; end
     def self.size=(value); @@size = value; end
     def self.height; @@size; end
     def self.height=(value); @@size = value; end
+    def self.padding; @@padding; end
+    def self.padding=(value); @@padding = value; end
     
     #
     # Takes the standard GameObject-hash-arguments but also:
@@ -71,12 +73,22 @@ module Chingu
       @line_spacing = options[:line_spacing] || 1
       @align = options[:align] || :left
       @max_width = options[:max_width]
-    
+      @padding = options[:padding] || @@padding
       self.rotation_center = :top_left
-      
+
       @gosu_font = Gosu::Font.new($window, @font, @height)
-      
       create_image  unless @image
+
+      if options[:background]
+        @background = GameObject.create(:image => options[:background])
+        @background.attributes = self.attributes
+        @background.color = Color::WHITE
+        @background.zorder -= 1
+        @background.x -= @padding
+        @background.y -= @padding
+        @background.width = self.width + @padding * 2
+        @background.height = self.height + @padding * 2
+      end
     end
     
     #
@@ -98,6 +110,14 @@ module Chingu
       @gosu_font.text_width(@text, @factor_x)
     end
     
+    #
+    #
+    #
+    def draw
+      @background.draw  if @background    # draw our background, if any
+      super                               # super -> GameObject#draw which draws out text
+    end
+    
     private
     
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  - 2
-  version: 0.7.6.2
+  - 3
+  version: 0.7.6.3
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +02:00
+date: 2010-06-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - examples/example20_trait_inheritence_test.rb
 - examples/example21.yml
 - examples/example21_sidescroller_with_edit.rb
+- examples/example22_text.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb
@@ -125,6 +126,7 @@ files:
 - examples/media/star_25x25_explode.gal
 - examples/media/star_25x25_explode.png
 - examples/media/stone_wall.bmp
+- examples/media/talk_bubble.png
 - examples/media/tube.png
 - examples/media/video_games.png
 - examples/media/wood.png
@@ -219,6 +221,7 @@ test_files:
 - examples/example1_basics.rb
 - examples/example20_trait_inheritence_test.rb
 - examples/example21_sidescroller_with_edit.rb
+- examples/example22_text.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb