diff --git a/src/CinderFreenect.cpp b/src/CinderFreenect.cpp index 0f247cb..08ab359 100644 --- a/src/CinderFreenect.cpp +++ b/src/CinderFreenect.cpp @@ -285,12 +285,12 @@ void Kinect::setLedColor( LedColor ledColorCode ) freenect_set_led( mObj->mDevice, (freenect_led_options)code ); } -Vec3f Kinect::getAccel() const +vec3 Kinect::getAccel() const { - Vec3d raw; + dvec3 raw; freenect_update_tilt_state( mObj->mDevice ); freenect_get_mks_accel( freenect_get_tilt_state( mObj->mDevice ), &raw.x, &raw.y, &raw.z ); - return Vec3f( raw ); + return vec3( raw ); } ImageSourceRef Kinect::getVideoImage() diff --git a/src/CinderFreenect.h b/src/CinderFreenect.h index 77bead7..8f0bc36 100644 --- a/src/CinderFreenect.h +++ b/src/CinderFreenect.h @@ -90,7 +90,7 @@ class Kinect { //! Returns the height of the captured image in pixels. int32_t getHeight() const { return 480; } //! Returns the size of the captured image in pixels. - Vec2i getSize() const { return Vec2i( getWidth(), getHeight() ); } + vec2 getSize() const { return vec2( getWidth(), getHeight() ); } //! Returns the aspect ratio of the capture imagee, which is its width / height float getAspectRatio() const { return getWidth() / (float)getHeight(); } //! Returns the bounding rectangle of the capture imagee, which is Area( 0, 0, width, height ) @@ -101,7 +101,7 @@ class Kinect { void setLedColor( LedColor ledColorCode ); //! Returns the current accelerometer data, measured as meters/second2. - Vec3f getAccel() const; + vec3 getAccel() const; ImageSourceRef getVideoImage(); ImageSourceRef getDepthImage();