Update for Afterglow 0.2.1.

Deep-Symmetry · Apr 5, 2016 · daf5cdf · daf5cdf
1 parent 58d7444
commit daf5cdf
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/MaxPackage/afterglow-max/examples/afterglow.cue.aim.example.maxpat b/MaxPackage/afterglow-max/examples/afterglow.cue.aim.example.maxpat
@@ -3,13 +3,13 @@
 		"fileversion" : 1,
 		"appversion" : 		{
 			"major" : 7,
-			"minor" : 0,
-			"revision" : 5,
+			"minor" : 1,
+			"revision" : 0,
 			"architecture" : "x86",
 			"modernui" : 1
 		}
 ,
-		"rect" : [ 405.0, 252.0, 613.0, 488.0 ],
+		"rect" : [ 978.0, 457.0, 613.0, 488.0 ],
 		"bglocked" : 0,
 		"openinpresentation" : 0,
 		"default_fontsize" : 12.0,
@@ -235,13 +235,14 @@
 , 			{
 				"box" : 				{
 					"id" : "obj-5",
+					"linecount" : 2,
 					"maxclass" : "message",
 					"numinlets" : 2,
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
-					"patching_rect" : [ 145.0, 440.0, 131.0, 22.0 ],
+					"patching_rect" : [ 145.0, 440.0, 131.0, 35.0 ],
 					"style" : "",
-					"text" : "started here 31 Aim"
+					"text" : "ended 52 \"Aim torrent-1 (Group A)\""
 				}
 
 			}
@@ -297,7 +298,7 @@
 					"outlettype" : [ "", "int", "int", "int" ],
 					"patching_rect" : [ 257.0, 397.0, 152.0, 22.0 ],
 					"style" : "",
-					"text" : "mxj afterglow.max.Cue 1 8"
+					"text" : "mxj afterglow.max.Cue 8 9"
 				}
 
 			}
@@ -408,12 +409,8 @@
 				"type" : "TEXT",
 				"implicit" : 1
 			}
-, 			{
-				"name" : "mxj.mxo",
-				"type" : "iLaX"
-			}
  ],
-		"embedsnapshot" : 0
+		"autosave" : 0
 	}
 
 }
diff --git a/MaxPackage/afterglow-max/help/afterglow.max.Cue.maxhelp b/MaxPackage/afterglow-max/help/afterglow.max.Cue.maxhelp
@@ -3,8 +3,8 @@
 		"fileversion" : 1,
 		"appversion" : 		{
 			"major" : 7,
-			"minor" : 0,
-			"revision" : 5,
+			"minor" : 1,
+			"revision" : 0,
 			"architecture" : "x86",
 			"modernui" : 1
 		}
@@ -48,8 +48,8 @@
 					"numoutlets" : 1,
 					"outlettype" : [ "" ],
 					"parameter_enable" : 0,
-					"patching_rect" : [ 420.0, 309.0, 100.0, 54.0 ],
-					"presentation_rect" : [ 420.0, 309.0, 100.0, 54.0 ]
+					"patching_rect" : [ 420.0, 309.0, 100.0, 24.0 ],
+					"presentation_rect" : [ 420.0, 309.0, 100.0, 24.0 ]
 				}
 
 			}
@@ -286,7 +286,7 @@
 					"outlettype" : [ "" ],
 					"patching_rect" : [ 148.5, 366.0, 139.5, 22.0 ],
 					"style" : "",
-					"text" : "ended 31 \"Strobe All\""
+					"text" : "ended 53 \"Strobe All\""
 				}
 
 			}
@@ -306,12 +306,12 @@
 				"box" : 				{
 					"id" : "obj-22",
 					"maxclass" : "newobj",
-					"numinlets" : 3,
-					"numoutlets" : 3,
-					"outlettype" : [ "", "int", "int" ],
+					"numinlets" : 4,
+					"numoutlets" : 4,
+					"outlettype" : [ "", "int", "int", "int" ],
 					"patching_rect" : [ 269.0, 308.0, 152.0, 22.0 ],
 					"style" : "",
-					"text" : "mxj afterglow.max.Cue 0 6"
+					"text" : "mxj afterglow.max.Cue 0 7"
 				}
 
 			}
@@ -428,12 +428,8 @@
 				"type" : "TEXT",
 				"implicit" : 1
 			}
-, 			{
-				"name" : "mxj.mxo",
-				"type" : "iLaX"
-			}
  ],
-		"embedsnapshot" : 0
+		"autosave" : 0
 	}
 
 }
diff --git a/MaxPackage/afterglow-max/java-classes/init.clj b/MaxPackage/afterglow-max/java-classes/init.clj
@@ -30,7 +30,7 @@
   demo-show
   (atom nil))
 
-;; This function sets up the demo show. When you are ready, edit it to
+;; This function sets up a demo show. When you are ready, edit it to
 ;; contain the actual lights you have, using your new fixture definitions
 ;; in fixtures.clj, patched on the actual DMX addresses they use, and at
 ;; the actual physical locations and orientations that you have them set
@@ -84,13 +84,19 @@
   (show/patch-fixture! :snowball (blizzard/snowball) universe 33 :x (tf/inches -76) :y (tf/inches 32)
                        :z (tf/inches 164.5))
   (show/patch-fixture! :hyp-rgb (adj/hypnotic-rgb) universe 45)
+
+  ;; Turn on the OSC server.
+  (when (nil? @afterglow.core/osc-server)
+    (afterglow.core/start-osc-server 16010))
+
   '*show*)
 
-;; Create the demo show as specified above, and set it as the default show.
+;; Create the sample show that ships with Afterglow, because the cues depend on it.
+;; Replace this with a call to create your own show when you are ready.
 (use-demo-show)
 
 ;; Create the standard Afterglow sample cues within the demo show cue grid.
-(examples/make-cues)
+(examples/make-cues false)
 
 ;; Add your own cues and effects here, using the source for examples/make-cues as a guide...
 ;; Once you have enough, you may no longer need the example ones.
diff --git a/project.clj b/project.clj
@@ -1,11 +1,11 @@
-(defproject afterglow-max "0.2.1-SNAPSHOT"
+(defproject afterglow-max "0.2.1"
   :description "A package for hosting Afterglow inside Cycling ‘74’s Max."
   :url "https://github.com/brunchboy/afterglow-max"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [afterglow "0.2.1-SNAPSHOT"]
-                 [com.taoensso/timbre "4.2.1"]]
+                 [afterglow "0.2.1"]
+                 [com.taoensso/timbre "4.3.1"]]
   :main afterglow.core  ; So command-line arguments can be used, e.g. to convert QXF files.
   :uberjar-name "afterglow-max.jar"
   :manifest {"Name" ~#(str (clojure.string/replace (:group %) "." "/")