commit before final camera dev

"tag" things before we get serious

soft/doublePrecision.js

@@ -25,7 +25,7 @@ var myEnumParam = script.addEnumParameter("My Enum Param","Description of my enu
 											"Option 1", 1,													//Each pair of values after the first 2 arguments define an option and its linked data
 											"Option 2", 5,												    //First argument of an option is the label (string)
 											"Option 3", "banana"											//Second argument is the value, it can be whatever you want
-											); 	
+											);
 */
 
 
@@ -65,7 +65,7 @@ function scriptParameterChanged(param)
 		script.log(MSB+ " "+ LSB);
 		local.sendCC(channel, 0, MSB);
 		local.sendCC(channel, 32, LSB);
-	
+
 	}
 }
 
@@ -98,11 +98,11 @@ function moduleParameterChanged(param)
 	if(param.isParameter())
 	{
 		script.log("Module parameter changed : "+param.name+" > "+param.get());
-	}else 
+	}else
 	{
-		script.log("Module parameter triggered : "+value.name);	
+		script.log("Module parameter triggered : "+value.name);
 	}
-	
+
 }
 
 /*
@@ -113,10 +113,10 @@ function moduleValueChanged(value)
 {
 	if(value.isParameter())
 	{
-		script.log("Module value changed : "+value.name+" > "+value.get());	
-	}else 
+		script.log("Module value changed : "+value.name+" > "+value.get());
+	}else
 	{
-		script.log("Module value triggered : "+value.name);	
+		script.log("Module value triggered : "+value.name);
 	}
 }
 

soft/keyframes.js

@@ -1,15 +1,28 @@
+//MIDI 14bit management
+var pan_midi_ch = script.addIntParameter("pan midi channel", "", 0);
+var pan_midi={channel:pan_midi_ch.get(), MSB:0, LSB:0, target:root.customVariables.unitValues.variables.pan.pan };
+
+var tilt_midi_ch = script.addIntParameter("tilt midi channel", "", 1);
+var tilt_midi={channel:tilt_midi_ch.get(), MSB:0, LSB:0, target:root.customVariables.unitValues.variables.tilt.tilt};
 
 var delCue_Trigger = script.addTrigger("clear cues", "clear all cues in the timeline");
 var clearTL_Trigger = script.addTrigger("clear timeline", "clear all cues and keys in the timeline");
+var createKeyGroup_Trigger = script.addTrigger("create group","create key group @ current time");
+var createKeyGroupInOut_Trigger = script.addTrigger("create InOut group","create key group @ current time and key group ten seconds later, with constant  values inbetween");
 
 var myFile = script.addFileParameter("textFile", "this is a text file");
 var myTrigger = script.addTrigger("My Trigger", "Trigger description"); 									//This will add a trigger (button)
 
 var tl_keyframes = {cues : {}, keys : {}} ; //holds timeline keys, is updated at fixed rate
-var tl_refresh_rate = 0.5;
+//variable to hold group logic
+var tl_groups = {groups: 0
+	/*group0 : { inCue : {pan : "key", tilt : "key", zoom : "key", dim : "key", focus : "key"},
+							 							outCue : {pan : "key", tilt : "key", zoom : "key", dim : "key", focus : "key"}
+													}*/
+								} ;
 
 var file_keyframes = {groups : 0} ; //holds file keys, used to save and load
-
+var myFloatParam = script.addFloatParameter("My Float Param","Description of my float param",.1,0,1);
 
 
 /*
@@ -32,10 +45,35 @@ var myEnumParam = script.addEnumParameter("My Enum Param","Description of my enu
 //you can also declare custom internal variable
 //var myValue = 5;
 
+///////////////////////		MIDI FUNCTIONS			///////////////////////
+
+function checkAxe(CC){
+	if(CC==pan_midi.channel || CC==pan_midi.channel+32){
+		return pan_midi;
+	}
+	else return 0;
+}
+
+function updateAxe(axe, CC, value){
+	if(CC==axe.channel){
+		axe.MSB = value;
+		// root.customVariables.unitValues.variables.pan.pan.set((128*axe.MSB+axe.LSB)/16383.0);
+	}
+	if(CC==axe.channel+32){
+		axe.LSB = value;
+		// myFloatParam.set((128*MSB+LSB)/16383.0);
+	}
+	axe.target=(128*axe.MSB+axe.LSB)/16383.0;
+	script.log(axe.target);
+}
+
+
+///////////////////////		TIMELINE FUNCTIONS		///////////////////////
+
+function refresh_tl_keys_list(){
+
 
-///////////////////////		HELPERS FUNCTIONS		///////////////////////
 
-function refresh_tl_keys(){
 	// tl_keyframes['cues']
 	if(root.sequences.keys.cues.items.length){
 		for (var i = 0 ; i < root.sequences.keys.cues.items.length ; i++){
@@ -67,6 +105,36 @@ function refresh_tl_keys(){
 	}
 
 	// myFile.writeFile(JSON.stringify(tl_keyframes), 1);
+}
+
+function apply_tl_groups() {
+	if(tl_groups.groups){
+		for(var i=0 ; i<tl_groups.groups ; i++){
+			//set all keys in a group to its cue time
+			var tempGroup = tl_groups['group'+i];
+			var hasOut= typeof tempGroup.cueOut.pan!='undefined' ;
+			var layers = root.sequences.keys.layers.items ;
+			var inTime = root.sequences.keys.cues[tempGroup.cueIn.cue].time.get();
+			var outTime;
+			if(hasOut){ outTime = root.sequences.keys.cues[tempGroup.cueOut.cue].time.get();}
+			if(layers.length){
+				for(var j = 0 ; j<layers.length ; j++){
+					var tempLayer=layers[j].name;
+					var inKey = tempGroup.cueIn[tempLayer];
+					root.sequences.keys.layers[tempLayer].automation[inKey].position.set(inTime);
+					if (hasOut) {
+						var outKey = tempGroup.cueOut[tempLayer];
+						root.sequences.keys.layers[tempLayer].automation[outKey].position.set(outTime);
+						//apply inKey value
+						root.sequences.keys.layers[tempLayer].automation[outKey].value.set(root.sequences.keys.layers[tempLayer].automation[inKey].value.get());
+					}
+				}
+			}
+		}
+	}
+	// root.sequences.keys.layers.items[0].automation.items[0].position.set(root.sequences.keys.cues.items[0].time.get());
+	// script.log(root.sequences.keys.cues.items[0].name + "  " + root.sequences.keys.layers.items[0].automation.items[0].name );
+
 
 }
 
@@ -97,39 +165,71 @@ function clear_tl_keys(){
 function clear_tl_full(){
 	clear_tl_cues();
 	clear_tl_keys();
+	tl_groups = {groups: 0};
+	myFile.writeFile(JSON.stringify(tl_groups), 1);
 }
 
-function create_keyGroup(){
-	//creates a cue and a key in each layer with same time position and current layer Values
-	var groupIndex = file_keyframes.groups;
-	script.log(groupIndex);
+function create_keyGroup(mode){ //mode=0 single cue, mode=1 dual cues
 
+	 //get current variables values
 	var tempValues = {
 		position: root.sequences.keys.currentTime.get() ,
-		pan : root.sequences.keys.layers.pan.mapping.outValue.get(),
-		tilt : root.sequences.keys.layers.tilt.mapping.outValue.get(),
-		zoom : root.sequences.keys.layers.zoom.mapping.outValue.get(),
-		dim : root.sequences.keys.layers.dim.mapping.outValue.get(),
+		pan : root.customVariables.unitValues.variables.pan.pan.get(),
+		tilt : root.customVariables.unitValues.variables.tilt.tilt.get(),
+		zoom : root.customVariables.unitValues.variables.zoom.zoom.get(),
+		dim : root.customVariables.unitValues.variables.dimmer.dimmer.get(),
+		focus: root.customVariables.unitValues.variables.focus.focus.get(),
+		speed : root.customVariables.unitValues.variables.speed.speed.get(),
+
 	};
+	// script.log(tempValues.pan);
 
+	//create new entry in group list
+	var groupIndex = tl_groups.groups;
+	script.log("creating group # : " + groupIndex);
 
+	tl_groups['group'+groupIndex] ={cueIn: {}};
 	var inCue = root.sequences.keys.cues.addItem();
 	inCue.time.set(tempValues.position);
-	script.log(inCue.name);
-	var outCue = root.sequences.keys.cues.addItem();
-	outCue.time.set(tempValues.position+1.);
-	script.log(outCue.name);
-
-	var groupKeys = {in:{}, out:{}} ;
+	tl_groups['group'+groupIndex].cueIn.cue = inCue.name;
+	//create cues and tl_group entries
+	if(mode){
+		tl_groups['group'+groupIndex].cueOut = {} ;
+		var outCue = root.sequences.keys.cues.addItem();
+		outCue.time.set(tempValues.position+10.);
+		tl_groups['group'+groupIndex].cueOut.cue = outCue.name;
+	}
+	//create keys
 	var layers = root.sequences.keys.layers.items ;
 	if(layers.length){
-		for (var i = 0 ; i<layers.length ; i++){
-			tempKey = layers[i].automation.addItem();
-			tempKey.position.set(tempValues.position);
-		}
-	}
-
+		for(var i = 0 ; i<layers.length ; i++){
+				tempKeyIn = root.sequences.keys.layers.items[i].automation.addItem();
+				tempKeyIn.value.set(tempValues[root.sequences.keys.layers.items[i].name]);
+				tempKeyIn.position.set(inCue.time.get());
+				tl_groups['group'+groupIndex].cueIn[root.sequences.keys.layers.items[i].name]=tempKeyIn.name;
+
+				if(mode) {
+					tempKeyOut = root.sequences.keys.layers.items[i].automation.addItem();
+					tempKeyOut.value.set(tempValues[root.sequences.keys.layers.items[i].name]);
+					tempKeyOut.position.set(outCue.time.get());
+					tl_groups['group'+groupIndex].cueOut[root.sequences.keys.layers.items[i].name]=tempKeyOut.name;
+				}
 
+				//script.log(layers[i].name);
+				//layers[i].automation.reorderItems();
+				//add one more, then remove it immediatly (force refresh)
+				// tempKey = root.sequences.keys.layers.items[0].automation.addItem();
+				// tempKey.position.set(root.sequences.keys.totalTime.get()-1);
+				// root.sequences.keys.layers.items[0].automation.removeItem(tempKey);
+				// if (layers[i].automation.items.length){
+				// 	for (var j = 0 ; j<root.sequences.keys.layers.items[i].automation.items.length ; j++){
+				// 		script.log(root.sequences.keys.layers.items[i].automation.items[j].name);
+				// 	}
+				// }
+			}
+		}
+		tl_groups.groups += 1;
+		myFile.writeFile(JSON.stringify(tl_groups), 1);
 }
 
 
@@ -142,6 +242,13 @@ function create_keyGroup(){
 */
 function init()
 {
+	script.log("Reading key group file");
+	tl_groups = JSON.parse(myFile.readFile());
+	script.log (tl_groups.groups);
+
+	// script.log(root.reference);
+	// script.log(root.sequences.keys.addCueAt(1.11));
+	// root.sequences.keys.layers[0].getObjectProperties();
 	//myFloatParam.set(5); //The .set() function set the parameter to this value.
 	//myColorParam.set([1,.5,1,1]);	//for a color parameter, you need to pass an array with 3 (RGB) or 4 (RGBA) values.
 	//myP2DParam.set([1.5,-5]); // for a Point2D parameter, you need to pass 2 values (XY)
@@ -165,9 +272,10 @@ function scriptParameterChanged(param)
 	//You can use the script.log() function to show an information inside the logger panel. To be able to actuallt see it in the logger panel, you will have to turn on "Log" on this script.
 	script.log("Parameter changed : "+param.name); //All parameters have "name" property
 	if(param.is(myTrigger)){
-		 script.log("Trigger !"); //You can check if two variables are the reference to the same parameter or object with the method .is()
-		 create_keyGroup();
-
+		script.log(root.sequences.keys.layers.items[0].automation.items.length);
+		for (var j = 0 ; j<root.sequences.keys.layers.items[0].automation.items.length ; j++){
+			script.log(root.sequences.keys.layers.items[0].automation.items[j].name);
+		}
 		//  for (var i = tl.cues.items.length-1 ; i>=0 ; i--){
 	 	// 	script.log(tl.cues.items[i].name);
 	 	// }
@@ -175,6 +283,12 @@ function scriptParameterChanged(param)
 	}
 	else if (param.is(delCue_Trigger)){clear_tl_cues();}
 	else if (param.is(clearTL_Trigger)){clear_tl_full();}
+	else if (param.is(createKeyGroup_Trigger)){create_keyGroup(0);}
+	else if (param.is(createKeyGroupInOut_Trigger)){create_keyGroup(1);}
+	else if (param.is(myFloatParam)){
+		//var time = myFloatParam.get() * root.sequences.keys.totalTime.get();
+		// root.sequences.keys.layers.items[0].automation.items[0].position.set(time);
+	}
 	else if(param.is(myEnumParam)) script.log("Label = "+param.get()+", data = "+param.getData()); //The enum parameter has a special function getData() to get the data associated to the option
 	// else script.log("Value is "+param.get()); //All parameters have a get() method that will return their value
 	// script.log(myFile.readFile());
@@ -184,14 +298,15 @@ function scriptParameterChanged(param)
  This function, if you declare it, will launch a timer at 50hz, calling this method on each tick
 */
 var tl_refresh_delta = 0.;
-
+var tl_refresh_rate = 0.5;
 
 function update(deltaTime)
 {
 	tl_refresh_delta += deltaTime ;
 	if (tl_refresh_delta > tl_refresh_rate){
 			tl_refresh_delta = 0. ;
-			// refresh_tl_keys();
+			refresh_tl_keys_list();
+			apply_tl_groups();
 			// script.log("Update : "+util.getTime()+", delta = "+deltaTime); //deltaTime is the time between now and last update() call, util.getTime() will give you a timestamp relative to either the launch time of the software, or the start of the computer.
 	}
 
@@ -214,13 +329,13 @@ function update(deltaTime)
 */
 function moduleParameterChanged(param)
 {
-	if(param.isParameter())
-	{
-		script.log("Module parameter changed : "+param.name+" > "+param.get());
-	}else
-	{
-		script.log("Module parameter triggered : "+value.name);
-	}
+	// if(param.isParameter())
+	// {
+	// 	script.log("Module parameter changed : "+param.name+" > "+param.get());
+	// }else
+	// {
+	// 	script.log("Module parameter triggered : "+value.name);
+	// }
 }
 
 /*
@@ -229,36 +344,31 @@ function moduleParameterChanged(param)
 */
 function moduleValueChanged(value)
 {
-	if(value.isParameter())
-	{
-		script.log("Module value changed : "+value.name+" > "+value.get());
-	}else
-	{
-		script.log("Module value triggered : "+value.name);
-	}
+	// if(value.isParameter())
+	// {
+	// 	script.log("Module value changed : "+value.name+" > "+value.get());
+	// }else
+	// {
+	// 	script.log("Module value triggered : "+value.name);
+	// }
 }
 
-/* ********** OSC MODULE SPECIFIC SCRIPTING ********************* */
-/*
-
-OSC Modules have specific methods that can be used to send OSC message from Script.
-If you want to send an OSC Message from this script, you can do the following :
-
-local.send("/myAddress",1,.5f,"cool"); //This will send an OSC Message with address "/myAddress" and 3 arguments <int>, <float> and <string>
 
-*/
-/*
-You can intercept OSC message with the function oscEvent(address, args)
-*/
+/* ********** MIDI MODULE SPECIFIC SCRIPTING ********************* */
 
-function oscEvent(address, args)
+function ccEvent(channel, number, value)
 {
-	//param "address" is the address of the OSC Message
-	//param "args" is an array containing all the arguments of the OSC Message
-
-	script.log("OSC Message received "+address+", "+args.length+" arguments");
-	for(var i=0; i < args.length; i++)
-	{
-		script.log(" > "+args[i]);
-	}
+	// script.log("ControlChange received "+channel+", "+number+", "+value);
+	//feedback to BCF
+	local.sendCC(channel, number, value);
+	var currentAxe=checkAxe(number);
+	if (currentAxe){updateAxe(currentAxe, number, value);}
+	// if(number==pan_midi.channel){
+	// 	MSB = value;
+	// 	myFloatParam.set((128*MSB+LSB)/16383.0);
+	// }
+	// if(number==32){
+	// 	LSB = value;
+	// 	myFloatParam.set((128*MSB+LSB)/16383.0);
+	// }
 }