diff --git a/.gitignore b/.gitignore index e43b0f9..6545483 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,81 @@ +########################### +# ignore generated binaries +# but not the data folder +########################### + +*/bin/* +!*/bin/data/ + +######### +# general +######### + +*/[Bb]uild/ +*/[Oo]bj/ +*.o +*/[Dd]ebug*/ +*/[Rr]elease*/ +*.mode* +*.app/ +*.pyc +.svn/ +*.log + +######################## +# IDE files which should +# be ignored +######################## + +# XCode +*.pbxuser +*.perspective +*.perspectivev3 +*.mode1v3 +*.mode2v3 +# XCode 4 +xcuserdata +*.xcworkspace + +# Code::Blocks +*.depend +*.layout + +# Visual Studio +*.sdf +*.opensdf +*.suo +*.pdb +*.ilk +*.aps +ipch/ + +# Eclipse +.metadata +local.properties +.externalToolBuilders + +################## +# operating system +################## + +# Linux +*~ +# KDE +.directory +.AppleDouble + +# OSX .DS_Store +*.swp +*~.nib +# Thumbnails +._* + +# Windows +# Image file caches +Thumbs.db +# Folder config file +Desktop.ini + +# Android +.csettings diff --git a/LaserTag2020/src/dataOut/laserSending.cpp b/LaserTag2020/src/dataOut/laserSending.cpp index 0f2caa7..fc597f3 100755 --- a/LaserTag2020/src/dataOut/laserSending.cpp +++ b/LaserTag2020/src/dataOut/laserSending.cpp @@ -19,6 +19,7 @@ bool laserSending::setup(string host, int port){ this->port = port; this->host = host; bSetup = OSC.setup(host, port); + return bSetup; } bool laserSending::isSetup(){ diff --git a/LaserTag2020/src/ofApp.cpp b/LaserTag2020/src/ofApp.cpp index 8360ed7..4aec9ff 100755 --- a/LaserTag2020/src/ofApp.cpp +++ b/LaserTag2020/src/ofApp.cpp @@ -8,7 +8,7 @@ void ofApp::setup(){ ofBackground(0, 0, 0); ofSetWindowTitle("L.A.S.E.R.TAG 2020"); //for smooth animation - ofSetVerticalSync(true); + ofSetVerticalSync(false); ofSetFrameRate(60); init(); appCtrl.setup(); diff --git a/LaserTag2020/src/utils/miscUtils.h b/LaserTag2020/src/utils/miscUtils.h new file mode 100644 index 0000000..4f4aa9a --- /dev/null +++ b/LaserTag2020/src/utils/miscUtils.h @@ -0,0 +1,11 @@ +#ifndef _MISC_UTILS +#define _MISC_UTILS + +static float floatAbs(float input){ + + if(input < 0) return input * -1.0; + return input; +} + +#endif +