teien 0.0.2 → 0.0.3

data/lib/teien/tools.rb

@@ -51,9 +51,19 @@ class Vector3D < Bullet::BtVector3
     return sprintf("(%f, %f, %f)", vec.x, vec.y, vec.z)
   end
 
+  def _dump(limit)
+    return [x(), y(), z()].pack("fff")
+  end
+
+  def self._load(source)
+    array = source.unpack("fff")
+    return Vector3D.new(array[0], array[1], array[2])
+  end
+
   def copy(vec)
-    setValue(vec.x, vec.y, vec.z)
+    set_value(vec.x, vec.y, vec.z)
   end
+
 end
 
 
@@ -74,13 +84,31 @@ class Quaternion < Bullet::BtQuaternion
     return sprintf("(%f, %f, %f, %f)", qt.x, qt.y, qt.z, qt.w)
   end
 
+  def _dump(limit)
+    return [x(), y(), z(), w()].pack("ffff")
+  end
+
+  def self._load(source)
+    array = source.unpack("ffff")
+    return Quaternion.new(array[0], array[1], array[2], array[3])
+  end
+
   def copy(qt)
-    setValue(qt.x, qt.y, qt.z, qt.w)
+    set_value(qt.x, qt.y, qt.z, qt.w)
   end
 
 end
 
 class Color < Ogre::ColourValue
+  def _dump(limit)
+    return [r(), g(), b(), a()].pack("ffff")
+  end
+
+  def self._load(source)
+    array = source.unpack("ffff")
+    return Color.new(array[0], array[1], array[2], array[3])
+  end
+
 end
 
 class Radian < Ogre::Radian

data/lib/teien/user_interface.rb

@@ -1,18 +1,41 @@
 require 'teien/camera'
+require 'teien/view'
+require "teien/dispatcher.rb"
 
 module Teien
 
 class UserInterface
-  def initialize(view)
-    @view = view
-    @camera = Camera.new(view.camera)
+#  include Dispatcher  
+
+  attr_accessor :garden
+  attr_accessor :debug_draw
+
+  def initialize(garden)
+    super()
+
+    @garden = garden
+    @garden.register_receiver(self)
+
+    @view = View.new()
+    @camera = nil
+
+    @debug_draw = false
   end
 
-  def set_controller(controller)
-    @view.set_controller(controller)
+  def set_window_title(title)
+    @view.window_title = title
+  end
+
+  def set_debug_draw(bl)
+    @debug_draw = bl
+    if (bl)
+      @debug_drawer = Teienlib::DebugDrawer.new(@view.scene_mgr)
+      @garden.physics.dynamics_world.set_debug_drawer(@debug_drawer)
+    end      
   end
 
   def get_camera()
+    @camera = Camera.new(@view.camera) if @camera == nil
     return @camera
   end
 
@@ -32,6 +55,36 @@ class UserInterface
     @view.tray_mgr.hide_cursor()
   end
 
+  def register_receiver(recv)
+    @view.register_receiver(recv)
+  end
+
+  # called as a receiver by a dispatcher.
+
+  #
+  # By Garden/GardenBase
+  #
+
+  def set_ambient_light(color)
+    @view.set_ambient_light(color)
+  end
+
+  def set_sky_dome(enable, materialName, curvature = 10, tiling = 8, distance = 4000)
+    @view.scene_mgr.set_sky_dome(enable, materialName, curvature, tiling, distance)
+  end
+
+  def setup(garden)
+    @view.setup(garden)
+  end
+
+  def create_object(obj)
+    @view.add_view_object(obj)
+  end
+
+  def update(delta)
+    @garden.physics.dynamics_world.debug_draw_world() if @debug_draw
+    @view.update(delta)
+  end
 end
 
 class UI < UserInterface

data/lib/teien/version.rb

@@ -1,3 +1,3 @@
 module Teien
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/teien/view.rb

@@ -1,8 +1,12 @@
 require 'teien/ui_listener'
+require "teien/view_object_factory.rb"
+require "teien/dispatcher.rb"
 
 module Teien
 
 class View < Ogre::FrameListener
+  include Dispatcher  
+
   attr_accessor :root
   attr_accessor :camera
   attr_accessor :window
@@ -13,29 +17,28 @@ class View < Ogre::FrameListener
   attr_accessor :window_title
 
 
-  def initialize(garden)
+  def initialize()
     super()
-    @garden = garden
+
     @adjustFlag = false
     @root = nil
     @camera = nil
     @window = nil
     @mouse = nil
     @keyboard = nil
-    @controller = nil
     @scene_mgr = nil
     @tray_mgr = nil
     @inputManager = nil
     @window_title = ""
-  end
 
-  def set_controller(controller)
-    @controller = controller
+    @object_factory = ViewObjectFactory.new(self)
   end
 
-  def setup
-    @plugins_cfg   = @garden.plugins_cfg ? @garden.plugins_cfg : "plugins.cfg"
-    @resources_cfg = @garden.resources_cfg ? @garden.resources_cfg : "resources.cfg"
+  def setup(garden)
+    puts "view setup"
+    @garden = garden
+    @plugins_cfg   = @garden.plugins_cfg ? @garden.plugins_cfg : "config/plugins.cfg"
+    @resources_cfg = @garden.resources_cfg ? @garden.resources_cfg : "config/resources.cfg"
 
     @root = Ogre::Root.new("")
     load_plugins()
@@ -48,6 +51,9 @@ class View < Ogre::FrameListener
     init_resources()
     init_managers()
 
+    start()
+    prepare_render_loop()
+
     return true
   end
 
@@ -114,9 +120,7 @@ class View < Ogre::FrameListener
     ms.height = @window.get_height()
   end
 
-  def start(script)
-    @script = script
-
+  def start()
     # initialize scene_mgr
     @scene_mgr = @root.create_scene_manager(Ogre::ST_GENERIC)
     @scene_mgr.set_shadow_technique(Ogre::SHADOWTYPE_STENCIL_ADDITIVE)
@@ -134,7 +138,7 @@ class View < Ogre::FrameListener
     @keyboard.set_event_callback(@keyListener)
     @mouseListener = MouseListener.new(self)
     @mouse.set_event_callback(@mouseListener)
-    @trayListener = TrayListener.new(@script)
+    @trayListener = TrayListener.new(self)
     @tray_mgr.set_listener(@trayListener)
 
     # load resources into ResourceGroupManager.
@@ -167,13 +171,12 @@ class View < Ogre::FrameListener
     @root.shutdown()
   end
 
-  def create_scene_node(parent = nil)
-    if (parent == nil)
-      scene_node = @scene_mgr.get_root_scene_node().create_child_scene_node()
-    else
-      scene_node = parent.create_child_scene_node()
-    end
-    return scene_node
+  def set_ambient_light(color)
+    @scene_mgr.set_ambient_light(color)
+  end
+
+  def add_view_object(obj)
+    obj.view_object = @object_factory.create_object(obj)
   end
 
   # Takes a screen shot.
@@ -200,7 +203,10 @@ class View < Ogre::FrameListener
   def frame_rendering_queued(evt)
     @keyboard.capture()
     @mouse.capture()
-    @controller.update(evt.timeSinceLastFrame) if @controller
+
+    @garden.objects.each_value {|obj|
+      obj.view_object.update_animation(evt.timeSinceLastFrame, obj.animation_info)
+    }
 
     @tray_mgr.frame_rendering_queued(evt)
     if (@adjustFlag != true)
@@ -208,37 +214,50 @@ class View < Ogre::FrameListener
       @adjustFlag = true
     end
 
-    return @garden.update_in_frame_rendering_queued(evt.timeSinceLastFrame)
+    return true
   end
 
   def key_pressed(keyEvent)
-    return true if @controller == nil
-    return @controller.key_pressed(keyEvent)
+    notify(:key_pressed, keyEvent)
+    return true
   end
 
   def key_released(keyEvent)
-    return true if @controller == nil
-    return @controller.key_released(keyEvent)
+    notify(:key_released, keyEvent)
+    return true
   end
 
   def mouse_moved(evt)
     return true if @tray_mgr.inject_mouse_move(evt)
-    return true if @controller == nil      
-    return @controller.mouse_moved(evt)
+    notify(:mouse_moved, evt)
+    return true
   end
   
   def mouse_pressed(mouseEvent, mouseButtonID)
     return true if @tray_mgr.inject_mouse_down(mouseEvent, mouseButtonID)
-    return true if @controller == nil      
-    return @controller.mouse_pressed(mouseEvent, mouseButtonID)
+    notify(:mouse_pressed, mouseEvent, mouseButtonID)
+    return true 
   end
   
   def mouse_released(mouseEvent, mouseButtonID)
     return true if @tray_mgr.inject_mouse_up(mouseEvent, mouseButtonID)
-    return true if @controller == nil      
-    return @controller.mouse_released(mouseEvent, mouseButtonID)
+    notify(:mouse_released, mouseEvent, mouseButtonID)
+    return true 
   end
-
 end
 
 end # module 
+
+
+
+=begin
+  def create_scene_node(parent = nil)
+    if (parent == nil)
+      scene_node = @scene_mgr.get_root_scene_node().create_child_scene_node()
+    else
+      scene_node = parent.create_child_scene_node()
+    end
+    return scene_node
+  end
+=end
+

data/lib/teien/view_object.rb

@@ -0,0 +1,67 @@
+require "teien/animation_operator.rb"
+
+module Teien
+
+class ViewObject
+  # Ogre3D accessor
+  ## center of view objects(sceneNode) and kept to equal with the rigid_body position.
+  attr_accessor :pivot_scene_node 
+  attr_accessor :scene_node
+  attr_accessor :entity
+  attr_accessor :animation_operators
+
+  def initialize(view)
+    @view = view
+    @pivot_scene_node = nil
+    @scene_node = nil
+    @entity = nil
+    @animation_operators = Hash.new
+  end
+
+  def finalize()
+    @pivot_scene_node.remove_child(@scene_node)
+    @view.scene_mgr.destroySceneNode(@scene_node)
+    @view.scene_mgr.get_root_scene_node.remove_child(@pivot_scene_node)
+    @view.scene_mgr.destroySceneNode(@pivot_scene_node)
+    @view.scene_mgr.destroyEntity(@entity)
+  end
+
+  def update_animation(delta, animation)
+    animation.operators.each_pair{|key, value|
+      unless @animation_operators[key]
+        @entity.get_skeleton().set_blend_mode(animation.blend_mode)
+        ani_ope = AnimationOperator.new(@entity)
+        ani_ope.init(value.name, value.loop)
+        @animation_operators[key] = ani_ope
+      end
+
+      if (value.name != @animation_operators[key].name ||
+          value.loop != @animation_operators[key].loop)
+        @animation_operators[key].play(value.name, value.loop)
+      end
+      @animation_operators[key].add_time(delta * value.speed)
+    }
+  end
+
+  #
+  # The offset changes the local position of the created scene_node in Object.
+  #
+  def set_scene_node(entity, offset = Vector3D.new(0, 0, 0), rotate = Quaternion.new(0, 0, 0, 1.0))
+    if (@pivot_scene_node == nil)
+      @pivot_scene_node = @view.scene_mgr.get_root_scene_node().create_child_scene_node()
+    end
+    @scene_node = @pivot_scene_node.create_child_scene_node(Vector3D.to_ogre(offset), 
+                                                            Quaternion.to_ogre(rotate))
+    @pivot_scene_node.instance_variable_set(:@child, @scene_node) # prevent this from GC.
+
+    if entity
+      @scene_node.attach_object(entity)
+      @entity = entity
+    end
+
+    return @scene_node
+  end
+  
+end
+
+end

data/lib/teien/view_object_factory.rb

@@ -0,0 +1,210 @@
+require 'teien/garden_object'
+
+module Teien
+
+class ViewObjectFactory
+  def initialize(view)
+    @view = view
+  end
+
+#  def create_object(name, object_info, physics_info)
+  def create_object(obj)
+    case obj.object_info
+    when LightObjectInfo
+      return create_light_object(obj)
+    when FloorObjectInfo
+      return create_floor_object(obj)
+    when BoxObjectInfo
+      return create_box_object(obj)
+    when SphereObjectInfo
+      return create_sphere_object(obj)
+    when CapsuleObjectInfo
+      return create_capsule_object(obj)
+    when ConeObjectInfo
+      return create_cone_object(obj)
+    when CylinderObjectInfo
+      return create_cylinder_object(obj)
+    when MeshBBObjectInfo
+      return create_meshBB_object(obj)
+    when MeshObjectInfo
+      return create_mesh_object(obj)
+    else
+      puts "Error: passed no supported object_info."
+      return nil
+    end
+  end
+
+  def create_light_object(obj)
+    entity = @view.scene_mgr.create_light(obj.name)
+    entity.set_type(obj.object_info.type)
+    entity.set_diffuse_colour(obj.object_info.diffuse_color)
+    entity.set_specular_colour(obj.object_info.specular_color)
+    entity.set_direction(Vector3D.to_ogre(obj.object_info.direction))
+
+    view_object = ViewObject.new(@view)
+    view_object.entity = entity
+    return view_object
+  end
+
+  #
+  # Floor Object
+  #
+
+  # Setting an entity and a node of Ogre3d.
+  def create_floor_object(obj)
+    normal = Ogre::Vector3.new(0, 1, 0)
+    up = Ogre::Vector3.new(0, 0, 1)
+    Ogre::MeshManager::get_singleton().create_plane(obj.name, 
+                                                    Ogre::ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME,
+                                                    Ogre::Plane.new(normal, 0), 
+                                                    obj.object_info.width * 2.0, 
+                                                    obj.object_info.height * 2.0, 
+                                                    obj.object_info.num_seg_x, 
+                                                    obj.object_info.num_seg_y, 
+                                                    true, 1, 
+                                                    obj.object_info.u_tile, 
+                                                    obj.object_info.v_tile, up)
+    entity = @view.scene_mgr.create_entity(obj.name, obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity)
+    return view_object
+  end
+
+  #
+  # Box Object
+  #
+
+  def create_box_object(obj)
+    gen = Procedural::BoxGenerator.new()
+    gen.set_size_x(obj.object_info.size.x * 2.0)
+    gen.set_size_y(obj.object_info.size.y * 2.0)
+    gen.set_size_z(obj.object_info.size.z * 2.0)
+    gen.set_num_seg_x(obj.object_info.num_seg_x)
+    gen.set_num_seg_y(obj.object_info.num_seg_y)
+    gen.set_num_seg_z(obj.object_info.num_seg_z)
+    gen.set_utile(obj.object_info.u_tile).set_vtile(obj.object_info.v_tile).realize_mesh(obj.name)
+    entity = @view.scene_mgr.create_entity(obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity)
+    return view_object
+  end
+
+  # 
+  # Sphere Object
+  #
+
+  def create_sphere_object(obj)
+    gen = Procedural::SphereGenerator.new()
+    gen.set_radius(obj.object_info.radius)
+    gen.set_num_rings(obj.object_info.num_rings)
+    gen.set_num_segments(obj.object_info.num_segments)
+    gen.set_vtile(obj.object_info.u_tile).set_vtile(obj.object_info.v_tile).realize_mesh(obj.name)
+    entity = @view.scene_mgr.create_entity(obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity)
+    return view_object
+  end
+
+  #
+  # Capsule Object
+  #
+
+  def create_capsule_object(obj)
+    gen = Procedural::CapsuleGenerator.new()
+    gen.set_radius(obj.object_info.radius).set_height(obj.object_info.height)
+    gen.set_num_rings(obj.object_info.num_rings)
+    gen.set_num_segments(obj.object_info.num_segments)
+    gen.set_num_seg_height(obj.object_info.num_seg_height)
+    gen.set_vtile(obj.object_info.u_tile).set_vtile(obj.object_info.v_tile).realize_mesh(obj.name)
+    entity = @view.scene_mgr.create_entity(obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity)
+    return view_object
+  end
+
+  #
+  # Cone Object
+  #
+
+  def create_cone_object(obj)
+    gen = Procedural::ConeGenerator.new
+    gen.set_radius(obj.object_info.radius).set_height(obj.object_info.height)
+    gen.set_num_seg_base(obj.object_info.num_seg_base).set_num_seg_height(obj.object_info.num_seg_height)
+    gen.set_utile(obj.object_info.u_tile).set_vtile(obj.object_info.v_tile).realize_mesh(obj.name)
+    entity = @view.scene_mgr.create_entity(obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity)
+    return view_object
+  end
+
+  #
+  # Cylinder Object
+  #
+
+  def create_cylinder_object(obj)
+    gen = Procedural::CylinderGenerator.new
+    gen.set_radius(obj.object_info.radius).set_height(obj.object_info.height).set_capped(obj.object_info.capped)
+    gen.set_num_seg_base(obj.object_info.num_seg_base).set_num_seg_height(obj.object_info.num_seg_height)
+    gen.set_utile(obj.object_info.u_tile).set_vtile(obj.object_info.v_tile).realize_mesh(obj.name)
+    entity = @view.scene_mgr.create_entity(obj.name)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name)
+
+    view_object = ViewObject.new(@view)
+    view_object.set_scene_node(entity, 
+                               Vector3D.new(0, -obj.object_info.height / 2, 0))
+    return view_object
+  end
+
+  #
+  # MeshBB Object
+  #
+
+  def create_meshBB_object(obj)
+    entity = @view.scene_mgr.create_entity(obj.name, obj.object_info.mesh_path)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name) if obj.object_info.material_name
+
+    view_object = ViewObject.new(@view)
+    node = view_object.set_scene_node(entity, obj.object_info.view_offset, obj.object_info.view_rotation)
+    node.set_scale(obj.object_info.size.x * obj.object_info.scale.x, 
+                   obj.object_info.size.y * obj.object_info.scale.y, 
+                   obj.object_info.size.z * obj.object_info.scale.z)
+    return view_object
+  end
+
+  #
+  # Mesh Object
+  #
+
+  def create_mesh_object(obj)
+    entity = @view.scene_mgr.create_entity(obj.name, obj.object_info.mesh_path)
+    entity.set_cast_shadows(true)
+    entity.set_material_name(obj.object_info.material_name) if obj.object_info.material_name
+
+    view_object = ViewObject.new(@view)
+    node = view_object.set_scene_node(entity, obj.object_info.view_offset)
+    node.set_scale(obj.object_info.scale.x, 
+                   obj.object_info.scale.y, 
+                   obj.object_info.scale.z)
+    return view_object
+  end
+end
+
+
+end

data/lib/teien.rb

@@ -8,33 +8,81 @@ require "ogrebites.so"
 require "teienlib.so"
 
 require "teien/tools.rb"
-require 'teien/light_object'
 require 'teien/object_info'
 require 'teien/physics_info'
-require 'teien/camera_mover'
+require 'teien/animation'
+require 'teien/smooth_mover'
+require "teien/garden.rb"
+require "teien/model.rb"
+require "teien/controller.rb"
+require "teien/ai.rb"
 
 module Teien
 
-def create_garden(klass)
-  require "teien/garden.rb"
+def self.start_server_garden(ip, port, sync_period = 0.5)
+  require "teien/synchronizer"
 
-  return Teien::Garden.new(klass)
+  cwd = Dir.getwd
+  Dir.glob("#{cwd}/app/models/*.rb") {|file|
+    require "#{file}"
+  }
+
+  garden = Teien::Garden.new()
+  Teien::Model::load(garden)
+#  garden_script = garden_script_klass.new(garden)
+  sync = Synchronizer.new(garden, sync_period)
+  garden.run(ip, port)
 end
 
-=begin
-def createServerGarden(url, klass)
-  require "teien/ServerGarden.rb"
-  require "ENet.so"
+def self.start_client_garden(ip, port)
+  require "teien/proxy_garden.rb"
+  require 'teien/user_interface'
+
+  cwd = Dir.getwd
+  Dir.glob("#{cwd}/app/controllers/*.rb") {|file|
+    require "#{file}"
+  }
 
-  return MiniatureGarden::ServerGarden.new(url, klass)
+  garden = Teien::ProxyGarden.new()
+  ui = Teien::UserInterface.new(garden)
+  Teien::Controller::load(garden, ui)
+#  controller_script = controller_script_klass.new(garden, ui)  
+  garden.run(ip, port)
 end
 
-def createClientGarden(uri, klass)
-  require "teien/ClientGarden.rb"
-  require "ENet.so"
+def self.start_ai_garden(ip, port)
+  require "teien/proxy_garden.rb"
 
-  return MiniatureGarden::ClientGarden.new(uri, klass)
+  cwd = Dir.getwd
+  Dir.glob("#{cwd}/app/ais/*.rb") {|file|
+    require "#{file}"
+  }
+
+  garden = Teien::ProxyGarden.new()
+  Teien::Ai::load(garden)
+  garden.run(ip, port)
 end
+
+
+def self.start_local_garden()
+  require_relative 'teien/user_interface'
+
+  pid = Process.fork {
+    start_server_garden("0.0.0.0", 11922, 0.1)
+  }
+  begin
+    start_client_garden("0.0.0.0", 11922)
+  ensure
+    Process.kill("TERM", pid)
+  end
+  
+=begin
+  garden = Teien::Garden.new()
+  ui = Teien::UserInterface.new(garden)
+  garden_script = garden_script_klass.new(garden)
+  controller_script = controller_script_klass.new(garden, ui)
+  garden.run
 =end
+end
 
 end