Commit 2ffc77c8 authored by Pierre Bürki's avatar Pierre Bürki
Browse files

Merge branch 'misc-cleanup' into 'develop' 

Misc cleanup

See merge request !5
parents 6d1e57ca e2d21da6

src/PointCloudManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ void PointCloudManager::updateDepth(DepthFrame::Ptr data) 
void PointCloudManager::createPointCloudIfNotExist(glm::vec2 dim)

{

	if (pointCloud.getVertices().size() == 0) {

		ofLog(OF_LOG_NOTICE) << "YOU ONLY SEE THIS ONCE";



		pointCloud.setMode(OF_PRIMITIVE_POINTS);

		pointCloud.enableColors();

src/ofApp.cpp

+5 −14
Original line number Diff line number Diff line
@@ -20,16 +20,6 @@ ofMatrix4x4 ofApp::makeNuitrackToRealSenseTransform() { 


const ofMatrix4x4 ofApp::nuitrackViewportToRealSenseViewportTransform = makeNuitrackToRealSenseTransform();





// TODO: remove

void debug_mat(glm::mat4 mat) {

	ofLog(OF_LOG_NOTICE) << "MATRIX : \n"

		<< mat[0][0] << " " << mat[1][0] << " " << mat[2][0] << " " << mat[3][0] << "\n"

		<< mat[0][1] << " " << mat[1][1] << " " << mat[2][1] << " " << mat[3][1] << "\n"

		<< mat[0][2] << " " << mat[1][2] << " " << mat[2][2] << " " << mat[3][2] << "\n"

		<< mat[0][3] << " " << mat[1][3] << " " << mat[2][3] << " " << mat[3][3] << "\n";

}



//--------------------------------------------------------------

void ofApp::initNuitrack() {

	tracker = ofxnui::Tracker::create();
@@ -226,10 +216,9 @@ void ofApp::draw() { 
    if(bShowHelp) {

        ofDrawBitmapString(help, 20 ,VIEWPORT_HEIGHT + 50);

    }



	if (bShowSkeletonData) {

		string desc = skeletonFinder.getShortDesc();

		ofLog(OF_LOG_NOTICE) << desc;

		ofDrawBitmapString(desc,

		ofDrawBitmapString(skeletonFinder.getShortDesc(),

			20,

			VIEWPORT_HEIGHT + 20);

	}
@@ -259,12 +248,14 @@ void ofApp::drawPreview() { 
	//sphere_Y.draw();

	//sphere_Z.draw();

	

	ofPushStyle();

    ofSetColor(255, 255, 0);

    skeletonFinder.drawSensorBox();

	

	glLineWidth(5);

    ofSetColor(255, 100, 255);

	skeletonFinder.drawSkeletons();

	ofPopStyle();



	glDisable(GL_DEPTH_TEST);  

}