jemini 2010.1.5 → 2010.1.24

data/README.txt

@@ -1,4 +1,4 @@
-Jemini 2010.1.5
+Jemini 2010.1.24
 
 == Description
 

data/src/behaviors/drawable_ellipse.rb

@@ -1,7 +1,6 @@
 # draws a line on the screen
 class DrawableEllipse < Jemini::Behavior
   java_import 'org.newdawn.slick.geom.Ellipse'
-  java_import 'org.newdawn.slick.Color'
   depends_on :Spatial
   wrap_with_callbacks :draw
 
@@ -11,7 +10,7 @@ class DrawableEllipse < Jemini::Behavior
   attr_accessor :ellipse_filled
 
   def load
-    @color = Color.white
+    @color = Color.new :white
     @ellipse_filled = true
     @ellipse = Ellipse.new @game_object.position.x, @game_object.position.y, 1.0, 1.0
     @game_object.on_after_position_changes { set_drawing_location }
@@ -37,7 +36,7 @@ class DrawableEllipse < Jemini::Behavior
   
   #Draw an outline to the given graphics context.
   def draw(graphics)
-    graphics.set_color @color
+    graphics.set_color @color.native_color
     if @ellipse_filled
       graphics.fill @ellipse
     else

data/src/behaviors/drawable_line.rb

@@ -1,7 +1,6 @@
 # draws a line on the screen
 class DrawableLine < Jemini::Behavior
   java_import 'org.newdawn.slick.geom.Line'
-  java_import 'org.newdawn.slick.Color'
   depends_on :Spatial
   wrap_with_callbacks :draw
 
@@ -11,7 +10,7 @@ class DrawableLine < Jemini::Behavior
   attr_accessor :color
 
   def load
-    @color = Color.white
+    @color = Color.new :white
     @line_end_position = Vector.new(0.0, 0.0)
     @line = Line.new @game_object.position.to_slick_vector, @line_end_position.to_slick_vector
     @game_object.on_after_position_changes { set_line }
@@ -25,7 +24,7 @@ class DrawableLine < Jemini::Behavior
 
   #Draw the line to the given graphics context.
   def draw(graphics)
-    graphics.set_color @color
+    graphics.set_color @color.native_color
     graphics.draw @line
   end
 

data/src/behaviors/drawable_rectangle.rb

@@ -1,7 +1,6 @@
 # draws a line on the screen
 class DrawableRectangle < Jemini::Behavior
   java_import 'org.newdawn.slick.geom.Rectangle'
-  java_import 'org.newdawn.slick.Color'
   depends_on :Spatial
   wrap_with_callbacks :draw
 
@@ -11,7 +10,7 @@ class DrawableRectangle < Jemini::Behavior
   attr_accessor :rectangle_filled
 
   def load
-    @color = Color.white
+    @color = Color.new :white
     @rectangle_filled = true
     @rectangle = Rectangle.new @game_object.position.x, @game_object.position.y, 1.0, 1.0
     @game_object.on_after_position_changes { set_drawing_location }
@@ -37,7 +36,7 @@ class DrawableRectangle < Jemini::Behavior
   
   #Draw an outline to the given graphics context.
   def draw(graphics)
-    graphics.set_color @color
+    graphics.set_color @color.native_color
     if @rectangle_filled
       graphics.fill @rectangle
     else

data/src/color.rb

@@ -3,20 +3,17 @@ class Color
   attr_reader :native_color
   
   def initialize(red_or_other, blue = nil, green = nil, alpha = 1.0)
-    if red_or_other.kind_of? Numeric
-      if green.nil? && blue.nil? #alpha defaults to 1.0
-        @native_color = SlickColor.new(red_or_other)
-      else
-        @native_color = SlickColor.new(red_or_other, blue, green, alpha)
-      end
+    if from_hex?(red_or_other, green, blue)
+      from_hex(red_or_other)
+    elsif from_rgba?(red_or_other, blue, green)
+      from_rgba(red_or_other, blue, green, alpha)
+    elsif red_or_other.is_a? SlickColor
+      @native_color = red_or_other
     else
-      # create from predefined Slick colors
-      fixed_color = SlickColor.send(red_or_other.to_s.downcase)
-      # we don't want to change the original, so we copy it
-      @native_color = SlickColor.new(fixed_color.r, fixed_color.g, fixed_color.b, fixed_color.a)
+      from_word(red_or_other)
     end
   end
-  
+
   def red
     @native_color.r
   end
@@ -58,14 +55,38 @@ class Color
   end
   
   def darken_by(amount)
-    @native_color.darken amount
+    self.class.new @native_color.darker amount
   end
   
   def darken_by!(amount)
-    @native_color = @native_color.darken amount
+    @native_color = @native_color.darker amount
   end
   
   def fade_by(amount)
     self.alpha = alpha * (1.0 - amount)
   end
+
+private
+  def from_hex?(red, green, blue)
+    red.is_a?(Numeric) && green.nil? && blue.nil? #alpha defaults to 1.0
+  end
+
+  def from_hex(hex)
+    @native_color = SlickColor.new(hex)
+  end
+
+  def from_rgba?(red, blue, green)
+    red.is_a?(Numeric) && !blue.nil? && !green.nil?
+  end
+
+  def from_rgba(red, blue, green, alpha)
+    @native_color = SlickColor.new(red, blue, green, alpha)
+  end
+
+  def from_word(word)
+    # create from predefined Slick colors
+    fixed_color = SlickColor.send(word.to_s.downcase)
+    # we don't want to change the original, so we copy it
+    @native_color = SlickColor.new(fixed_color.r, fixed_color.g, fixed_color.b, fixed_color.a)
+  end
 end

data/src/game_objects/sprite.rb

@@ -0,0 +1,7 @@
+class Sprite < Jemini::GameObject
+  has_behavior :DrawableImage
+
+  def load(image = nil)
+    self.image = image if image
+  end
+end

data/src/logger_mixin.rb

@@ -3,9 +3,11 @@ require 'logger'
 module LoggerMixin
 
   #Get the Logger object (see the Ruby standard library documentation).
-  #The log level is set to match the $LOG_LEVEL environment variable, or Logger::ERROR by default.
+  #The log level is set to match the LOG_LEVEL environment variable, or Logger::ERROR by default.
   def log
-    @log ||= Logger.new(STDOUT, ENV['LOG_LEVEL'] || Logger::ERROR)
+    @log ||= Logger.new(STDOUT)
+    @log.level = (ENV['LOG_LEVEL'] and "Logger::#{ENV['LOG_LEVEL']}".constantize) || Logger::ERROR
+    @log
   end
   
 end

data/src/project_generator.rb

@@ -12,6 +12,7 @@ module Jemini
     end
 
     def generate_project
+      copy_skeleton
       generate_default_dirs
       generate_main
 #      generate_main_with_natives
@@ -21,6 +22,11 @@ module Jemini
       copy_jemini_jar
     end
 
+    def copy_skeleton
+      skeleton_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'skeleton', '.'))
+      cp_r skeleton_dir, @project_dir 
+    end
+
     def generate_main
       mkdir_p File.expand_path(File.join(@project_dir, 'src'))
       path = File.expand_path(File.join(@project_dir, 'src', 'main.rb'))
@@ -100,10 +106,8 @@ ENDL
         f << <<-ENDL
 class HelloWorldState < Jemini::GameState
   def load
-    create(:Text,
-      "Now, place your own state code in the src/states folder!",
-      :position => Vector.new(screen_width / 2, screen_height / 2)
-    )
+    create(:Sprite, :jemini_logo).position = Vector.new(screen_size.half.x, screen_size.y * 0.25)
+    create(:Text, "Now, place your own state code in the src/states folder!", :position => screen_size.half)
   end
 end
 ENDL
@@ -116,7 +120,12 @@ ENDL
       puts `rawr install #{@rawr_install_args} #{@project_dir}`
       build_config_path = File.join(@project_dir, 'build_configuration.rb')
       build_config = File.read build_config_path
-      build_config.sub!('#c.java_library_path = "lib/java/native"', 'c.java_library_path = "lib/java/native_files"')
+      build_config.sub!('#c.java_library_path = "lib/java/native"', <<-CONFIG)
+  c.java_library_path = "lib/java/native_files"'
+  c.mac_icon_path     = File.expand_path('icons/jemini.icns')
+  c.windows_icon_path = File.expand_path('icons/jemini.ico')
+CONFIG
+
       build_config.sub!('#c.jvm_arguments = "-server"', 'c.jvm_arguments = "-XX:+UseConcMarkSweepGC -Djruby.compile.mode=FORCE -Xms256m -Xmx512m"')
       build_config.sub!(%Q{#c.jars[:data] = { :directory => 'data/images', :location_in_jar => 'images', :exclude => /bak/}}, %Q{c.jars[:data] = { :directory => 'data', :location_in_jar => 'data', :exclude => /bak/}})
       build_config.sub!(%Q{#c.files_to_copy = Dir['other_files/dir/**/*']}, %Q{c.files_to_copy = Dir['lib/java/native_files/**/*']})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jemini
 version: !ruby/object:Gem::Version 
-  version: 2010.1.5
+  version: 2010.1.24
 platform: ruby
 authors: 
   - Logan Barnett, David Koontz, Jay McGavren
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -07:00
+date: 2010-01-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.3.8
+            version: 1.3.7
       version: 
 description: Jemini is a game library designed to allow creation of reusable features. How many times has someone implemented the aiming on a first person shooter, or a minimap on a real time strategy? Jemini comes packaged with lots of behaviors out of the box, with the ability to easily author more. Jemini uses Phys2D and Slick for physics and graphics, with 3D on the roadmap.
 email: logustus@gmail.com
@@ -95,6 +95,7 @@ files:
   - src/game_objects/background.rb
   - src/game_objects/fading_image.rb
   - src/game_objects/icon_strip_counter_display.rb
+  - src/game_objects/sprite.rb
   - src/game_objects/tangible_object.rb
   - src/game_objects/text.rb
   - src/game_objects/triangle_trail.rb
@@ -155,6 +156,9 @@ files:
   - lib/native_files/OpenAL32.dll
   - package/jar/jemini.jar
   - README.txt
+  - skeleton/data/jemini_logo.png
+  - skeleton/icons/jemini.icns
+  - skeleton/icons/jemini.ico
 has_rdoc: true
 homepage: http://rubyforge.org/projects/jemini/
 licenses: []