Skip to content

updates for 0.9.0 to use GLM vectors #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brysonian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updates for 0.9.0 to use GLM vectors #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/CinderFreenect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/CinderFreenect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -101,7 +101,7 @@ class Kinect {
void setLedColor( LedColor ledColorCode );

//! Returns the current accelerometer data, measured as meters/second<sup>2</sup>.
Vec3f getAccel() const;
vec3 getAccel() const;

ImageSourceRef getVideoImage();
ImageSourceRef getDepthImage();
Expand Down