bvh 1.0.0 → 1.0.1

data/ext/bvh/Makefile

@@ -4,65 +4,86 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /c/ruby186-mingw/lib/ruby/1.8/i386-mingw32
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-
-DESTDIR = c:
-prefix = $(DESTDIR)/ruby186-mingw
+topdir = /Users/colin/.rvm/rubies/ruby-1.9.2-p0/include/ruby-1.9.1
+hdrdir = /Users/colin/.rvm/rubies/ruby-1.9.2-p0/include/ruby-1.9.1
+arch_hdrdir = /Users/colin/.rvm/rubies/ruby-1.9.2-p0/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/colin/.rvm/rubies/ruby-1.9.2-p0
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
-sitedir = $(exec_prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
 htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
 infodir = $(datarootdir)/info
-sysconfdir = $(prefix)/etc
-mandir = $(datarootdir)/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
+docdir = $(datarootdir)/doc/$(PACKAGE)
 oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
+includedir = $(prefix)/include
 localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
 CC = gcc
-LIBRUBY = lib$(LIBRUBY_SO).a
+CXX = g++
+LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -g -O2  
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long
+CFLAGS   = -fno-common $(cflags)  -fno-common -pipe 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =   $(DEFS)
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
-LDSHARED = gcc -shared -s
+CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L/usr/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
 AR = ar
-EXEEXT = .exe
+EXEEXT = 
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = msvcrt-ruby18
-arch = i386-mingw32
-sitearch = i386-msvcrt
-ruby_version = 1.8
-ruby = c:/ruby186-mingw/bin/ruby
+RUBY_SO_NAME = ruby.1.9.1
+arch = x86_64-darwin10.4.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /Users/colin/.rvm/rubies/ruby-1.9.2-p0/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /bin/install -c
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+MAKEDIRS = /opt/local/bin/gmkdir -p
+INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
 COPY = cp
@@ -77,44 +98,58 @@ DEFFILE =
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lshell32 -lws2_32  
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
 SRCS = bvh.c bvh_parser.c
 OBJS = bvh.o bvh_parser.o
-TARGET = bvh
-DLLIB = $(TARGET).so
+TARGET = bvh_c
+DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS)
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
@@ -126,24 +161,27 @@ site-install: site-install-so site-install-rb
 site-install-so: install-so
 site-install-rb: install-rb
 
-.SUFFIXES: .c .m .cc .cxx .cpp .o
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
+	@-$(RM) $(@)
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/bvh/bvh.c

@@ -1,10 +1,10 @@
-#include "bvh.h"
-
-VALUE rb_cBvh = Qnil;
-
-void Init_bvh()
-{
-    rb_cBvh = rb_define_class("Bvh", rb_cObject);
-
-    bvh_init_parser();
-}
+#include "bvh.h"
+
+VALUE rb_cBvh = Qnil;
+
+void Init_bvh_c()
+{
+    rb_cBvh = rb_define_class("Bvh", rb_cObject);
+
+    bvh_init_parser();
+}

data/ext/bvh/bvh.h

@@ -1,10 +1,18 @@
-#ifndef BVH_EXT_H
-#define BVH_EXT_H
-
-#include "ruby.h"
-
-extern void bvh_init_parser();
-
-extern VALUE rb_cBvh;
-
-#endif//BVH_EXT_H
+#ifndef BVH_EXT_H
+#define BVH_EXT_H
+
+#include "ruby.h"
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(x) RArray(x)->ptr
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(x) RArray(x)->len
+#endif
+
+extern void bvh_init_parser();
+
+extern VALUE rb_cBvh;
+
+#endif//BVH_EXT_H

data/ext/bvh/bvh_parser.c

@@ -1,63 +1,65 @@
-#include "bvh.h"
-
-static VALUE rb_fParseChannelData(VALUE self, VALUE channels, VALUE bone);
-
-static VALUE rb_cBvhParser = Qnil;
-static VALUE rb_cMotion = Qnil;
-static VALUE rb_cChannelData = Qnil;
-
-void bvh_init_parser()
-{
-    rb_cBvhParser = rb_define_class_under(rb_cBvh, "Parser", rb_cObject);
-    rb_cMotion = rb_define_class_under(rb_cBvh, "Motion", rb_cObject);
-    rb_cChannelData = rb_define_class_under(rb_cMotion, "ChannelData", rb_cHash);
-
-    rb_define_private_method(rb_cBvhParser, "channel_data", rb_fParseChannelData, 2);
-}
-
-static void debug(const char *text)
-{
-    rb_funcall(rb_cObject, rb_intern("puts"), rb_str_new2(text));
-}
-
-static VALUE rb_fParseChannelData(VALUE self, VALUE channels, VALUE bone)
-{
-    char buf[256];
-    
-    VALUE data;
-    struct RArray *rchannels, *joints;
-    long i;
-    VALUE channel, joint;
-    VALUE r = rb_ary_new();
-
-    // return [] unless bone.respond_to? :channels
-    if (!rb_respond_to(bone, rb_intern("channels")))
-        return r;
-
-    // data = Bvh::Motion::ChannelData.new(bone)
-    data = rb_funcall(rb_cChannelData, rb_intern("new"), 1, bone);
-
-    // bone.channels.each { |channel| data[channel] = channels.shift }
-    rchannels = RARRAY(rb_funcall(bone, rb_intern("channels"), 0));
-    for (i = 0; i < rchannels->len; i++)
-    {
-        channel = *(rchannels->ptr+i);
-        //... data[channel] = channels.shift ...
-        rb_hash_aset(data, channel, rb_funcall(channels, rb_intern("shift"), 0));
-    }
-
-    // r = [data]
-    rb_ary_push(r, data);
-
-    // bone.joints.each { |joint| r.concat channel_data(channels, joint) }
-    joints = RARRAY(rb_funcall(bone, rb_intern("joints"), 0));
-    for (i = 0; i < joints->len; i++)
-    {
-        joint = *(joints->ptr+i);
-        // ... r.concat(channel_data(channels, joint)) ...
-        rb_funcall(r, rb_intern("concat"), 1, rb_fParseChannelData(self, channels, joint));
-    }
-
-    // r
-    return r;
-}
+#include "bvh.h"
+
+static VALUE rb_fParseChannelData(VALUE self, VALUE channels, VALUE bone);
+
+static VALUE rb_cBvhParser = Qnil;
+static VALUE rb_cMotion = Qnil;
+static VALUE rb_cChannelData = Qnil;
+
+void bvh_init_parser()
+{
+    rb_cBvhParser = rb_define_class_under(rb_cBvh, "Parser", rb_cObject);
+    rb_cMotion = rb_define_class_under(rb_cBvh, "Motion", rb_cObject);
+    rb_cChannelData = rb_define_class_under(rb_cMotion, "ChannelData", rb_cHash);
+
+    rb_define_private_method(rb_cBvhParser, "channel_data", rb_fParseChannelData, 2);
+}
+
+static void debug(const char *text)
+{
+    rb_funcall(rb_cObject, rb_intern("puts"), rb_str_new2(text));
+}
+
+static VALUE rb_fParseChannelData(VALUE self, VALUE channels, VALUE bone)
+{
+    char buf[256];
+    
+    VALUE data;
+    //struct RArray *rchannels, *joints;
+    VALUE rchannels, joints;
+    long i;
+    VALUE channel, joint;
+    VALUE r = rb_ary_new();
+
+    // return [] unless bone.respond_to? :channels
+    if (!rb_respond_to(bone, rb_intern("channels")))
+        return r;
+
+    // data = Bvh::Motion::ChannelData.new(bone)
+    data = rb_funcall(rb_cChannelData, rb_intern("new"), 1, bone);
+
+    // bone.channels.each { |channel| data[channel] = channels.shift }
+    //rchannels = RARRAY(rb_funcall(bone, rb_intern("channels"), 0));
+    rchannels = rb_funcall(bone, rb_intern("channels"), 0);
+    for (i = 0; i < RARRAY_LEN(rchannels); i++)
+    {
+        channel = *(RARRAY_PTR(rchannels)+i);
+        //... data[channel] = channels.shift ...
+        rb_hash_aset(data, channel, rb_funcall(channels, rb_intern("shift"), 0));
+    }
+
+    // r = [data]
+    rb_ary_push(r, data);
+
+    // bone.joints.each { |joint| r.concat channel_data(channels, joint) }
+    joints = rb_funcall(bone, rb_intern("joints"), 0);
+    for (i = 0; i < RARRAY_LEN(joints); i++)
+    {
+        joint = *(RARRAY_PTR(joints)+i);
+        // ... r.concat(channel_data(channels, joint)) ...
+        rb_funcall(r, rb_intern("concat"), 1, rb_fParseChannelData(self, channels, joint));
+    }
+
+    // r
+    return r;
+}

data/ext/bvh/extconf.rb

@@ -1,4 +1,4 @@
-require 'mkmf'
-
-dir_config('bvh')
-create_makefile('bvh')
+require 'mkmf'
+
+dir_config('bvh')
+create_makefile('bvh_c')

data/lib/bvh.rb

@@ -1,74 +1,74 @@
-require 'bvh.so'
-require 'bvh/matrix'
-require 'bvh/motion'
-require 'bvh/motion/channel_data'
-require 'bvh/motion/frame'
-require 'bvh/skeleton'
-require 'bvh/parser'
-require 'bvh/exporter'
-
-
-class Bvh
-  # The array of skeletons associated with this BVH.
-  attr_reader :skeletons
-
-  # The motion capture data associated with this BVH.
-  attr_reader :motion
-
-  def initialize
-    @motion = Bvh::Motion.new
-    @skeletons = []
-  end
-
-  # Assigns the root bone in #skeleton
-  def root=(a); skeleton.root = a; end
-
-  # Returns the root bone in #skeleton
-  def root; skeleton.root; end
-
-  # Returns the frame data associated with this BVH file.
-  def frames; motion.frames; end
-
-  # Returns the last frame associated with this animation.
-  def last_frame; frames.last; end
-
-  # Returns the amount of time, in seconds, each frame occupies. Most BVH files have this set to
-  # 0.333333, which is equal to 30 frames per second.
-  def frame_time; motion.frame_time; end
-
-  # Sets the amount of time, in seconds, each frame occupies. Most BVH files have this set to
-  # 0.333333, which is equal to 30 frames per second.
-  def frame_time=(a); motion.frame_time = a; end
-
-  # Returns the frames per second calculated by (1 / frame_time)
-  def frames_per_second; motion.frames_per_second; end
-
-  # Assigns the frame_time by calculating it from (1 / frames_per_second)
-  def frames_per_second=(a); motion.frames_per_second = a; end
-
-  # Returns the number of frames in the motion capture data.
-  def frame_count; motion.frame_count; end
-
-  # Returns the first (and usually the only) skeleton in the #skeletons array.
-  def skeleton; @skeletons.first; end
-
-  # Creates a new skeleton, adds it to the #skeletons array, and returns it.
-  def create_skeleton!; (@skeletons << Bvh::Skeleton.new).last; end
-
-  class << self
-    # Instantiates a new BVH and imports its data from the specified file
-    def import(file)
-      bvh = self.new
-      parser = Bvh::Parser.new(file)
-      parser.parse(bvh)
-      bvh
-    end
-  end
-
-  # Exports this BVH into the specified file.
-  def export(file)
-    exporter = Bvh::Exporter.new(file)
-    exporter.export(self)
-    self
-  end
-end
+require 'bvh_c'
+require 'bvh/matrix'
+require 'bvh/motion'
+require 'bvh/motion/channel_data'
+require 'bvh/motion/frame'
+require 'bvh/skeleton'
+require 'bvh/parser'
+require 'bvh/exporter'
+
+
+class Bvh
+  # The array of skeletons associated with this BVH.
+  attr_reader :skeletons
+
+  # The motion capture data associated with this BVH.
+  attr_reader :motion
+
+  def initialize
+    @motion = Bvh::Motion.new
+    @skeletons = []
+  end
+
+  # Assigns the root bone in #skeleton
+  def root=(a); skeleton.root = a; end
+
+  # Returns the root bone in #skeleton
+  def root; skeleton.root; end
+
+  # Returns the frame data associated with this BVH file.
+  def frames; motion.frames; end
+
+  # Returns the last frame associated with this animation.
+  def last_frame; frames.last; end
+
+  # Returns the amount of time, in seconds, each frame occupies. Most BVH files have this set to
+  # 0.333333, which is equal to 30 frames per second.
+  def frame_time; motion.frame_time; end
+
+  # Sets the amount of time, in seconds, each frame occupies. Most BVH files have this set to
+  # 0.333333, which is equal to 30 frames per second.
+  def frame_time=(a); motion.frame_time = a; end
+
+  # Returns the frames per second calculated by (1 / frame_time)
+  def frames_per_second; motion.frames_per_second; end
+
+  # Assigns the frame_time by calculating it from (1 / frames_per_second)
+  def frames_per_second=(a); motion.frames_per_second = a; end
+
+  # Returns the number of frames in the motion capture data.
+  def frame_count; motion.frame_count; end
+
+  # Returns the first (and usually the only) skeleton in the #skeletons array.
+  def skeleton; @skeletons.first; end
+
+  # Creates a new skeleton, adds it to the #skeletons array, and returns it.
+  def create_skeleton!; (@skeletons << Bvh::Skeleton.new).last; end
+
+  class << self
+    # Instantiates a new BVH and imports its data from the specified file
+    def import(file)
+      bvh = self.new
+      parser = Bvh::Parser.new(file)
+      parser.parse(bvh)
+      bvh
+    end
+  end
+
+  # Exports this BVH into the specified file.
+  def export(file)
+    exporter = Bvh::Exporter.new(file)
+    exporter.export(self)
+    self
+  end
+end