[update] remove ofxGui dependency

.gitignore

@@ -25,3 +25,33 @@ example/recorder/icon.rc
 example/recorder/recorder.vcxproj.user
 example/recorder/recorder.vcxproj
 example/recorder/obj/
+*.sln
+*.vcxproj
+*.filters
+*.user
+*.rc
+example/aligned_example/.vs/
+*.pdb
+*.lib
+*.ilk
+*.exp
+*.exe
+example/aligned_example/bin/fmodexL64.dll
+example/aligned_example/bin/fmodex64.dll
+example/aligned_example/bin/FreeImage.dll
+example/aligned_example/obj/
+example/playback_example/.vs/
+example/playback_example/bin/fmodexL64.dll
+example/playback_example/bin/fmodex64.dll
+example/playback_example/bin/FreeImage.dll
+example/playback_example/obj/
+example/recorder_example/.vs/
+example/recorder_example/bin/fmodexL64.dll
+example/recorder_example/bin/fmodex64.dll
+example/recorder_example/bin/FreeImage.dll
+example/recorder_example/obj/
+example/simple_example/.vs/
+example/simple_example/bin/fmodexL64.dll
+example/simple_example/bin/fmodex64.dll
+example/simple_example/bin/FreeImage.dll
+example/simple_example/obj/

example/simple/addons.make → example/aligned_example/addons.make

@@ -1,2 +1 @@
-ofxGui
 ofxLibRealSense2P

example/aligned_example/src/ofApp.cpp

@@ -0,0 +1,80 @@
+#include "ofApp.h"
+
+//--------------------------------------------------------------
+void ofApp::setup(){
+	realsense.setupDevice(0);
+	//setup different resolution
+	realsense.enableDepth(1280, 720);
+	realsense.enableColor(640, 480);
+	realsense.startStream();
+
+	//align depth and color pixel size
+	realsense.setAligned(true);
+}
+
+//--------------------------------------------------------------
+void ofApp::update(){
+	realsense.update();
+}
+
+//--------------------------------------------------------------
+void ofApp::draw(){
+	//pixel size is aligned even if it setup different resolution!
+	realsense.drawDepth(0, 0);
+	realsense.drawColor(640, 0);
+}
+
+//--------------------------------------------------------------
+void ofApp::keyPressed(int key){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::keyReleased(int key){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseMoved(int x, int y ){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseDragged(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mousePressed(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseReleased(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseEntered(int x, int y){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseExited(int x, int y){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::windowResized(int w, int h){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::gotMessage(ofMessage msg){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
+
+}

example/recorder/src/ofApp.h → example/aligned_example/src/ofApp.h

@@ -2,7 +2,6 @@
 
 #include "ofMain.h"
 #include "ofxLibRealSense2P.h"
-#include "ofxGui.h"
 
 class ofApp : public ofBaseApp{
 
@@ -22,7 +21,7 @@ class ofApp : public ofBaseApp{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
-
 		ofxLibRealSense2P realsense;
-		ofxPanel gui;
+
+
 };

example/recorder/addons.make → example/playback_example/addons.make

@@ -1,2 +1 @@
-ofxGui
 ofxLibRealSense2P

example/playback/src/ofApp.cpp → example/playback_example/src/ofApp.cpp

@@ -6,12 +6,6 @@ void ofApp::setup(){
 	realsense.enableDepth(640, 480);
 	realsense.enableColor(640, 480);
 	realsense.startStream();
-
-	//align depth and color pixel size
-	realsense.setAligned(true);
-
-	panel.setup();
-	panel.add(realsense.setupGUI());
 }
 
 //--------------------------------------------------------------
@@ -23,7 +17,6 @@ void ofApp::update(){
 void ofApp::draw(){
 	realsense.drawColor(0,0);
 	realsense.drawDepth(realsense.getColorWidth(), 0);
-	panel.draw();
 }
 
 //--------------------------------------------------------------

example/playback/src/ofApp.h → example/playback_example/src/ofApp.h

@@ -2,7 +2,6 @@
 
 #include "ofMain.h"
 #include "ofxLibRealSense2P.h"
-#include "ofxGui.h"
 
 class ofApp : public ofBaseApp{
 
@@ -23,6 +22,5 @@ class ofApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 		ofxLibRealSense2P realsense;
-		ofxPanel panel;
 
 };

example/recorder_example/addons.make

@@ -0,0 +1 @@
+ofxLibRealSense2P

example/recorder/src/ofApp.cpp → example/recorder_example/src/ofApp.cpp

@@ -6,9 +6,6 @@ void ofApp::setup(){
 	realsense.enableDepth(640, 480);
 	realsense.enableColor(640, 480);
 	realsense.startStream();
-
-	gui.setup();
-	gui.add(realsense.setupGUI());
 }
 
 //--------------------------------------------------------------
@@ -24,7 +21,6 @@ void ofApp::draw(){
 	realsense.drawColor(realsense.getDepthWidth(), 0);
 	ofPopMatrix();
 	ofDrawBitmapStringHighlight("fps:" + ofToString(ofGetFrameRate(), 2), ofGetWidth() - 160, ofGetHeight() - 20);
-	gui.draw();
 }
 
 //--------------------------------------------------------------

example/simple/src/ofApp.h → example/recorder_example/src/ofApp.h

@@ -2,7 +2,6 @@
 
 #include "ofMain.h"
 #include "ofxLibRealSense2P.h"
-#include "ofxGui.h"
 
 class ofApp : public ofBaseApp{
 
@@ -24,5 +23,4 @@ class ofApp : public ofBaseApp{
 		void gotMessage(ofMessage msg);
 
 		ofxLibRealSense2P realsense;
-		ofxPanel gui;
 };

example/simple_example/src/main.cpp

@@ -0,0 +1,13 @@
+#include "ofMain.h"
+#include "ofApp.h"
+
+//========================================================================
+int main( ){
+	ofSetupOpenGL(1024,768,OF_WINDOW);			// <-------- setup the GL context
+
+	// this kicks off the running of my app
+	// can be OF_WINDOW or OF_FULLSCREEN
+	// pass in width and height too:
+	ofRunApp(new ofApp());
+
+}

example/simple/src/ofApp.cpp → example/simple_example/src/ofApp.cpp

@@ -7,8 +7,7 @@ void ofApp::setup(){
 	realsense.enableColor(640, 480);
 	realsense.startStream();
 
-	gui.setup();
-	gui.add(realsense.setupGUI());
+	gui.setup(guiUtils.setupGUI(&realsense));
 }
 
 //--------------------------------------------------------------

example/simple_example/src/ofApp.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxLibRealSense2P.h"
+#include "ofxLRS2/GuiUtils.h"
+#include "ofxGui.h"
+
+class ofApp : public ofBaseApp{
+
+	public:
+		void setup();
+		void update();
+		void draw();
+
+		void keyPressed(int key);
+		void keyReleased(int key);
+		void mouseMoved(int x, int y );
+		void mouseDragged(int x, int y, int button);
+		void mousePressed(int x, int y, int button);
+		void mouseReleased(int x, int y, int button);
+		void mouseEntered(int x, int y);
+		void mouseExited(int x, int y);
+		void windowResized(int w, int h);
+		void dragEvent(ofDragInfo dragInfo);
+		void gotMessage(ofMessage msg);
+
+		ofxLibRealSense2P realsense;
+		GuiUtils guiUtils;
+		ofxPanel gui;
+};

src/ofxLRS2/Filter.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <librealsense2/rs.hpp> 
-#include "ofxGui.h"
+#include <librealsense2/rs.hpp>
+#include "ofMain.h"
 
 namespace ofxlibrealsense2p
 {

src/ofxLRS2/GuiUtils.cpp

@@ -0,0 +1,84 @@
+#include "GuiUtils.h"
+
+
+
+GuiUtils::GuiUtils()
+{
+}
+
+
+GuiUtils::~GuiUtils()
+{
+}
+
+ofParameterGroup& GuiUtils::setupGUI(ofxLibRealSense2P* realsense)
+{
+	rs2::sensor sensor = realsense->rs2device.query_sensors()[realsense->deviceId];
+	rs2::option_range orExp = sensor.get_option_range(RS2_OPTION_EXPOSURE);
+	rs2::option_range orGain = sensor.get_option_range(RS2_OPTION_GAIN);
+	rs2::option_range orMinDist = realsense->rs2colorizer.get_option_range(RS2_OPTION_MIN_DISTANCE);
+	rs2::option_range orMaxDist = realsense->rs2colorizer.get_option_range(RS2_OPTION_MAX_DISTANCE);
+
+	_D400Params.setName("D400_" + realsense->rs2config.getDeviceSerial());
+	_D400Params.add(_autoExposure.set("Auto exposure", (bool)sensor.get_option(RS2_OPTION_EXPOSURE)));
+	_D400Params.add(_enableEmitter.set("Emitter", (bool)sensor.get_option(RS2_OPTION_EMITTER_ENABLED)));
+	_D400Params.add(_irExposure.set("IR Exposure", orExp.def, orExp.min, 26000));
+	_D400Params.add(_depthMin.set("Min Depth", orMinDist.def, orMinDist.min, orMinDist.max));
+	_D400Params.add(_depthMax.set("Max Depth", orMaxDist.def, orMaxDist.min, orMaxDist.max));
+
+	for (auto filter : realsense->filters)
+	{
+		ofParameterGroup group;
+		group.setName(filter->getFilterName());
+		group.add(*filter->getIsEnabled());
+		for (auto s : filter->getSliders())
+		{
+			group.add(*s);
+		}
+		_D400Params.add(group);
+	}
+
+	_autoExposure.addListener(this, &GuiUtils::onD400BoolParamChanged);
+	_enableEmitter.addListener(this, &GuiUtils::onD400BoolParamChanged);
+	_irExposure.addListener(this, &GuiUtils::onD400IntParamChanged);
+	_depthMin.addListener(this, &GuiUtils::onD400ColorizerParamChanged);
+	_depthMax.addListener(this, &GuiUtils::onD400ColorizerParamChanged);
+
+	return _D400Params;
+}
+
+
+void GuiUtils::onD400BoolParamChanged(bool &value)
+{
+	rs2::sensor sensor = realsense->rs2_pipeline->get_active_profile().get_device().first<rs2::depth_sensor>();
+	if (sensor.supports(RS2_OPTION_ENABLE_AUTO_EXPOSURE))
+		sensor.set_option(RS2_OPTION_ENABLE_AUTO_EXPOSURE, _autoExposure ? 1.0f : 0.0f);
+	if (sensor.supports(RS2_OPTION_EMITTER_ENABLED))
+		sensor.set_option(RS2_OPTION_EMITTER_ENABLED, _enableEmitter ? 1.0f : 0.0f);
+}
+
+
+void GuiUtils::onD400IntParamChanged(int &value)
+{
+	rs2::sensor sensor = realsense->rs2_pipeline->get_active_profile().get_device().first<rs2::depth_sensor>();
+	if (sensor.supports(RS2_OPTION_EXPOSURE))
+		sensor.set_option(RS2_OPTION_EXPOSURE, (float)_irExposure);
+}
+
+
+void GuiUtils::onD400ColorizerParamChanged(float &value)
+{
+	realsense->rs2colorizer.set_option(RS2_OPTION_HISTOGRAM_EQUALIZATION_ENABLED, 0);
+
+	if (realsense->rs2colorizer.supports(RS2_OPTION_MIN_DISTANCE))
+		realsense->rs2colorizer.set_option(RS2_OPTION_MIN_DISTANCE, _depthMin);
+	if (realsense->rs2colorizer.supports(RS2_OPTION_MAX_DISTANCE))
+		realsense->rs2colorizer.set_option(RS2_OPTION_MAX_DISTANCE, _depthMax);
+}
+
+
+ofParameterGroup& GuiUtils::getGui()
+{
+	return _D400Params;
+}
+

src/ofxLRS2/GuiUtils.h

@@ -0,0 +1,28 @@
+#pragma once
+#include "ofxLibRealSense2P.h"
+#include <librealsense2/rs.hpp> 
+#include <librealsense2/rsutil.h>
+
+class GuiUtils
+{
+public:
+	GuiUtils();
+	~GuiUtils();
+
+	ofParameterGroup& setupGUI(ofxLibRealSense2P* realsense);
+	ofParameterGroup& getGui();
+private:
+
+	void onD400BoolParamChanged(bool &value);
+	void onD400IntParamChanged(int &value);
+	void onD400ColorizerParamChanged(float &value);
+	//attribute
+	ofParameterGroup     _D400Params;
+	ofParameter<bool>       _autoExposure;
+	ofParameter<bool>       _enableEmitter;
+	ofParameter<int>    _irExposure;
+	ofParameter<float>  _depthMin;
+	ofParameter<float>  _depthMax;
+	ofxLibRealSense2P* realsense;
+};
+