hornetseye-kinect 0.3.0 → 0.4.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-kinect'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.4.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/kinectinput.cc

@@ -15,6 +15,23 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "kinectinput.hh"
 
+#ifndef FREENECT_FRAME_W
+#define FREENECT_FRAME_W 640
+#endif
+#ifndef FREENECT_FRAME_H
+#define FREENECT_FRAME_H 480
+#endif
+#ifndef FREENECT_FRAME_PIX
+#define FREENECT_FRAME_PIX (FREENECT_FRAME_W * FREENECT_FRAME_H)
+#endif
+#ifndef FREENECT_VIDEO_RGB_SIZE
+#define FREENECT_VIDEO_RGB_SIZE (FREENECT_FRAME_PIX*3)
+#endif
+#ifndef FREENECT_DEPTH_11BIT_SIZE
+#define FREENECT_DEPTH_11BIT_SIZE (FREENECT_FRAME_PIX*2)
+#endif
+
+
 using namespace std;
 
 VALUE KinectInput::cRubyClass = Qnil;
@@ -36,8 +53,10 @@ KinectInput::KinectInput( KinectContextPtr context, int node ) throw (Error):
     m_depth[i] = (char *)malloc( FREENECT_DEPTH_11BIT_SIZE );
   };
   instances[ m_device ] = this;
-  freenect_set_depth_format( m_device, FREENECT_DEPTH_11BIT );
-  freenect_set_video_format( m_device, FREENECT_VIDEO_RGB );
+  // freenect_set_depth_format( m_device, FREENECT_DEPTH_11BIT );
+  // freenect_set_video_format( m_device, FREENECT_VIDEO_RGB );
+  freenect_set_video_mode(m_device, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB));
+  freenect_set_depth_mode(m_device, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT));
   freenect_set_depth_buffer( m_device, m_rgb[0] );
   freenect_set_video_buffer( m_device, m_rgb[0] );
   freenect_set_depth_callback( m_device, staticDepthCallBack );

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-kinect
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 +01:00
-default_executable: 
+date: 2011-11-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -39,9 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 23
         version: "0.23"
   type: :runtime
   version_requirements: *id002
@@ -53,9 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
         version: "0.11"
   type: :runtime
   version_requirements: *id003
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -98,7 +82,6 @@ files:
 - ext/error.hh
 - ext/rubyinc.hh
 - ext/rubytools.tcc
-has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-kinect/
 licenses: []
 
@@ -113,21 +96,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Acquisition of images and depth maps using libfreenect