Skip to content
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

Jump to bottom

Correct mirror mistake for RealSense and PrimeSense #4

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Correct mirror mistake for RealSense and PrimeSense #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0db0988
Correct OpenNI PrimeSense
Aug 15, 2017
a80ec6b
Correct for RealSenseSensor
Aug 15, 2017
a45d56f
test
tansangxtt Mar 20, 2018
ba53514
test2
tansangxtt Mar 20, 2018
e8cade6
master cmt
tansangxtt Mar 20, 2018
0d19543
cmt in master
tansangxtt Mar 20, 2018
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
2 changes: 1 addition & 1 deletion FriedLiver/Source/FriedLiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RGBDSensor* getRGBDSensor()
#ifdef REAL_SENSE
//static RealSenseSensor s_realSenseSensor;
//return &s_realSenseSensor;
g_sensor = RealSenseSensor;
g_sensor = new RealSenseSensor;
return g_sensor;
#else
throw MLIB_EXCEPTION("Requires Real Sense SDK and REAL_SENSE macro");
Expand Down
3 changes: 3 additions & 0 deletions FriedLiver/Source/PrimeSenseSensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class PrimeSenseSensor : public RGBDSensor
//! Processes the depth data (and color)
bool processDepth();

std::string getSensorName() const {
return "PrimeSense";
}

//! Processes the Kinect color data
bool processColor()
Expand Down
4 changes: 4 additions & 0 deletions FriedLiver/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
adasda
asdasdasd

asdadasd