Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
n1ckfg committed Oct 31, 2013
1 parent 235b7ba commit a27e86d
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 122 deletions.
2 changes: 1 addition & 1 deletion AEkeys.pde
Expand Up @@ -140,7 +140,7 @@ void AEkeysEnd() {
dataAE.add("\r");
dataAE.add("\t" + "app.endUndoGroup();" + "\r");
dataAE.add("} //end script" + "\r");
dataAE.endSave(aeFilePath + "/" + aeFileName + "." + aeFileType);
dataAE.endSave(aeFilePath + "/" + aeFileName + "_" + millis() + "." + aeFileType);
}


7 changes: 4 additions & 3 deletions Controls.pde
Expand Up @@ -21,11 +21,12 @@ void keyPressed() {
if(sendOsc) debugDisplayMidi = false;
}
if (key=='f' || key=='F') openAppFolderHandler();
/*
if(key==' ' || keyCode==33 || keyCode==34){

if(key=='r' || key=='R' || keyCode==33 || keyCode==34){
record = !record;
firstRun = false;
}*/
if(!record) openAppFolderHandler();
}
}

void openAppFolderHandler(){
Expand Down
4 changes: 0 additions & 4 deletions LeapMotionListener.pde
Expand Up @@ -16,10 +16,6 @@
* for Processing. If not, see http://www.gnu.org/licenses/.
*
* Leap Developer SDK. Copyright (C) 2012-2013 Leap Motion, Inc. All rights reserved.
*
* NOTICE: This developer release of Leap Motion, Inc. software is confidential and intended for
* very limited distribution. Parties using this software must accept the SDK Agreement prior to
* obtaining this software and related tools. This software is subject to copyright.
*/

import java.util.Date;
Expand Down
4 changes: 0 additions & 4 deletions LeapMotionP5.pde
Expand Up @@ -16,10 +16,6 @@
* for Processing. If not, see http://www.gnu.org/licenses/.
*
* Leap Developer SDK. Copyright (C) 2012-2013 Leap Motion, Inc. All rights reserved.
*
* NOTICE: This developer release of Leap Motion, Inc. software is confidential and intended for
* very limited distribution. Parties using this software must accept the SDK Agreement prior to
* obtaining this software and related tools. This software is subject to copyright.
*/

import java.util.ArrayList;
Expand Down
199 changes: 106 additions & 93 deletions ManosOsc.pde

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion MayaKeys.pde
Expand Up @@ -107,7 +107,7 @@ void mayaKeysEnd() {
dataMaya.add("#rigidBody(passive=True)" + "\r");
dataMaya.add("#move(0,0,0)" + "\r");
*/
dataMaya.endSave(mayaFilePath + "/" + mayaFileName + "." + mayaFileType);
dataMaya.endSave(mayaFilePath + "/" + mayaFileName + "_" + millis() + "." + mayaFileType);
}


Expand Down
16 changes: 8 additions & 8 deletions data/examples-osx/Jitter example.maxpat
Expand Up @@ -8,7 +8,7 @@
"architecture" : "x86"
}
,
"rect" : [ 623.0, 159.0, 629.0, 509.0 ],
"rect" : [ 797.0, 47.0, 629.0, 509.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -324,10 +324,10 @@
"id" : "obj-8",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 6,
"outlettype" : [ "", "int", "int", "float", "float", "float" ],
"patching_rect" : [ 126.0, 180.0, 91.0, 20.0 ],
"text" : "unpack s i i f f f"
"numoutlets" : 5,
"outlettype" : [ "float", "float", "float", "float", "float" ],
"patching_rect" : [ 126.0, 180.0, 83.0, 20.0 ],
"text" : "unpack f f f f f"
}

}
Expand Down Expand Up @@ -567,7 +567,7 @@
"destination" : [ "obj-14", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 3 ]
"source" : [ "obj-8", 2 ]
}

}
Expand All @@ -576,7 +576,7 @@
"destination" : [ "obj-16", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 4 ]
"source" : [ "obj-8", 3 ]
}

}
Expand All @@ -585,7 +585,7 @@
"destination" : [ "obj-17", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 5 ]
"source" : [ "obj-8", 4 ]
}

}
Expand Down
21 changes: 21 additions & 0 deletions data/examples-osx/animata example.nmt
@@ -0,0 +1,21 @@
<?xml version="1.0" ?>
<animata version="0.004">
<layer name="layer_0002" x="0.000000" y="0.000000" z="0.000000" alpha="1.000000" scale="1.000000" vis="1">
<skeleton>
<joints>
<joint name="hand0" x="344.376709" y="264.888336" fixed="0" selected="0" osc="1" />
<joint name="origin0-0" x="426.313354" y="184.519180" fixed="0" selected="0" osc="1" />
<joint name="finger0-0" x="495.433655" y="118.693695" fixed="0" selected="0" osc="1" />
<joint name="hand1" x="116.192001" y="115.244576" fixed="0" selected="0" osc="1" />
<joint name="origin1-0" x="191.861969" y="200.029724" fixed="0" selected="0" osc="1" />
<joint name="finger1-0" x="256.967621" y="144.742767" fixed="0" selected="0" osc="1" />
</joints>
<bones>
<bone j0="0" j1="1" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="114.756264" selected="0" radius="1.000000" />
<bone j0="1" j1="2" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="95.441078" selected="0" radius="1.000000" />
<bone j0="3" j1="4" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="113.635384" selected="0" radius="1.000000" />
<bone j0="4" j1="5" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="85.428337" selected="0" radius="1.000000" />
</bones>
</skeleton>
</layer>
</animata>
Binary file added data/examples-osx/isadora example.izz
Binary file not shown.
16 changes: 8 additions & 8 deletions data/examples-win/Jitter example.maxpat
Expand Up @@ -8,7 +8,7 @@
"architecture" : "x86"
}
,
"rect" : [ 623.0, 159.0, 629.0, 509.0 ],
"rect" : [ 797.0, 47.0, 629.0, 509.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -324,10 +324,10 @@
"id" : "obj-8",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 6,
"outlettype" : [ "", "int", "int", "float", "float", "float" ],
"patching_rect" : [ 126.0, 180.0, 91.0, 20.0 ],
"text" : "unpack s i i f f f"
"numoutlets" : 5,
"outlettype" : [ "float", "float", "float", "float", "float" ],
"patching_rect" : [ 126.0, 180.0, 83.0, 20.0 ],
"text" : "unpack f f f f f"
}

}
Expand Down Expand Up @@ -567,7 +567,7 @@
"destination" : [ "obj-14", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 3 ]
"source" : [ "obj-8", 2 ]
}

}
Expand All @@ -576,7 +576,7 @@
"destination" : [ "obj-16", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 4 ]
"source" : [ "obj-8", 3 ]
}

}
Expand All @@ -585,7 +585,7 @@
"destination" : [ "obj-17", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-8", 5 ]
"source" : [ "obj-8", 4 ]
}

}
Expand Down
21 changes: 21 additions & 0 deletions data/examples-win/animata example.nmt
@@ -0,0 +1,21 @@
<?xml version="1.0" ?>
<animata version="0.004">
<layer name="layer_0002" x="0.000000" y="0.000000" z="0.000000" alpha="1.000000" scale="1.000000" vis="1">
<skeleton>
<joints>
<joint name="hand0" x="344.376709" y="264.888336" fixed="0" selected="0" osc="1" />
<joint name="origin0-0" x="426.313354" y="184.519180" fixed="0" selected="0" osc="1" />
<joint name="finger0-0" x="495.433655" y="118.693695" fixed="0" selected="0" osc="1" />
<joint name="hand1" x="116.192001" y="115.244576" fixed="0" selected="0" osc="1" />
<joint name="origin1-0" x="191.861969" y="200.029724" fixed="0" selected="0" osc="1" />
<joint name="finger1-0" x="256.967621" y="144.742767" fixed="0" selected="0" osc="1" />
</joints>
<bones>
<bone j0="0" j1="1" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="114.756264" selected="0" radius="1.000000" />
<bone j0="1" j1="2" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="95.441078" selected="0" radius="1.000000" />
<bone j0="3" j1="4" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="113.635384" selected="0" radius="1.000000" />
<bone j0="4" j1="5" stiffness="0.000655" lm="1.000000" lmmin="0.010000" lmmax="1.000000" tempo="0.000000" time="1.570796" size="85.428337" selected="0" radius="1.000000" />
</bones>
</skeleton>
</layer>
</animata>
Binary file added data/examples-win/isadora example.izz
Binary file not shown.

0 comments on commit a27e86d

Please sign in to comment.