teien 0.0.3 → 0.1.0

data/lib/teien/{garden_object.rb → base_object/base_object.rb}

@@ -1,13 +1,13 @@
-require "teien/tools.rb"
-require "teien/physics_object.rb"
-require "teien/view_object.rb"
+require "teien/core/tools.rb"
+require "teien/base_object/physics_object.rb"
+require "teien/base_object/attachment_info.rb"
+
 
 module Teien
 
-#
-# GardenObject has a rigidBody(bullet physics), an entity and a sceneNode(ogre3d view).
-#
-class GardenObject < Bullet::BtMotionState
+class BaseObject < Bullet::BtMotionState
+  include Dispatcher  
+
   # object ID
   attr_accessor :id
   attr_accessor :name
@@ -15,11 +15,11 @@ class GardenObject < Bullet::BtMotionState
 
   attr_accessor :object_info
   attr_accessor :physics_info
-  attr_accessor :animation_info
 
-  attr_accessor :garden
+  attr_accessor :attached_objects
+
+  attr_accessor :manager
   attr_accessor :physics_object
-  attr_accessor :view_object
 
   MODE_FREE = 0
   MODE_ATTACHED = 1
@@ -28,47 +28,41 @@ class GardenObject < Bullet::BtMotionState
     super()
     @id = -1
     @mode = MODE_FREE
+    @attached_objects = Hash.new
 
-    @garden = nil
+    @manager = nil
     @physics_object = nil
-    @view_object = nil
-    @animation_info = Animation.new
+#    @animation_info = Animation.new
   end
 
   def finalize()
-    @view_object.finalize() if @view_object
+    notify(:finalize)
     @physics_object.finalize()
   end
 
   def set_activation_state(state)
     @physics_object.rigid_body.set_activation_state(state)
   end
-
-
+  
   # Set a position.
-  # 
+  #
   # ==== Args
   # [aPos: Vector3D] 
   def set_position(aPos)
-    
-#    @pivot_scene_node.set_position(aPos.x, aPos.y, aPos.z) unless @garden.is_server
     @physics_object.transform.set_origin(Bullet::BtVector3.new(aPos.x, aPos.y, aPos.z))
-    @physics_object.rigid_body.set_center_of_mass_transform(@physics_object.transform) if (@physics_object.rigid_body != nil)
-
-    # view
-    if (@view_object)
-      if (object_info.class == LightObjectInfo)
-        @view_object.entity.set_position(Vector3D.to_ogre(aPos))
-      else        
-        @view_object.pivot_scene_node.set_position(aPos.x, aPos.y, aPos.z)
-      end
+    if @physics_object.rigid_body != nil
+      @physics_object.rigid_body.set_center_of_mass_transform(@physics_object.transform) 
     end
+
+    notify(:set_position, aPos)
   end
 
   def set_position_with_interpolation(pos)
     ip_pos = (get_position() + Vector3D.to_bullet(pos)) / 2
     @physics_object.transform.set_origin(ip_pos)
-    @physics_object.rigid_body.set_center_of_mass_transform(@physics_object.transform) if (@physics_object.rigid_body != nil)
+    if @physics_object.rigid_body != nil
+      @physics_object.rigid_body.set_center_of_mass_transform(@physics_object.transform) 
+    end
   end
 
   # Set a linear velocity.
@@ -149,27 +143,16 @@ class GardenObject < Bullet::BtMotionState
   end
 
   def set_collision_filter(filter)
-    @garden.physics.dynamicsWorld.remove_rigid_body(@physics_object.rigid_body)
-    @garden.physics.dynamicsWorld.add_rigid_body(@physics_object.rigid_body, filter.group, filter.mask)
+    @manager.physics.dynamicsWorld.remove_rigid_body(@physics_object.rigid_body)
+    @manager.physics.dynamicsWorld.add_rigid_body(@physics_object.rigid_body, filter.group, filter.mask)
     physics_info.collisionFilter = filter
   end
 
   def set_world_transform(worldTrans)
-    @physics_object.transform = Bullet::BtTransform.new(worldTrans) if (@mode == MODE_FREE)
-
-    if (@view_object)
-      if (@mode == MODE_FREE)
-        newPos = @physics_object.transform.get_origin()
-        newRot = @physics_object.transform.get_rotation()
-        # puts "newRot(#{id}: #{newRot.x}, #{newRot.y}, #{newRot.z}, #{newRot.w})"
-        # puts "newPos(#{id}: #{newPos.x}, #{newPos.y}, #{newPos.z})"
-        
-        return if (newRot.x.nan?)
-        
-        @view_object.pivot_scene_node.set_position(newPos.x, newPos.y, newPos.z) 
-        @view_object.pivot_scene_node.set_orientation(newRot.w, newRot.x, newRot.y, newRot.z)
-      end
-    end
+#    @physics_object.transform = Bullet::BtTransform.new(worldTrans) if (@mode == MODE_FREE)
+    @physics_object.transform = Bullet::BtTransform.new(worldTrans)
+
+    notify(:set_world_transform, @physics_object.transform)
   end
 
   def get_world_transform(worldTrans)
@@ -263,16 +246,24 @@ class GardenObject < Bullet::BtMotionState
     transform.set_rotation(@newRot)
     @physics_object.rigid_body.set_center_of_mass_transform(transform)
 
-    if (@view_object)
-      @view_object.pivot_scene_node.set_orientation(Quaternion.to_ogre(@newRot))
-    end
+    notify(:set_rotation, @newRot)
   end
+
+  def attach_object_to_bone(bone_name, obj, 
+                            offset_quat = Quaternion.new(1, 0, 0, 0), 
+                            offset_pos = Vector3D.new(0, 0, 0))
+
+    attached_objects[bone_name] = AttachmentInfo.new(bone_name, obj.name, offset_quat, offset_pos)
+    obj.mode = MODE_ATTACHED
+  end
+
+
   
 =begin
   def attach_object_to_bone(boneName, obj)
     obj.scene_node.detach_object(obj.entity)
     tag = @entity.attach_object_to_bone(boneName, obj.entity)
-    @garden.physics.dynamics_world.remove_rigid_body(obj.rigid_body)
+    @manager.physics.dynamics_world.remove_rigid_body(obj.rigid_body)
     obj.mode = MODE_ATTACHED
     return tag
   end
@@ -281,11 +272,11 @@ class GardenObject < Bullet::BtMotionState
     @entity.detach_object_from_bone(obj.entity)
     obj.scene_node.attach_object(obj.entity)
     if obj.physics_info.collision_filter
-      @garden.physics.dynamics_world.add_rigid_body(obj.rigid_body, 
+      @manager.physics.dynamics_world.add_rigid_body(obj.rigid_body, 
                                                     obj.physics_info.collision_filter.group,
                                                     obj.physics_info.collision_filter.mask)
     else
-      @garden.physics.dynamics_world.add_rigid_body(obj.rigid_body)
+      @manager.physics.dynamics_world.add_rigid_body(obj.rigid_body)
     end
     obj.mode = MODE_FREE
   end

data/lib/teien/{event.rb → base_object/base_object_event.rb}

@@ -1,12 +1,6 @@
+module Teien
 module Event
-
-# event
-
-class ClientConnected
-end
-
-class ClientUnbinded
-end
+module BaseObject
 
 class SyncEnv
   attr_accessor :gravity
@@ -27,7 +21,6 @@ class SyncObject
 
   attr_accessor :object_info
   attr_accessor :physics_info
-  attr_accessor :animation_info
 
   attr_accessor :pos
   attr_accessor :linear_vel
@@ -35,6 +28,7 @@ class SyncObject
   attr_accessor :quat
   attr_accessor :accel
 
+  attr_accessor :attached_objects
 
   def initialize(obj)
     @id = obj.id
@@ -42,13 +36,15 @@ class SyncObject
 
     @object_info = obj.object_info
     @physics_info = obj.physics_info
-    @animation_info = obj.animation_info
 
     @pos = Vector3D.to_self(obj.get_position())
     @linear_vel = Vector3D.to_self(obj.get_linear_velocity())
     @angular_vel = Vector3D.to_self(obj.get_angular_velocity())
     @quat = Quaternion.to_self(obj.get_rotation())
     @accel = obj.get_acceleration()
+
+    @attached_objects = obj.attached_objects
+
   end
 
   def print
@@ -56,5 +52,6 @@ class SyncObject
   end
 end
 
-
-end # module Event
+end
+end
+end

data/lib/teien/base_object/base_object_manager.rb

@@ -0,0 +1,57 @@
+require "teien/base_object/base_object_manager_base.rb"
+require "teien/core/network.rb"
+require "teien/base_object/base_object_event.rb"
+
+module Teien
+
+class BaseObjectManager < BaseObjectManagerBase
+  def initialize(event_router, sync_period)
+    super(event_router)
+    @sync_period = sync_period
+    @sync_timer = sync_period
+  end
+
+  # EventRouter handler
+  def setup()
+    
+    @physics.setup(self)
+  end
+
+  # EventRouter handler
+  def update(delta)
+    @physics.update(delta)
+
+    @sync_timer += delta
+    if (@sync_timer > @sync_period)
+      notify_objects()
+      @sync_timer = 0
+    end
+
+    return !@quit
+  end
+
+  # EventRouter handler
+  def connection_binded(from)
+    event = Event::BaseObject::SyncEnv.new(@gravity, @ambient_light_color, @sky_dome)
+    @event_router.send_event(event, from)
+    notify_objects(from)
+  end
+
+  def notify_objects(to = nil)
+    @objects.each_value { |obj|
+      if to
+        to.send_object(Event::BaseObject::SyncObject.new(obj))
+      else
+        @event_router.send_event(Event::BaseObject::SyncObject.new(obj))
+      end
+    }
+  end
+
+  def finalize()
+    @physics.finalize()
+    @objects = {}
+  end
+
+end
+
+end

data/lib/teien/{garden_base.rb → base_object/base_object_manager_base.rb}

@@ -1,24 +1,21 @@
-require "teien/garden_object.rb"
-require "teien/sky_dome.rb"
-require "teien/physics.rb"
-#require "teien/user_interface.rb"
-#require "teien/event_router.rb"
-require "teien/dispatcher.rb"
-
-require "eventmachine"
-require "teien/network.rb"
+require 'teien/base_object/object_info'
+require 'teien/base_object/physics_info'
+require "teien/base_object/physics_object_factory"
+require "teien/base_object/base_object"
+require "teien/base_object/sky_dome"
+require "teien/base_object/physics"
 
 module Teien
 
 # This is a top object of 3D world.
-class GardenBase
+class BaseObjectManagerBase
   include Dispatcher
 
   attr_accessor :resources_cfg
   attr_accessor :plugins_cfg
+
   attr_accessor :physics
   attr_accessor :objects
-  attr_accessor :actors
 
   attr_accessor :gravity
   attr_accessor :ambient_light_color
@@ -26,21 +23,24 @@ class GardenBase
   #
   # _script_klass_:: : set a user define class.
   # 
-  def initialize()
+  def initialize(event_router)
     super()
 
-    @physics = Physics.new()
-    @actors = Hash.new()
+    puts "initialize base_object_manager_base"
 
-    @resources_cfg = nil
-    @plugins_cfg = nil
+    @event_router = event_router
+    @event_router.register_receiver(self)
+
+    @physics = Physics.new()
 
     @objects = {}
     @object_num = 0
 
-    @debug_draw = false
     @quit = false
-    @last_time = 0
+    @debug_draw = false
+
+    @resources_cfg = nil
+    @plugins_cfg = nil
 
     # environment value
     @gravity = nil
@@ -73,18 +73,18 @@ class GardenBase
     notify(:set_sky_dome, enable, materialName, curvature, tiling, distance)
   end
 
-  def create_object(name, object_info, physics_info)
+  def create_object(name, object_info, physics_info = nil)
     if (@objects[name])
       #raise RuntimeError, "There is a object with the same name (#{obj.name})"
       puts "There is a object with the same name (#{name})"
       return @objects[name]
     else
-      obj = GardenObject.new()
+      obj = BaseObject.new()
       obj.name = name
       obj.object_info = object_info
       obj.physics_info = physics_info
 
-      obj.garden = @garden
+      obj.manager = self
       @objects[obj.name] = obj
       obj.id = @object_num
       @object_num += 1
@@ -94,21 +94,12 @@ class GardenBase
     end
   end
 
-  def add_actor(actor)
-    if (@actors[actor.name] == nil)
-      actors[name] = actor
-      notify(:add_actor, actor)
-    else
-      raise RuntimeError, "There is an actor with the same name (#{actor.name})"
-    end
-  end
-
   def check_collision(objectA, objectB)
     result = @physics.contact_pair_test(objectA.rigid_body, objectB.rigid_body)
     return result.collided?()
   end
 
-  # quit the current running garden.
+  # quit the current running process.
   def quit()
     @quit = true
   end

data/lib/teien/{proxy_garden.rb → base_object/base_object_manager_proxy.rb}

@@ -1,88 +1,45 @@
-require "teien/garden_base.rb"
+require "teien/base_object/base_object_manager_base"
+require "teien/core/network.rb"
+require "teien/base_object/base_object_event.rb"
 
 module Teien
 
-class ProxyGarden < GardenBase
-  attr_accessor :view
-  attr_accessor :ui
-
-  def initialize()
-    super
-  end
-
-  def set_window_title(title)
-    @view.window_title = title
+class BaseObjectManagerProxy < BaseObjectManagerBase
+  def initialize(event_router)
+    super(event_router)
+    @quit = false
   end
 
-  #
-  # mainloop
-  #
-  def run(ip = nil, port = 11922)
-    return false unless setup()
-
-    EM.run do
-      EM.add_periodic_timer(0.001) do
-        @last_time = Time.now.to_f if @last_time == 0
-
-        now_time = Time.now.to_f
-        delta = now_time - @last_time
-        @last_time = now_time
-
-        unless update(delta)
-          EM.stop
-          self.finalize()
-        end
-      end
-
-      Signal.trap("INT")  { EM.stop; self.finalize() }
-      Signal.trap("TERM") { EM.stop; self.finalize() }
-
-      if (ip)
-        EM.connect(ip, port, Network, self)
-      end
-    end
-  end    
-
+  # EventRouter handler
   def setup()
     @physics.setup(self)
-    notify(:setup, self)
     return true
   end
 
+  # EventRouter handler
   def update(delta)
     @physics.update(delta)
-    @actors.each_value {|actor|
-      actor.update(delta)
-    }
-    notify(:update, delta)
     return !@quit
   end
 
+  # EventRouter handler
   def receive_event(event, from)
+
+    # There was a case which this manager gets a new sync packet 
+    # after finalizing.
+    return if @quit
+      
     case event
-    when Event::SyncEnv
-#      puts "SyncEnv"
+    when Event::BaseObject::SyncEnv
       set_gravity(event.gravity)
       set_ambient_light(event.ambient_light_color)
       set_sky_dome(event.sky_dome.enable, event.sky_dome.materialName)
-    when Event::SyncObject
+    when Event::BaseObject::SyncObject
       if @objects[event.name]
-#        puts "sync"
         sync_object_with_event(event, @objects[event.name])
       else
-#        puts "add"
         create_object_from_event(event)
       end
-
-    end
-    notify(:receive_event, event, from)    
-  end
-
-  def send_event(event, to = nil)
-    if (to)
-      to.send_object(event)
-    else
-      Network::send_all(event)
     end
   end
 
@@ -93,7 +50,7 @@ class ProxyGarden < GardenBase
     obj.set_angular_velocity(event.angular_vel)
     obj.set_rotation(event.quat)
     obj.set_acceleration(event.accel)
-#    obj.animation_info = event.animation_info
+    obj.attached_objects  = event.attached_objects
   end
 
   def sync_object_with_event(event, obj)
@@ -104,7 +61,7 @@ class ProxyGarden < GardenBase
     obj.set_angular_velocity_with_interpolation(event.angular_vel)
     obj.set_rotation(event.quat)
     obj.set_acceleration(event.accel)
- #   obj.animation_info = event.animation_info
+    obj.attached_objects  = event.attached_objects
   end
 
   # called by Garden class.
@@ -112,6 +69,7 @@ class ProxyGarden < GardenBase
   def finalize()
     @physics.finalize()
     @objects = {}
+    @quit = true
   end
 end
 

data/lib/teien/base_object/object_info.rb

@@ -0,0 +1,21 @@
+module Teien
+
+class ObjectInfo
+  attr_accessor :use_physics
+
+  def initialize()
+    @use_physics = false
+  end
+end
+
+require_relative "std_objects/light_object_info"
+require_relative "std_objects/floor_object_info"
+require_relative "std_objects/mesh_bb_object_info"
+require_relative "std_objects/mesh_object_info"
+require_relative "std_objects/box_object_info"
+require_relative "std_objects/sphere_object_info"
+require_relative "std_objects/capsule_object_info"
+require_relative "std_objects/cone_object_info"
+require_relative "std_objects/cylinder_object_info"
+
+end

data/lib/teien/{physics.rb → base_object/physics.rb}

@@ -1,4 +1,4 @@
-require "teien/physics_object_factory.rb"
+require "teien/base_object/physics_object_factory.rb"
 
 module Teien
 
@@ -33,7 +33,6 @@ class Physics < Bullet::TickListener
   def initialize()
     super()
 
-    @object_factory = PhysicsObjectFactory.new(self)
     @rigid_bodies = []
 
     @max_sub_steps = 1
@@ -86,10 +85,10 @@ class Physics < Bullet::TickListener
   end
 
   def add_physics_object(obj)
-    obj.physics_object = @object_factory.create_object(obj)
+    obj.physics_object = PhysicsObjectFactory::create_object(obj, self)
 
-    if (obj.physics_object.rigid_body != nil && 
-        obj.object_info.class != LightObjectInfo)
+    if (obj.object_info.use_physics &&
+        obj.physics_object.rigid_body != nil)
       
       if (obj.physics_info.collision_filter)
         add_rigid_body(obj.physics_object.rigid_body, 

data/lib/teien/{physics_info.rb → base_object/physics_info.rb}

@@ -20,4 +20,5 @@ class PhysicsInfo
   end
 end
 
+
 end

data/lib/teien/base_object/physics_object_factory.rb

@@ -0,0 +1,23 @@
+require 'teien/base_object/base_object'
+
+module Teien
+
+class PhysicsObjectFactory
+  @creators = Hash.new
+
+  def self.create_object(obj, physics)
+    if @creators[obj.object_info.class] != nil
+      return @creators[obj.object_info.class].call(obj, physics)
+    else
+      puts "no such class: #{obj.object_info.class}"
+      return nil
+    end
+  end
+
+  def self.set_creator(info_klass, creator)
+    @creators[info_klass] = creator
+  end
+end
+
+
+end

data/lib/teien/base_object/std_objects/box_object_info.rb

@@ -0,0 +1,42 @@
+require_relative "../physics_object_factory"
+
+module Teien
+
+class BoxObjectInfo < ObjectInfo
+  attr_accessor :size
+  attr_accessor :num_seg_x
+  attr_accessor :num_seg_y
+  attr_accessor :num_seg_z
+  attr_accessor :u_tile
+  attr_accessor :v_tile
+  attr_accessor :material_name
+
+  def initialize(size, num_seg_x = 1, num_seg_y = 1, num_seg_z = 1, u_tile = 1.0, v_tile = 1.0)
+    super()
+    @size = size
+    @num_seg_x = num_seg_x
+    @num_seg_y = num_seg_y
+    @num_seg_z = num_seg_z
+    @u_tile   = u_tile
+    @v_tile   = v_tile
+    @material_name = nil
+  end
+
+  def self.create_physics_object(obj, physics)
+    physics_object = PhysicsObject.new(physics)
+    cShape = Bullet::BtBoxShape.new(Vector3D.new(obj.object_info.size.x, 
+                                                 obj.object_info.size.y, 
+                                                 obj.object_info.size.z))
+    inertia = Bullet::BtVector3.new()
+    cShape.calculate_local_inertia(obj.physics_info.mass, inertia)
+    physics_object.set_rigid_body(obj, cShape, inertia)
+
+    obj.object_info.use_physics = true
+
+    return physics_object
+  end
+
+  PhysicsObjectFactory::set_creator(self, self.method(:create_physics_object))
+end
+
+end

data/lib/teien/base_object/std_objects/capsule_object_info.rb

@@ -0,0 +1,44 @@
+require_relative "../physics_object_factory"
+
+module Teien
+
+class CapsuleObjectInfo < ObjectInfo
+  attr_accessor :radius
+  attr_accessor :height
+  attr_accessor :num_rings
+  attr_accessor :num_segments
+  attr_accessor :num_seg_height
+  attr_accessor :u_tile
+  attr_accessor :v_tile
+  attr_accessor :material_name
+
+  def initialize(radius, height, num_rings = 8, num_segments = 16, num_seg_height = 1, u_tile = 1.0, v_tile = 1.0)
+    super()
+    @radius = radius
+    @height = height
+    @num_rings = num_rings
+    @num_segments = num_segments
+    @num_seg_height = num_seg_height
+    @u_tile = u_tile
+    @v_tile = v_tile
+    @material_name = nil
+  end
+
+  def self.create_physics_object(obj, physics)
+    physics_object = PhysicsObject.new(physics)
+    cShape = Bullet::BtCapsuleShape.new(obj.object_info.radius, 
+                                        obj.object_info.height)
+    inertia = Bullet::BtVector3.new()
+    cShape.calculate_local_inertia(obj.physics_info.mass, inertia)
+    physics_object.set_rigid_body(obj, cShape, inertia)
+
+    obj.object_info.use_physics = true
+
+    return physics_object
+  end
+
+  PhysicsObjectFactory::set_creator(self, self.method(:create_physics_object))
+end
+
+
+end