Merge branch 'master' into master

.gitignore

@@ -1,12 +1,108 @@
+# Some general ignore patterns
+
+# temp & build files
+build/
+obj/
+*.o
+Debug*/
+Release*/
+*.mode*
+*.app/
+*.pyc
+.svn/
+*.exe
+*.dll
+*.lib
+
+# IDE-specific ignore patterns (e.g. user-specific files)
+
+# XCode
+*.xcodeproj
+project.pbxproj
+xcshareddata
+xcschemes
+Project.xcconfig
+config.make
+openFrameworks-Info.plist
+*.pbxuser
+*.perspective
+*.perspectivev3
+*.mode1v3
+*.mode2v3
+# XCode 4
+xcuserdata
+*.xcworkspace
+
+# Code::Blocks
 *.depend
 *.layout
-*.mode*v3
-*.pbxuser
-*.app*
-*.DS_*
+*.cbTemp
 
-.svn/
-obj/
-bin/
-build/
-!data/
+# Visual Studio
+*.sln
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+icon.rc
+*.sdf
+*.pdf
+*.opensdf
+*.suo
+ipch/
+*.pdb
+*.exp
+*.ilk
+*.aps
+
+# Eclipse
+.metadata
+local.properties
+.externalToolBuilders
+
+# codelite
+*.session
+*.tags
+*.workspace.*
+
+#Linux/OSX
+Makefile
+
+# OS-specific ignore patterns
+
+# Linux
+*~
+# KDE
+.directory
+
+# OSX
+.DS_Store
+*.swp
+*~.nib
+# Thumbnails
+._*
+
+# Windows
+# Windows image file caches
+Thumbs.db
+# Folder config file
+Desktop.ini
+
+# Android
+.csettings
+
+# Packages
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases
+*.log
+*.sql
+*.sqlite

example-controller/addons.make

@@ -0,0 +1,2 @@
+ofxDmx
+ofxGui

example-controller/src/ofApp.cpp

@@ -3,8 +3,6 @@
 void ofApp::setup() {
 	ofSetVerticalSync(true);
 
-
-
     modules = 6;
 
 	panel.setup();
@@ -13,7 +11,6 @@ void ofApp::setup() {
 	panel.add(save.set("save", false));
 	panel.add(load.set("load", false));
 
-
 	for(int module = 1; module <= modules; module++) {
         string label = "mod" + ofToString(module);
         panel.add(red[module].set("red" +ofToString(module), 0, 0, 1));
@@ -22,9 +19,6 @@ void ofApp::setup() {
 
 		//panel.add(moduleNum[module].set(label, false));
 	}
-
-
-    panel.loadFromFile("settings.xml");
 
     load = true;
 
@@ -43,10 +37,11 @@ void ofApp::update() {
         save = false;
 	}
 	if(load) {
-        panel.loadFromFile("settings.xml");
+        if(ofFile::doesFileExist(ofToDataPath("settings.xml"))) {
+			panel.loadFromFile("settings.xml");
+		}
         load = false;
 	}
-
 
 	int channel = 1;
 	for(int module = 1; module <= modules; module++) {
@@ -79,10 +74,10 @@ void ofApp::draw() {
 		int b = dmx.getLevel(bc);
 		ofSetColor(r, g, b);
 		ofFill();
-		ofRect(4, module * 16 + 6, 14, 14);
+		ofDrawRectangle(4, module * 16 + 6, 14, 14);
 		ofSetColor(255);
 		ofNoFill();
-		ofRect(4, module * 16 + 6, 14, 14);
+		ofDrawRectangle(4, module * 16 + 6, 14, 14);
 		string rs = ofToString(rc) + ":" + ofToString(r);
 		string gs = ofToString(gc) + ":" + ofToString(g);
 		string bs = ofToString(bc) + ":" + ofToString(b);
@@ -94,6 +89,3 @@ void ofApp::draw() {
 
     panel.draw();
 }
-
-void ofApp::keyPressed(int key) {
-}

example-controller/src/ofApp.h

@@ -4,15 +4,13 @@
 
 #include "ofxDmx.h"
 #include "ofxGui.h"
-#include "ofxXmlSettings.h"
 
 class ofApp : public ofBaseApp {
 public:
 	void setup();
 	void exit();
 	void update();
 	void draw();
-	void keyPressed(int key);
 
 	ofxDmx dmx;
 	ofxPanel panel;

example/addons.make

@@ -0,0 +1,2 @@
+ofxDmx
+ofxGui