ruby-bullet 0.0.2-x86-linux → 0.0.3-x86-linux

data/bindings/bullet/interface/bullet_wrap.h

@@ -16,31 +16,31 @@ namespace Swig {
 }
 
 
-class SwigDirector_btMotionState : public btMotionState, public Swig::Director {
+class SwigDirector_BtMotionState : public btMotionState, public Swig::Director {
 
 public:
-    SwigDirector_btMotionState(VALUE self);
-    virtual ~SwigDirector_btMotionState();
+    SwigDirector_BtMotionState(VALUE self);
+    virtual ~SwigDirector_BtMotionState();
     virtual void getWorldTransform(btTransform &worldTrans) const;
     virtual void setWorldTransform(btTransform const &worldTrans);
 };
 
 
-struct SwigDirector_btDefaultMotionState : public btDefaultMotionState, public Swig::Director {
+struct SwigDirector_BtDefaultMotionState : public btDefaultMotionState, public Swig::Director {
 
 public:
-    SwigDirector_btDefaultMotionState(VALUE self, btTransform const &startTrans = btTransform::getIdentity(), btTransform const &centerOfMassOffset = btTransform::getIdentity());
-    virtual ~SwigDirector_btDefaultMotionState();
+    SwigDirector_BtDefaultMotionState(VALUE self, btTransform const &startTrans = btTransform::getIdentity(), btTransform const &centerOfMassOffset = btTransform::getIdentity());
+    virtual ~SwigDirector_BtDefaultMotionState();
     virtual void getWorldTransform(btTransform &centerOfMassWorldTrans) const;
     virtual void setWorldTransform(btTransform const &centerOfMassWorldTrans);
 };
 
 
-class SwigDirector_btIDebugDraw : public btIDebugDraw, public Swig::Director {
+class SwigDirector_BtIDebugDraw : public btIDebugDraw, public Swig::Director {
 
 public:
-    SwigDirector_btIDebugDraw(VALUE self);
-    virtual ~SwigDirector_btIDebugDraw();
+    SwigDirector_BtIDebugDraw(VALUE self);
+    virtual ~SwigDirector_BtIDebugDraw();
     virtual void drawLine(btVector3 const &from, btVector3 const &to, btVector3 const &color);
     virtual void drawLine(btVector3 const &from, btVector3 const &to, btVector3 const &fromColor, btVector3 const &toColor);
     virtual void drawSphere(btScalar radius, btTransform const &transform, btVector3 const &color);

data/lib/bullet_config.rb

@@ -0,0 +1,28 @@
+class BulletConfig
+  def self.get_top_dir
+    File.dirname(File.dirname(File.expand_path(__FILE__)))
+  end
+
+  def self.get_deps_lib_path
+    "#{get_top_dir()}/deps/lib"
+  end
+
+  def self.get_deps_inc_path
+    "#{get_top_dir()}/deps/include/bullet/"
+  end
+
+  def self.get_inc_flags
+    " -I#{get_top_dir()}/deps/include/bullet/ " +     
+    " -I#{get_top_dir()}/deps/include/bullet/LinearMath/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletCollision/CollisionDispatch/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletCollision/BroadphaseCollision/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletCollision/NarrowPhaseCollision/ " +
+    " -I#{get_top_dir()}/deps/include/bullet/BulletCollision/CollisionShapes/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletCollision/Gimpact/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletDynamics/ConstraintSolver/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletDynamics/Dynamics/ " +
+    " -I#{get_top_dir()}/deps/include/bullet/BulletDynamics/Vehicle/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletDynamics/Character/ " + 
+    " -I#{get_top_dir()}/deps/include/bullet/BulletSoftBody/ "
+  end
+end

data/lib/{Version.rb → version.rb}

@@ -1,5 +1,5 @@
 module Ruby
   module Bullet
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/sample/hello_bullet/{HelloBullet.rb → hello_bullet.rb}

@@ -1,7 +1,8 @@
-# -*- coding: utf-8 -*-
+$LOAD_PATH.push(File.dirname(File.expand_path(__FILE__)) + "/../../lib")
+
 require 'gtk2'
 require 'cairo'
-require "Bullet.so"
+require "bullet.so"
 
 class Physics
   attr_accessor :context
@@ -21,16 +22,16 @@ class Physics
     @dynamicsWorld = Bullet::BtDiscreteDynamicsWorld.new(@collisionDispatcher, @gardenAabbCache,
                                                          @solver, @collisionConfig)
     gravity = Bullet::BtVector3.new(0.0, 9.8, 0.0)
-    @dynamicsWorld.setGravity(gravity)
+    @dynamicsWorld.set_gravity(gravity)
 
     @objects = []
 
     @lastTime = -1
   end
 
-  def addObject(obj)
+  def add_object(obj)
     @objects.push(obj)
-    @dynamicsWorld.addRigidBody(obj.rigidBody)
+    @dynamicsWorld.add_rigid_body(obj.rigidBody)
   end
 
   def update(context)
@@ -42,7 +43,7 @@ class Physics
     @lastTime = nowTime
 
     # step 
-    @dynamicsWorld.stepSimulation(delta)
+    @dynamicsWorld.step_simulation(delta)
 
     @objects.each {|obj|
       obj.draw(context)
@@ -65,38 +66,38 @@ class Box < Bullet::BtMotionState
 
     # position/rotation
     @transform = Bullet::BtTransform.new()
-    @transform.setIdentity()
+    @transform.set_identity()
 
     # create a physics object.
     @colObj = Bullet::BtBoxShape.new(Bullet::BtVector3.new(width / 2, height / 2, width / 2))
     inertia = Bullet::BtVector3.new()
-    @colObj.calculateLocalInertia(mass, inertia)
+    @colObj.calculate_local_inertia(mass, inertia)
 
     @rigidBody = Bullet::BtRigidBody.new(mass, self, @colObj, inertia)
-    @rigidBody.setAngularFactor(Bullet::BtVector3.new(0, 0, 1)) # rotate around z-axis only becase of 2D.
+    @rigidBody.set_angular_factor(Bullet::BtVector3.new(0, 0, 1)) # rotate around z-axis only becase of 2D.
   end
 
-  def setWorldTransform(worldTrans)
+  def set_world_transform(worldTrans)
     @transform = Bullet::BtTransform.new(worldTrans)
   end
 
-  def getWorldTransform(worldTrans)
+  def get_world_transform(worldTrans)
   end
 
-  def setPosition(x, y)
-    @transform.setOrigin(Bullet::BtVector3.new(x, y, 0.0))
-    @rigidBody.setCenterOfMassTransform(@transform)
+  def set_position(x, y)
+    @transform.set_origin(Bullet::BtVector3.new(x, y, 0.0))
+    @rigidBody.set_center_of_mass_transform(@transform)
   end    
 
   def draw(context)
-    newPos = @transform.getOrigin()
-    newRot = @transform.getRotation()
+    newPos = @transform.get_origin()
+    newRot = @transform.get_rotation()
 
     lt = Bullet::BtVector3.new(-@width / 2, -@height / 2, 0)
     lb = Bullet::BtVector3.new(-@width / 2, @height / 2 , 0)
 
-    lt = Bullet::quatRotate(newRot, lt)
-    lb = Bullet::quatRotate(newRot, lb)
+    lt = Bullet::quat_rotate(newRot, lt)
+    lb = Bullet::quat_rotate(newRot, lb)
     rb = -lt
     rt = -lb
     
@@ -121,15 +122,15 @@ id = 0
 11.times {|x|
   5.times {|y|
     box = Box.new(physics, 1.0, 10, 10, 'sky blue')
-    box.setPosition(100 + 10 * x, 50 - 10 * y)
-    physics.addObject(box)
+    box.set_position(100 + 10 * x, 50 - 10 * y)
+    physics.add_object(box)
   }
 }
 
 # floor
 floor = Box.new(physics, 0, 100, 5, 'gray')
-floor.setPosition(150, 200)
-physics.addObject(floor)
+floor.set_position(150, 200)
+physics.add_object(floor)
 
 
 ## create a drawing window.
@@ -150,8 +151,8 @@ drawing_area.signal_connect("expose-event") do |widget, event|
   # create a new box per 3sec.
   if (delta > 3.0) 
     box = Box.new(physics, 1.0, 10, 10, 'orange')
-    box.setPosition(125 + (physics.objects.length % 10) * 5, 0)
-    physics.addObject(box)
+    box.set_position(125 + (physics.objects.length % 10) * 5, 0)
+    physics.add_object(box)
     delta = 0
   end
   true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bullet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: x86-linux
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies: []
 description: This is a binary package of the ruby wrapper of Bullet.
 email:
@@ -197,13 +197,13 @@ files:
 - bindings/bullet/interface/BulletCollision/CollisionShapes/btCollisionShape.i
 - bindings/bullet/interface/BulletCollision/CollisionShapes/btMaterial.i
 - bindings/bullet/interface/BulletCollision/CollisionShapes/btConvexInternalShape.i
-- bindings/bullet/interface/Makefile
+- bindings/bullet/interface/Rakefile
 - bindings/bullet/interface/bullet_all.i
 - bindings/bullet/src/TickListener.h
-- lib/Version.rb
-- lib/Bullet.so
-- lib/BulletConfig.rb
-- sample/hello_bullet/HelloBullet.rb
+- lib/bullet_config.rb
+- lib/version.rb
+- lib/bullet.so
+- sample/hello_bullet/hello_bullet.rb
 - deps/lib/libBulletMultiThreaded.a
 - deps/lib/libBulletSoftBody.a
 - deps/lib/libBulletCollision.a

data/bindings/bullet/interface/Makefile

@@ -1,19 +0,0 @@
-.PHONY: clean
-
-SWIG = swig
-DEPS_DIR = ../../../deps/
-
-include ../../../deps/env.mk
-
-SWIGFLAGS = -ruby -c++ -w801 $(BULLET_INC) -I../src
-RUBY = ruby
-
-TARGET = bullet_wrap.cpp
-
-all: $(TARGET)
-
-$(TARGET): bullet.i
-	$(SWIG) $(SWIGFLAGS) -o $@ $<
-
-clean:
-	@rm -f $(TARGET)

data/lib/BulletConfig.rb

@@ -1,28 +0,0 @@
-class BulletConfig
-  def self.getTopDir
-    File.dirname(File.dirname(File.expand_path(__FILE__)))
-  end
-
-  def self.getDepsLibPath
-    "#{getTopDir()}/deps/lib"
-  end
-
-  def self.getDepsIncPath
-    "#{getTopDir()}/deps/include/bullet/"
-  end
-
-  def self.getIncFlags
-    " -I#{getTopDir()}/deps/include/bullet/ " +     
-    " -I#{getTopDir()}/deps/include/bullet/LinearMath/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletCollision/CollisionDispatch/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletCollision/BroadphaseCollision/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletCollision/NarrowPhaseCollision/ " +
-    " -I#{getTopDir()}/deps/include/bullet/BulletCollision/CollisionShapes/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletCollision/Gimpact/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletDynamics/ConstraintSolver/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletDynamics/Dynamics/ " +
-    " -I#{getTopDir()}/deps/include/bullet/BulletDynamics/Vehicle/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletDynamics/Character/ " + 
-    " -I#{getTopDir()}/deps/include/bullet/BulletSoftBody/ "
-  end
-end