Merge pull request #29 from WrongEntertainment/develop

merge develop into master

.gitignore

@@ -1,14 +1,18 @@
-# https://gist.github.com/gists/1876339
+# General Files
 *.DS_Store
 
-# ignore Xcode compiled build folder and application.
+# Ignore Xcode compiled build folder and application.
 *build
 *.app
 
-# ignore Xcode User .pbxuser and .mode1v3 files.
+# Ignore Xcode User data
 *.pbxuser
 *.mode1v3
 *.pbxproj
-
 *.xcworkspacedata
 *.xcscheme
+*.xcuserdatad
+*.xcuserstate
+
+# createReleasePackage.sh output file
+*.dmg

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "addons/ofxXmlDefaultSettings"]
+	path = addons/ofxXmlDefaultSettings
+	url = git@github.com:WrongEntertainment/ofxXmlDefaultSettings.git
+[submodule "addons/ofxModifierKeys"]
+	path = addons/ofxModifierKeys
+	url = https://github.com/satoruhiga/ofxModifierKeys.git
+[submodule "addons/ofxUI"]
+	path = addons/ofxUI
+	url = https://github.com/rezaali/ofxUI.git

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Paul Vollmer, http://www.wrong-entertainment.com
+Copyright (c) 2011-2013 Paul Vollmer, http://www.wrong-entertainment.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Readme.md

@@ -1,27 +1,22 @@
-# MultitouchPadOsc  
+# [MultitouchPadOsc](http://wrongentertainment.github.io/MultitouchPadOsc/)  
 
-**General Information**  
+## General Information  
 The MultitouchPadOsc application checks the incomming Multitouch Events and send them as an osc-message.  
 It gives the possibility to use a Multitouch Pad as a control-device via osc protocol.  
 
-The MultitouchPadOsc Project Page is Hosted at http://wrongentertainment.github.com/MultitouchPadOsc/  
-Check out for New released Version at https://github.com/WrongEntertainment/MultitouchPadOsc  
+The Project Page is Hosted at http://wrongentertainment.github.com/MultitouchPadOsc/  
+Check out for New released Version at https://github.com/WrongEntertainment/MultitouchPadOsc/releases  
 
 The application is using the [Bitstream Vera](http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/) font.  
 Build with [openFrameworks](http://www.openframeworks.cc)  
 Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.txt file.  
 
-Used openFrameworks addons:  
-ofxUI  
-ofxModifierKeys  
 
 MultitouchPadOsc (version 0.1.31 codename TouchDown) is developed by:  
 Paul Vollmer [wrong-entertainment.com](http://wrong-entertainment.com)  
-Copyright (c) 2011-2012 Paul Vollmer, wrong-entertainment.com  
+Copyright (c) 2011-2013 Paul Vollmer, wrong-entertainment.com  
 
-
-**License**  
-MIT License  
+
 **Platform**  
 Mac OS  
 **Dependencies**  
@@ -32,28 +27,40 @@ Hardware: MacBook, MacBook Pro with a Multitouch Trackpad or an Magic Trackpad.
 You can find a list of all known bugs at [GitHub](https://github.com/wrongentertainment/multitouchpadosc/issues). Please report if you find an unknown bug.  
 
 
+## Development  
+Download openFrameworks and clone the Repository by running:
+
+    bash <(curl -s https://raw.github.com/WrongEntertainment/MultitouchPadOsc/bootstrap.sh)
+
+The following openFrameworks addons are embed as submodule.  
+
+[ofxUI](https://github.com/rezaali/ofxUI)  
+[ofxModifierKeys](https://github.com/satoruhiga/ofxModifierKeys)  
+[ofxXmlDefaultSettings](https://github.com/wrongentertainment/ofxXmlDefaultSettings)  
+
+
 ## Changelog  
 A detailed changelog, intended for programmers.  
 
-0.1.31  
-- Fixed Bug Entering port -> Crash  
-- Fixed Bug Wrong osc message on finger added/removed  
-- Fixed Bug Array is not being send  
+- 0.1.31  
+Fixed Bug Entering port -> Crash  
+Fixed Bug Wrong osc message on finger added/removed  
+Fixed Bug Array is not being send  
 
-0.1.3  
-- Changes at OSC messages  
-- Added Resize Window Mode  
-- Added GUI osc host/port textfield  
-- Added Finger Information  
+- 0.1.3  
+Changes at OSC messages  
+Added Resize Window Mode  
+Added GUI osc host/port textfield  
+Added Finger Information  
 
-0.1.2  
-- Changes at default xml settings, changes at gui.  
+- 0.1.2  
+Changes at default xml settings, changes at gui.  
 
-0.1.1  
-- Lot of changes at usability  
+- 0.1.1  
+Lot of changes at usability  
 
-0.1.0  
-- Beginning MultitouchPadOsc App, first test  
+- 0.1.0  
+Beginning MultitouchPadOsc App, first test  
 
 
 ## Author
@@ -66,4 +73,4 @@ Github: http://www.github.com/WrongEntertainment
 
 
 ## License  
-MultitouchPadOsc is Licensed under MIT Public License: http://www.opensource.org/licenses/MIT  
+MultitouchPadOsc is Licensed under [MIT License](http://wrong-entertainment.mit-license.org/)  

bootstrap.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+echo "--> download openFrameworks v0073"
+curl http://www.openframeworks.cc/versions/v0073/of_v0073_osx_release.zip -o openFrameworks_0073.zip
+
+echo "--> unzip openFrameworks"
+unzip openFrameworks_0073.zip
+
+echo "--> rename folder and delete zip file"
+mv of_v0073_osx_release MultitouchPadOsc_of
+rm openFrameworks_0073.zip
+
+echo "--> clone MultitouchPadOsc repo"
+cd MultitouchPadOsc_of/apps/myApps
+git clone git@github.com:WrongEntertainment/MultitouchPadOsc.git

createReleasePackage.sh

@@ -16,8 +16,8 @@ cp -R $TEMP_PATH.app $TEMP_PATH/MultitouchPadOsc.app
 echo "Making link to Applications dir"
 ln -s /Applications $TEMP_PATH/Applications
 
-#echo "Copy License"
-#cp -R $SCRIPT_FOLDER/LICENSE.txt $TEMP_PATH/LICENSE.txt
+echo "Copy License"
+cp -R $SCRIPT_FOLDER/LICENSE.txt $TEMP_PATH/LICENSE.txt
 
 echo "Generate .dmg file"
 hdiutil create -format UDZO -srcfolder $TEMP_PATH $SCRIPT_FOLDER/bin/MultitouchPadOsc.dmg

openFrameworks-Info.plist

@@ -5,9 +5,9 @@
 	<key>CFBundleName</key>
 	<string>MultitouchPadOsc</string>
 	<key>CFBundleVersion</key>
-	<string>0.1.31</string>
+	<string>0.1.32</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.31</string>
+	<string>0.1.32</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleDevelopmentRegion</key>

resources/Credits.rtf

@@ -5,7 +5,9 @@
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
 \f0\fs24 \cf0 \
-Copyright \'a9 2012 wrong-entertainment\
+Copyright \'a9 2011-2013 wrong-entertainment\
 All rights reserved.\
 \
-Documantation can be found at {\field{\*\fldinst{HYPERLINK "http://wrongentertainment.github.com/MultitouchPadOsc/"}}{\fldrslt MultitouchPadOsc}}}
+Documantation can be found at {\field{\*\fldinst{HYPERLINK "http://wrongentertainment.github.com/MultitouchPadOsc/"}}{\fldrslt MultitouchPadOsc}}\
+\
+This Project is build with openFrameworks.}

src/Checkbox.cpp

@@ -0,0 +1,68 @@
+//
+// Checkbox.cpp
+// MultitouchPadOsc is released under the MIT License.
+//
+// Copyright (c) 2011-2013, Paul Vollmer http://www.wrong-entertainment.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#include "Checkbox.h"
+
+
+Checkbox::Checkbox() {
+	size = 10;
+}
+
+void Checkbox::init(ofTrueTypeFont &_f, string _message, int _x, int _y, bool _status) {
+    font    = _f;
+	message = _message;
+	x       = _x;
+	y       = _y;
+	status  = _status;
+
+	// Initialize interaction
+	interaction.init(x, y, size, size);
+}
+
+void Checkbox::init(ofTrueTypeFont &_f, string _message, int _x, int _y) {
+	init(_f, _message, _x, _y, true);
+}
+
+void Checkbox::display() {
+	if(status) {
+        ofSetColor(CHECKBOX_COLOR_ON_R, CHECKBOX_COLOR_ON_G, CHECKBOX_COLOR_ON_B);
+    } else {
+        ofSetColor(COLOR_DARK_GREY);
+	}
+
+	ofFill();
+	ofRect(x, y, size, size);
+
+	// message
+	ofSetColor(COLOR_LIGHT_GREY);
+	ofFill();
+	font.drawString(message, x+size+10, y+size);
+}
+
+void Checkbox::pressed(int _mx, int _my) {
+	if(interaction.overRect(_mx, _my)) {
+		status = !status;
+	}
+}

src/wCheckbox.h → src/Checkbox.h

@@ -1,8 +1,8 @@
 //
-// wCheckbox.h
+// Checkbox.h
 // MultitouchPadOsc is released under the MIT License.
 //
-// Copyright (c) 2011 - 2012, Paul Vollmer http://www.wrong-entertainment.com
+// Copyright (c) 2011-2013, Paul Vollmer http://www.wrong-entertainment.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,26 +23,22 @@
 // THE SOFTWARE.
 //
 
-#ifndef _WCHECKBOX_H
-#define _WCHECKBOX_H
+#ifndef _CHECKBOX_H
+#define _CHECKBOX_H
 
 #include "ofMain.h"
-#include "wInteraction.h"
+#include "Interaction.h"
 #include "Variables.h"
 
 
-class wCheckbox {
+class Checkbox {
 
 	public:
 		/*
 		 * Constructor
 		 */
-		wCheckbox() {
-			size = 10;
-		}
-
-
-
+        Checkbox();
+
 		/**
 		 * Initialize
 		 *
@@ -51,55 +47,19 @@ class wCheckbox {
 		 * _y Checkbox Y-position
 		 * _status Checkbox status
 		 */
-		void init(ofTrueTypeFont &_f, string _message, int _x, int _y, bool _status) {
-			font    = _f;
-			message = _message;
-			x       = _x;
-			y       = _y;
-			status  = _status;
-
-			// Initialize interaction
-			interaction.init(x, y, size, size);
-		}
-
-		void init(ofTrueTypeFont &_f, string _message, int _x, int _y) {
-			init(_f, _message, _x, _y, true);
-		}
+        void init(ofTrueTypeFont &_f, string _message, int _x, int _y, bool _status);
 
+        void init(ofTrueTypeFont &_f, string _message, int _x, int _y);
 
 		/**
 		 * Display the button
 		 */
-		void display() {
-			switch (status) {
-				case true:
-					ofSetColor(CHECKBOX_COLOR_ON_R, CHECKBOX_COLOR_ON_G, CHECKBOX_COLOR_ON_B);
-					break;
-				case false:
-					ofSetColor(COLOR_DARK_GREY);
-					break;
-			}
-
-			ofFill();
-			ofRect(x, y, size, size);
-
-			// message
-			ofSetColor(COLOR_LIGHT_GREY);
-			ofFill();
-			font.drawString(message, x+size+10, y+size);
-		}
-
+        void display();
 
 		/**
 		 * Mouse pressed
 		 */
-		void pressed(int _mx, int _my) {
-			if(interaction.overRect(_mx, _my)) {
-				status = !status;
-			}
-		}
-
-
+        void pressed(int _mx, int _my);
 
 		/**
 		 * Variables
@@ -110,7 +70,7 @@ class wCheckbox {
 	private:
 		ofTrueTypeFont font;
 
-		wInteraction interaction;
+		Interaction interaction;
 
 		/* Variables */
 		int    x;
@@ -119,4 +79,4 @@ class wCheckbox {
 		string message;
 
 };
-#endif // End _WCHECKBOX_H
+#endif // End _CHECKBOX_H

src/ConsoleMVC.cpp

@@ -2,7 +2,7 @@
 // ConsoleMVC.cpp
 // MultitouchPadOsc is released under the MIT License.
 //
-// Copyright (c) 2011 - 2012, Paul Vollmer http://www.wrong-entertainment.com
+// Copyright (c) 2011-2013, Paul Vollmer http://www.wrong-entertainment.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -71,8 +71,3 @@ void ConsoleMVC::addString(string msg, bool log) {
 		currentConsoleStrings = 0;
 	}
 }
-
-
-void ConsoleMVC::mousePressed(int x, int y) {
-
-}