From 0db0988405d00d2c8eb96e91e1ef3fb786709f38 Mon Sep 17 00:00:00 2001 From: tansangxtt Date: Tue, 15 Aug 2017 11:46:58 +0800 Subject: [PATCH 1/6] Correct OpenNI PrimeSense The method getSensorName has to been implemented due to inheritance from RGBDSensor --- FriedLiver/Source/PrimeSenseSensor.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FriedLiver/Source/PrimeSenseSensor.h b/FriedLiver/Source/PrimeSenseSensor.h index 9d4daeb7..5c999b9f 100644 --- a/FriedLiver/Source/PrimeSenseSensor.h +++ b/FriedLiver/Source/PrimeSenseSensor.h @@ -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() From a80ec6b354c4dd78f9ae083ebb01ab05e40d0847 Mon Sep 17 00:00:00 2001 From: tansangxtt Date: Tue, 15 Aug 2017 11:49:10 +0800 Subject: [PATCH 2/6] Correct for RealSenseSensor Lack of "new" while constructing --- FriedLiver/Source/FriedLiver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FriedLiver/Source/FriedLiver.cpp b/FriedLiver/Source/FriedLiver.cpp index 0287773c..981de9b4 100644 --- a/FriedLiver/Source/FriedLiver.cpp +++ b/FriedLiver/Source/FriedLiver.cpp @@ -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"); From a45d56fefed0e07201ce3c7100a5dc33f22a98e6 Mon Sep 17 00:00:00 2001 From: Ha Tan Sang Date: Tue, 20 Mar 2018 09:33:07 +0800 Subject: [PATCH 3/6] test --- FriedLiver/test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 FriedLiver/test.txt diff --git a/FriedLiver/test.txt b/FriedLiver/test.txt new file mode 100644 index 00000000..e69de29b From ba535141814b2713f76d765ae9a572d583c9545f Mon Sep 17 00:00:00 2001 From: Ha Tan Sang Date: Tue, 20 Mar 2018 09:33:50 +0800 Subject: [PATCH 4/6] test2 --- FriedLiver/test.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/FriedLiver/test.txt b/FriedLiver/test.txt index e69de29b..5ec68ca8 100644 --- a/FriedLiver/test.txt +++ b/FriedLiver/test.txt @@ -0,0 +1 @@ +adasda \ No newline at end of file From e8cade61a2db5d3ef8051957a969e28d965a8fc5 Mon Sep 17 00:00:00 2001 From: Ha Tan Sang Date: Tue, 20 Mar 2018 09:44:28 +0800 Subject: [PATCH 5/6] master cmt --- FriedLiver/test.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FriedLiver/test.txt b/FriedLiver/test.txt index 5ec68ca8..5e4284ae 100644 --- a/FriedLiver/test.txt +++ b/FriedLiver/test.txt @@ -1 +1,2 @@ -adasda \ No newline at end of file +adasda +asdasdasd \ No newline at end of file From 0d195433ef14fca11d59793ae8518d004bb0058c Mon Sep 17 00:00:00 2001 From: Ha Tan Sang Date: Tue, 20 Mar 2018 09:46:41 +0800 Subject: [PATCH 6/6] cmt in master --- FriedLiver/test.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FriedLiver/test.txt b/FriedLiver/test.txt index 5e4284ae..e84630d7 100644 --- a/FriedLiver/test.txt +++ b/FriedLiver/test.txt @@ -1,2 +1,4 @@ adasda -asdasdasd \ No newline at end of file +asdasdasd + +asdadasd \ No newline at end of file