Commit 0684ac45 authored by Pierre Bürki's avatar Pierre Bürki
Browse files

Remove useless fields and methods

parent ff327b5f

src/TrackingNetworkManager.cpp

+1 −35
Original line number Diff line number Diff line
@@ -37,24 +37,12 @@ void TrackingNetworkManager::setup(ofxGui &gui, string _realsenseSerial){ 
    listeningGroup->add<ofxGuiIntInputField>(listeningPort.set("RX Port", NETWORK_LISTENING_PORT, NETWORK_LISTENING_PORT, NETWORK_LISTENING_PORT + 99));



    panel->loadFromFile("broadcast.xml");



	// TODO: check usefulness

    frameNumber = 0;

}





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

void TrackingNetworkManager::update(const SkeletonFinder& skeletonFinder){

    frameNumber++;

    

    long currentMillis = ofGetElapsedTimeMillis();

	//Check if its about time to send a broadcast message

    if(knownClients.size() > 0 && (currentMillis - broadCastTimer) > BROADCAST_CLIENT_FREQ){

        sendBroadCastAddress();

        checkTrackingClients(currentMillis);

    } else if(knownClients.size() == 0 && (currentMillis - broadCastTimer) > BROADCAST_NOCLIENT_FREQ){

        sendBroadCastAddress();

    }

	    

    //send trackingdata to all connected clients

    sendTrackingData(skeletonFinder);
@@ -116,14 +104,6 @@ void TrackingNetworkManager::update(const SkeletonFinder& skeletonFinder){ 
}



void TrackingNetworkManager::sendTrackingData(const SkeletonFinder& skeletonFinder) {

	// send frame number

	ofxOscMessage frame;

	frame.setAddress("/ks/server/track/frame/start");

	frame.addIntArg(mServerID.get());

	frame.addIntArg(frameNumber);

	sendMessageToTrackingClients(frame);





	vector<Skeleton> skeletons = skeletonFinder.getSkeletons();

	if (skeletons.size() > 0) {

		// Only one skeleton is to be on the scene for the perspective to work
@@ -179,20 +159,6 @@ int TrackingNetworkManager::getTrackingClientIndex(string _ip, int _port){ 
    return knownClients.size() -1;

}



void TrackingNetworkManager::sendBroadCastAddress(){

    ofxOscMessage broadcast;

    broadcast.setAddress("/ks/server/broadcast");

	broadcast.addStringArg(mDeviceSerial);

	broadcast.addIntArg(mServerID.get());

	broadcast.addStringArg(listeningIP.get());

	broadcast.addIntArg(listeningPort.get());

    

    broadcastSender.setup(broadcastIP.get(), broadcastPort.get());

    broadcastSender.sendMessage(broadcast);

    

    broadCastTimer = ofGetElapsedTimeMillis();

}



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

string TrackingNetworkManager::getOscMsgAsString(ofxOscMessage m){

	string msg_string;

src/TrackingNetworkManager.h

+0 −7
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include "ofxOsc.h"

#include "TrackingClient.h"

#include "SkeletonFinder.h"

#include "Frustum.h"



#include <cmath>

#include <regex>
@@ -42,8 +41,6 @@ public: 
    void checkTrackingClients(long _currentMillis);

    int getTrackingClientIndex(string _ip, int _port);

    

    void sendBroadCastAddress();

    

    string getOscMsgAsString(ofxOscMessage m);

 

	vector<string> matchesInRegex(string _str, string _reg);
@@ -52,10 +49,6 @@ public: 
    

    string          mDeviceSerial;

    

    float           scale;

    

    long             frameNumber;

    

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

    // Server side:

    ofxOscReceiver  serverReceiver;         // OSC receiver