local-projects · nicoleyimessier · Jan 20, 2020 · Jan 20, 2020 · Jan 20, 2020 · Jan 20, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,141 +1,3 @@
 [submodule "OpenFrameworks"]
 	path = OpenFrameworks
-	url = https://github.com/local-projects/openFrameworks.git
-[submodule "ExternalAddons/ofxRemoteUI"]
-	path = ExternalAddons/ofxRemoteUI
-	url = https://github.com/local-projects/ofxRemoteUI.git
-[submodule "ExternalAddons/ofxTimeMeasurements"]
-	path = ExternalAddons/ofxTimeMeasurements
-	url = https://github.com/local-projects/ofxTimeMeasurements.git
-[submodule "ExternalAddons/ofxTuio"]
-	path = ExternalAddons/ofxTuio
-	url = https://github.com/local-projects/ofxTuio.git
-[submodule "ExternalAddons/ofxHistoryPlot"]
-	path = ExternalAddons/ofxHistoryPlot
-	url = https://github.com/local-projects/ofxHistoryPlot.git
-[submodule "ExternalAddons/ofxFontStash"]
-	path = ExternalAddons/ofxFontStash
-	url = https://github.com/local-projects/ofxFontStash.git
-[submodule "ExternalAddons/ofxSimpleHttp"]
-	path = ExternalAddons/ofxSimpleHttp
-	url = https://github.com/local-projects/ofxSimpleHttp.git
-[submodule "ExternalAddons/ofxSuperLog"]
-	path = ExternalAddons/ofxSuperLog
-	url = https://github.com/local-projects/ofxSuperLog.git
-[submodule "ExternalAddons/ofxAutoReloadedShader"]
-	path = ExternalAddons/ofxAutoReloadedShader
-	url = https://github.com/local-projects/ofxAutoReloadedShader.git
-[submodule "ExternalAddons/ofxFboBlur"]
-	path = ExternalAddons/ofxFboBlur
-	url = https://github.com/local-projects/ofxFboBlur.git
-[submodule "ExternalAddons/ofxScreenSetup"]
-	path = ExternalAddons/ofxScreenSetup
-	url = https://github.com/local-projects/ofxScreenSetup.git
-[submodule "ExternalAddons/ofxMullion"]
-	path = ExternalAddons/ofxMullion
-	url = https://github.com/local-projects/ofxMullion.git
-[submodule "ExternalAddons/ofxGLError"]
-	path = ExternalAddons/ofxGLError
-	url = https://github.com/local-projects/ofxGLError.git
-[submodule "ExternalAddons/ofxProgressiveTextureLoad"]
-	path = ExternalAddons/ofxProgressiveTextureLoad
-	url = https://github.com/local-projects/ofxProgressiveTextureLoad.git
-[submodule "ExternalAddons/ofxMemoryUsage"]
-	path = ExternalAddons/ofxMemoryUsage
-	url = https://github.com/local-projects/ofxMemoryUsage.git
-[submodule "ExternalAddons/ofxTexturedObject"]
-	path = ExternalAddons/ofxTexturedObject
-	url = https://github.com/local-projects/ofxTexturedObject.git
-[submodule "ExternalAddons/ofxStateMachine"]
-	path = ExternalAddons/ofxStateMachine
-	url = https://github.com/local-projects/ofxStateMachine.git
-[submodule "ExternalAddons/ofxGoogleAnalytics"]
-	path = ExternalAddons/ofxGoogleAnalytics
-	url = https://github.com/local-projects/ofxGoogleAnalytics.git
-[submodule "ExternalAddons/ofxMTJsonParser"]
-	path = ExternalAddons/ofxMTJsonParser
-	url = https://github.com/local-projects/ofxMTJsonParser.git
-[submodule "ExternalAddons/WeightedObject"]
-	path = ExternalAddons/WeightedObject
-	url = https://github.com/local-projects/WeightedObject.git
-[submodule "ExternalAddons/ofxTextureAtlas"]
-	path = ExternalAddons/ofxTextureAtlas
-	url = https://github.com/local-projects/ofxTextureAtlas.git
-[submodule "ExternalAddons/ofxThreadSafeLog"]
-	path = ExternalAddons/ofxThreadSafeLog
-	url = https://github.com/local-projects/ofxThreadSafeLog.git
-[submodule "ExternalAddons/ofxAssets"]
-	path = ExternalAddons/ofxAssets
-	url = https://github.com/local-projects/ofxAssets.git
-[submodule "ExternalAddons/ofxInterface"]
-	path = ExternalAddons/ofxInterface
-	url = https://github.com/local-projects/ofxInterface.git
-[submodule "ExternalAddons/ofxTagSystem"]
-	path = ExternalAddons/ofxTagSystem
-	url = https://github.com/local-projects/ofxTagSystem.git
-[submodule "ExternalAddons/ofxAnimatable"]
-	path = ExternalAddons/ofxAnimatable
-	url = https://github.com/local-projects/ofxAnimatable.git
-[submodule "ExternalAddons/ofxFontStash2"]
-	path = ExternalAddons/ofxFontStash2
-	url = https://github.com/local-projects/ofxFontStash2.git
-[submodule "ExternalAddons/ofxApp"]
-	path = ExternalAddons/ofxApp
-	url = https://github.com/local-projects/ofxApp.git
-[submodule "ExternalAddons/ofxAutoTexture"]
-	path = ExternalAddons/ofxAutoTexture
-	url = https://github.com/local-projects/ofxAutoTexture.git
-[submodule "ExternalAddons/ofxColorGradient"]
-	path = ExternalAddons/ofxColorGradient
-	url = https://github.com/local-projects/ofxColorGradient.git
-[submodule "ExternalAddons/ofxCv"]
-	path = ExternalAddons/ofxCv
-	url = https://github.com/local-projects/ofxCv.git
-[submodule "ExternalAddons/ofxExternalProcess"]
-	path = ExternalAddons/ofxExternalProcess
-	url = https://github.com/local-projects/ofxExternalProcess.git
-[submodule "ExternalAddons/ofxHttpForm"]
-	path = ExternalAddons/ofxHttpForm
-	url = https://github.com/local-projects/ofxHttpForm.git
-[submodule "ExternalAddons/ofxJsonSettings"]
-	path = ExternalAddons/ofxJsonSettings
-	url = https://github.com/local-projects/ofxJsonSettings.git
-[submodule "ExternalAddons/ofxOscRecorder"]
-	path = ExternalAddons/ofxOscRecorder
-	url = https://github.com/local-projects/ofxOscRecorder.git
-[submodule "ExternalAddons/ofxRectangleUtils"]
-	path = ExternalAddons/ofxRectangleUtils
-	url = https://github.com/local-projects/ofxRectangleUtils.git
-[submodule "ExternalAddons/ofxRay"]
-	path = ExternalAddons/ofxRay
-	url = https://github.com/local-projects/ofxRay.git
-[submodule "ExternalAddons/ofxSensu"]
-	path = ExternalAddons/ofxSensu
-	url = https://github.com/local-projects/ofxSensu.git
-[submodule "ExternalAddons/ofxUserContentUpload"]
-	path = ExternalAddons/ofxUserContentUpload
-	url = https://github.com/local-projects/ofxUserContentUpload.git
-[submodule "ExternalAddons/ofxJSON"]
-	path = ExternalAddons/ofxJSON
-	url = https://github.com/local-projects/ofxJSON.git
-[submodule "ExternalAddons/ofxNanoVG"]
-	path = ExternalAddons/ofxNanoVG
-	url = https://github.com/local-projects/ofxNanoVG.git
-[submodule "ExternalAddons/ofxTextureCrop"]
-	path = ExternalAddons/ofxTextureCrop
-	url = https://github.com/local-projects/ofxTextureCrop.git
-[submodule "ExternalAddons/ofxInterfaceKeyboard"]
-	path = ExternalAddons/ofxInterfaceKeyboard
-	url = https://github.com/local-projects/ofxInterfaceKeyboard.git
-[submodule "ExternalAddons/ofxImageResizer"]
-	path = ExternalAddons/ofxImageResizer
-	url = https://github.com/local-projects/ofxImageResizer.git
-[submodule "ExternalAddons/ofxLibwebsockets"]
-	path = ExternalAddons/ofxLibwebsockets
-	url = https://github.com/local-projects/ofxLibwebsockets.git
-[submodule "ExternalAddons/ofxNotificationCenter"]
-	path = ExternalAddons/ofxNotificationCenter
-	url = https://github.com/local-projects/ofxNotificationCenter.git
-[submodule "ExternalAddons/ofxProjectionApp"]
-	path = ExternalAddons/ofxProjectionApp
-	url = https://github.com/local-projects/ofxProjectionApp.git
+	url = https://github.com/hushstudios/openFrameworks
diff --git a/ExternalAddons.make b/ExternalAddons.make
@@ -0,0 +1,11 @@
+ofxRemoteUI,https://github.com/hushstudios/ofxRemoteUI.git
+ofxTimeMeasurements,https://github.com/hushstudios/ofxTimeMeasurements.git
+ofxHistoryPlot,https://github.com/hushstudios/ofxHistoryPlot.git
+ofxFontStash,https://github.com/hushstudios/ofxFontStash.git
+ofxSimpleHttp,https://github.com/hushstudios/ofxSimpleHttp.git
+ofxSuperLog,https://github.com/hushstudios/ofxSuperLog.git
+ofxScreenSetup,https://github.com/hushstudios/ofxScreenSetup.git
+ofxInterface,https://github.com/hushstudios/ofxInterface.git
+ofxAnimatable,https://github.com/hushstudios/ofxAnimatable.git
+ofxNotificationCenter,https://github.com/hushstudios/ofxNotificationCenter.git
+END OF FILE
diff --git a/ExternalAddons/WeightedObject b/ExternalAddons/WeightedObject
diff --git a/ExternalAddons/ofxAnimatable b/ExternalAddons/ofxAnimatable
diff --git a/ExternalAddons/ofxApp b/ExternalAddons/ofxApp
diff --git a/ExternalAddons/ofxAssets b/ExternalAddons/ofxAssets
diff --git a/ExternalAddons/ofxAutoReloadedShader b/ExternalAddons/ofxAutoReloadedShader
diff --git a/ExternalAddons/ofxAutoTexture b/ExternalAddons/ofxAutoTexture
diff --git a/ExternalAddons/ofxColorGradient b/ExternalAddons/ofxColorGradient
diff --git a/ExternalAddons/ofxCv b/ExternalAddons/ofxCv
diff --git a/ExternalAddons/ofxExternalProcess b/ExternalAddons/ofxExternalProcess
diff --git a/ExternalAddons/ofxFboBlur b/ExternalAddons/ofxFboBlur
diff --git a/ExternalAddons/ofxFontStash b/ExternalAddons/ofxFontStash
diff --git a/ExternalAddons/ofxFontStash2 b/ExternalAddons/ofxFontStash2
diff --git a/ExternalAddons/ofxGLError b/ExternalAddons/ofxGLError
diff --git a/ExternalAddons/ofxGoogleAnalytics b/ExternalAddons/ofxGoogleAnalytics
diff --git a/ExternalAddons/ofxHistoryPlot b/ExternalAddons/ofxHistoryPlot
diff --git a/ExternalAddons/ofxHttpForm b/ExternalAddons/ofxHttpForm
diff --git a/ExternalAddons/ofxImageResizer b/ExternalAddons/ofxImageResizer
diff --git a/ExternalAddons/ofxInterface b/ExternalAddons/ofxInterface
diff --git a/ExternalAddons/ofxInterfaceKeyboard b/ExternalAddons/ofxInterfaceKeyboard
diff --git a/ExternalAddons/ofxJSON b/ExternalAddons/ofxJSON
diff --git a/ExternalAddons/ofxJsonSettings b/ExternalAddons/ofxJsonSettings
diff --git a/ExternalAddons/ofxLibwebsockets b/ExternalAddons/ofxLibwebsockets
diff --git a/ExternalAddons/ofxMTJsonParser b/ExternalAddons/ofxMTJsonParser
diff --git a/ExternalAddons/ofxMemoryUsage b/ExternalAddons/ofxMemoryUsage
diff --git a/ExternalAddons/ofxMullion b/ExternalAddons/ofxMullion
diff --git a/ExternalAddons/ofxNanoVG b/ExternalAddons/ofxNanoVG
diff --git a/ExternalAddons/ofxNotificationCenter b/ExternalAddons/ofxNotificationCenter
diff --git a/ExternalAddons/ofxOscRecorder b/ExternalAddons/ofxOscRecorder
diff --git a/ExternalAddons/ofxProgressiveTextureLoad b/ExternalAddons/ofxProgressiveTextureLoad
diff --git a/ExternalAddons/ofxProjectionApp b/ExternalAddons/ofxProjectionApp
diff --git a/ExternalAddons/ofxRay b/ExternalAddons/ofxRay
diff --git a/ExternalAddons/ofxRectangleUtils b/ExternalAddons/ofxRectangleUtils
diff --git a/ExternalAddons/ofxRemoteUI b/ExternalAddons/ofxRemoteUI
diff --git a/ExternalAddons/ofxScreenSetup b/ExternalAddons/ofxScreenSetup
diff --git a/ExternalAddons/ofxSensu b/ExternalAddons/ofxSensu
diff --git a/ExternalAddons/ofxSimpleHttp b/ExternalAddons/ofxSimpleHttp
diff --git a/ExternalAddons/ofxStateMachine b/ExternalAddons/ofxStateMachine
diff --git a/ExternalAddons/ofxSuperLog b/ExternalAddons/ofxSuperLog
diff --git a/ExternalAddons/ofxTagSystem b/ExternalAddons/ofxTagSystem
diff --git a/ExternalAddons/ofxTextureAtlas b/ExternalAddons/ofxTextureAtlas
diff --git a/ExternalAddons/ofxTextureCrop b/ExternalAddons/ofxTextureCrop
diff --git a/ExternalAddons/ofxTexturedObject b/ExternalAddons/ofxTexturedObject
diff --git a/ExternalAddons/ofxThreadSafeLog b/ExternalAddons/ofxThreadSafeLog
diff --git a/ExternalAddons/ofxTimeMeasurements b/ExternalAddons/ofxTimeMeasurements
diff --git a/ExternalAddons/ofxTuio b/ExternalAddons/ofxTuio
diff --git a/ExternalAddons/ofxUserContentUpload b/ExternalAddons/ofxUserContentUpload
diff --git a/OpenFrameworks b/OpenFrameworks
diff --git a/README.md b/README.md
@@ -47,29 +47,48 @@ git clone -b version/0.11.0 --recursive https://github.com/local-projects/of-pro
 
 This will create a new project, download its submodules (OF and external addons inlcuded), and download OF libraries.
 
-1. [Create a new, empty Github repository](https://github.com/new) repository to copy the template into. For example, let' call this repo **myProject** in the Github user account **local-projects**.
+1. [Create a new, empty Github repository](https://github.com/new) repository. For example, let' call this repo **myProject** in the Github user account **local-projects**.
 
-2. Clone the template onto your computer. The branch should match your desired OF version (here, **0.11.0**). Supported versions include `0.11.0`. Passing the `--recursive` command will download all submodules, including OF and any external addons.
+2. Clone your project repo.
 
-   ```bash
-   git clone -b version/0.11.0 --recursive https://github.com/local-projects/of-project-template.git
+	```bash
+   git clone https://github.com/local-projects/myProject.git
    ```
 
-3. Rename this template folder to the name of your repo. Navigate into the repo.
+3. Add the of-project-template as a remote named **template**.
+
+	```bash
+	cd myProject
+	git remote add template https://github.com/local-projects/of-project-template.git
+	```
+
+4. Pull the of-project-template repo, pointing to the correct branch. Below pulls the branch **version/0.11.0**.
 
    ```bash
-   mv of-project-template myProject
-   cd myProject
+   git pull template version/0.11.0
    ```
+
+5. Update the ***ExternallAddons.make*** file with the addons for the project. The format should follow the example below. Each line represents a new addon with the **name of the addon** and **addon repo URL** seperated by a comma respectively. The purpose of this script is to make the template less bulky and independent of specific addons. 
 
-4. Set the remote origin to your project repo. Push the template files to your repo.
+	```bash
+   ofxRemoteUI,https://github.com/local-projects/ofxRemoteUI.git
+	ofxTimeMeasurements,https://github.com/local-projects/ofxTimeMeasurements.git
+   ```
 
-   ```bash
-   git remote set-url origin https://github.com/local-projects/myProject.git
-   git push
+6. Once the ***ExternallAddons.make*** file is complete, install the submodules using the ***install_submodules.sh*** script. This script will clone openFrameworks and all addons in the make file. 
+
+ 	```bash
+   ./install_submodules.sh
    ```
 
-5. Download OpenFrameworks libraries. Pass the platform (here, Visual Studio 2017) and the version (here, 0.11.0 — this should correspond with the template's branch version above). 
+7. Add the changes to your project repo. 
+
+ 	```bash
+   git add .
+   git push
+   ```
+
+8. ownload OpenFrameworks libraries. Pass the platform (here, Visual Studio 2017) and the version (here, 0.11.0 — this should correspond with the template's branch version above). 
 
    ```bash
    ./OpenFrameworks/scripts/dev/download_libs.sh -p vs2017 -v 0.11.0

diff --git a/install_submodules.sh b/install_submodules.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+echo ---- Installing openframeworks ----
+
+git submodule update --init --recursive
+
+echo ---- Attempting to install all submodules ----
+
+input="${PWD}/ExternalAddons.make"
+echo "ExternalAddons Path: $input"
+
+while IFS= read -r line
+do
+	counter=0
+
+	for i in $(echo $line | sed "s/,/ /g")
+	do
+
+    	if [ "$counter" == "0" ]; then
+    		addon_name="$i"
+            path="ExternalAddons/${addon_name}"
+    	else
+    	   addon_url="$i"
+    	   echo "${addon_url} to path ${path}"
+           git submodule add $addon_url $path
+        fi
+
+    	((counter++))
+	done
+
+done < "$input"
+
+
+echo  ---- Completed Submodule Install ---- 
+
+