Restructure for OF

.gitignore

@@ -0,0 +1,34 @@
+*.depend
+*.layout
+*.mode*v3
+*.pbxuser
+*.app*
+*.DS_*
+._*.*
+
+.svn/
+obj/
+bin/
+!bin/data/
+build/
+xcuserdata/
+
+ipch/
+*.suo
+*.opensdf
+*.vcxproj.user
+*.db
+*.opendb
+
+*.obj
+*.tlog
+*.sdf
+*.pdb
+*.idb
+*.pch
+Debug/
+Release/
+
+
+*~.xml
+.vs/

README.md

@@ -18,6 +18,12 @@ ofxNDIsend and ofxNDIreceive classes can be used independently for applications
 
 For Windows
 
+### Project Generator
+
+The OF Project Generator will create your project with correct paths. Make sure "ofxNDI" is selected in the addons section and all headers, libraries, and DLLs will be imported in the Visual Studio project.
+
+### Manual Setup
+
 1. Add files from "ofxNDI" to your Visual Studio project.
 2. Copy .dll's from ofxNDI/libs to the application "bin" folder
 3. Got to the [NDI web page](https://www.ndi.tv/) and download the NDI SDK. Install the NewTek SDK and copy files as follows.

addon_config.mk

@@ -0,0 +1,83 @@
+# All variables and this file are optional, if they are not present the PG and the
+# makefiles will try to parse the correct values from the file system.
+#
+# Variables that specify exclusions can use % as a wildcard to specify that anything in
+# that position will match. A partial path can also be specified to, for example, exclude
+# a whole folder from the parsed paths from the file system
+#
+# Variables can be specified using = or +=
+# = will clear the contents of that variable both specified from the file or the ones parsed
+# from the file system
+# += will add the values to the previous ones in the file or the ones parsed from the file 
+# system
+# 
+# The PG can be used to detect errors in this file, just create a new project with this addon 
+# and the PG will write to the console the kind of error and in which line it is
+
+meta:
+	ADDON_NAME = ofxNDI
+	ADDON_DESCRIPTION = An Openframeworks addon to allow sending and receiving images over a network using the NewTek Network Device Protocol.
+	ADDON_AUTHOR = Lynn Jarvis
+	ADDON_TAGS = 
+	ADDON_URL = https://github.com/leadedge/ofxNDI
+
+common:
+	# dependencies with other addons, a list of them separated by spaces 
+	# or use += in several lines
+	# ADDON_DEPENDENCIES = 
+
+	# include search paths, this will be usually parsed from the file system
+	# but if the addon or addon libraries need special search paths they can be
+	# specified here separated by spaces or one per line using +=
+	# ADDON_INCLUDES = 
+
+	# any special flag that should be passed to the compiler when using this
+	# addon
+	# ADDON_CFLAGS =
+
+	# any special flag that should be passed to the linker when using this
+	# addon, also used for system libraries with -lname
+	# ADDON_LDFLAGS =
+
+	# linux only, any library that should be included in the project using
+	# pkg-config
+	# ADDON_PKG_CONFIG_LIBRARIES =
+
+	# osx/iOS only, any framework that should be included in the project
+	# ADDON_FRAMEWORKS =
+
+	# source files, these will be usually parsed from the file system looking
+	# in the src folders in libs and the root of the addon. if your addon needs
+	# to include files in different places or a different set of files per platform
+	# they can be specified here
+	# ADDON_SOURCES =
+
+	# some addons need resources to be copied to the bin/data folder of the project
+	# specify here any files that need to be copied, you can use wildcards like * and ?
+	# ADDON_DATA = 
+
+	# when parsing the file system looking for libraries exclude this for all or
+	# a specific platform
+	# ADDON_LIBS_EXCLUDE =
+
+	# ADDON_DLLS_TO_COPY =
+	# ADDON_DLLS_TO_COPY += "libs/NDI/Bin/x64/Processing.NDI.Lib.x64.dll"
+	# ADDON_DLLS_TO_COPY += "libs/NDI/Bin/Win32/Processing.NDI.Lib.x86.dll"
+
+	# binary libraries, these will be usually parsed from the file system but some 
+	# libraries need to passed to the linker in a specific order/
+	# 
+	# For example in the ofxOpenCV addon we do something like this:
+	#
+	# ADDON_LIBS =
+	# ADDON_LIBS += libs/opencv/lib/linuxarmv6l/libopencv_legacy.a
+	# ADDON_LIBS += libs/opencv/lib/linuxarmv6l/libopencv_calib3d.a
+	# ...
+
+linux64:
+linux:
+win_cb:
+linuxarmv6l:
+linuxarmv7l:
+android/armeabi:	
+android/armeabi-v7a:	

example-receiver/addons.make

@@ -0,0 +1 @@
+ofxNDI

examples/example-receiver/ofApp.cpp → example-receiver/src/ofApp.cpp

@@ -151,10 +151,10 @@ void ofApp::draw(){
 			ndiImage.update();
 		}
 	}
-	*/
-
+
 	// Draw whether received or not
 	ndiImage.draw(0, 0, ofGetWidth(), ofGetHeight());
+	*/
 
 	// Show what it is receiving
 	ShowInfo();

example-sender/addons.make

@@ -0,0 +1 @@
+ofxNDI

examples/example-sender/ofApp.cpp → example-sender/src/ofApp.cpp

@@ -106,7 +106,7 @@ void ofApp::setup(){
 	ofDisableArbTex(); // needed for textures to work
 	textureImage.load("NDI_Box.png"); // Load a texture image for the demo
 	// Workaround for mirrored texture with ofDrawBox and ofBoxPrimitive for Openframeworks 10.
-#if OF_VERSION_MINOR == 10
+#if OF_VERSION_MINOR >= 10
 	textureImage.mirror(false, true);
 #endif
 

example-webcam/addons.make

@@ -0,0 +1 @@
+ofxNDI

examples/example-webcam/ofApp.cpp → example-webcam/src/ofApp.cpp

@@ -49,7 +49,7 @@ void ofApp::setup(){
 	cout << "NDI SDK copyright NewTek (http:\\NDI.NewTek.com)" << endl;
 
 	// Set up webcam
-	vidGrabber.setDeviceID(0); // The first webcam
+	vidGrabber.setDeviceID(1); // The first webcam
 	vidGrabber.setup(640, 480); // try to grab at this size.
 
 	// Set NDI asynchronous sending for best performance