From 99be4df137052a6f245cdfdf862aee76f7b7e359 Mon Sep 17 00:00:00 2001 From: fjenett Date: Fri, 3 Aug 2012 18:39:49 +0000 Subject: [PATCH] JavaScript mode examples updated for Processing 1.4.0 --- .../DocumentObjectModel/colorFinder/jsinterface.js | 2 +- .../Environment/DocumentObjectModel/nodeTree/forrest.js | 2 +- .../DocumentObjectModel/selectionFlower/selectionmonitor.js | 2 +- javascript/examples/Environment/Input/fileReader/reader.js | 2 +- javascript/examples/Environment/Input/lockedIn/promt.js | 2 +- javascript/examples/HTML5/Audio/blobb/snd.js | 2 +- javascript/examples/HTML5/DragDrop/wordDroppings/drag_drop.js | 2 +- javascript/examples/HTML5/Input/colorRange/inteface.js | 2 +- javascript/examples/HTML5/Input/variableInputs/interface.js | 2 +- javascript/examples/HTML5/Video/charmyDance/charmyDance.pde | 4 +--- javascript/examples/Libraries/Box2D/simpleBox2D/magic.js | 2 +- javascript/examples/Services/Flickr/flickrSearch/flix.js | 2 +- javascript/examples/Services/Twitter/twitterGewitter/twitt.js | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/javascript/examples/Environment/DocumentObjectModel/colorFinder/jsinterface.js b/javascript/examples/Environment/DocumentObjectModel/colorFinder/jsinterface.js index 4803a894c..8d4265b8e 100644 --- a/javascript/examples/Environment/DocumentObjectModel/colorFinder/jsinterface.js +++ b/javascript/examples/Environment/DocumentObjectModel/colorFinder/jsinterface.js @@ -14,7 +14,7 @@ // Get the instance. We just use the first one. Another way would be to use // the automaticaly generated ID "colorFinder", see in index.html - var mySketchInstance = Processing.instances[0]; + var mySketchInstance = Processing.getInstanceById( getProcessingSketchID() ); if ( mySketchInstance == undefined ) { // means it has not started setTimeout( makeTheLink, 200 ); // try again later diff --git a/javascript/examples/Environment/DocumentObjectModel/nodeTree/forrest.js b/javascript/examples/Environment/DocumentObjectModel/nodeTree/forrest.js index 94873fc48..0d141b6e6 100644 --- a/javascript/examples/Environment/DocumentObjectModel/nodeTree/forrest.js +++ b/javascript/examples/Environment/DocumentObjectModel/nodeTree/forrest.js @@ -5,7 +5,7 @@ window.onload = function () { } function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById( getProcessingSketchID() ); if ( sketch == undefined ) setTimeout(tryFindSketch, 200); // retry after 0.2 secs else diff --git a/javascript/examples/Environment/DocumentObjectModel/selectionFlower/selectionmonitor.js b/javascript/examples/Environment/DocumentObjectModel/selectionFlower/selectionmonitor.js index 83c0c3d22..e654ccfb9 100644 --- a/javascript/examples/Environment/DocumentObjectModel/selectionFlower/selectionmonitor.js +++ b/javascript/examples/Environment/DocumentObjectModel/selectionFlower/selectionmonitor.js @@ -12,7 +12,7 @@ window.onload = function () { // this is called (repeatedly) to find the sketch function getSketchInstance() { - var s = Processing.instances[0]; + var s = Processing.getInstanceById(getProcessingSketchID()); if ( s == undefined ) { setTimeout(getSketchInstance, 200); // try again a bit later diff --git a/javascript/examples/Environment/Input/fileReader/reader.js b/javascript/examples/Environment/Input/fileReader/reader.js index 601a6c598..77d212b27 100644 --- a/javascript/examples/Environment/Input/fileReader/reader.js +++ b/javascript/examples/Environment/Input/fileReader/reader.js @@ -4,7 +4,7 @@ window.onload = function () { } function tryFindSketch() { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout(tryFindSketch, 200); // retry soon diff --git a/javascript/examples/Environment/Input/lockedIn/promt.js b/javascript/examples/Environment/Input/lockedIn/promt.js index 01df5d426..99019191b 100644 --- a/javascript/examples/Environment/Input/lockedIn/promt.js +++ b/javascript/examples/Environment/Input/lockedIn/promt.js @@ -6,7 +6,7 @@ window.onload = function () { // find sketch instance function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) setTimeout( tryFindSketch, 200 ); // try again in 0.2 secs else diff --git a/javascript/examples/HTML5/Audio/blobb/snd.js b/javascript/examples/HTML5/Audio/blobb/snd.js index 7f6c93172..6f47a66e0 100644 --- a/javascript/examples/HTML5/Audio/blobb/snd.js +++ b/javascript/examples/HTML5/Audio/blobb/snd.js @@ -4,7 +4,7 @@ window.onload = function () { var audioNode = document.getElementsByTagName("audio")[0]; function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) setTimeout(tryFindSketch,200); // retry else diff --git a/javascript/examples/HTML5/DragDrop/wordDroppings/drag_drop.js b/javascript/examples/HTML5/DragDrop/wordDroppings/drag_drop.js index 1bf51e1eb..821101410 100644 --- a/javascript/examples/HTML5/DragDrop/wordDroppings/drag_drop.js +++ b/javascript/examples/HTML5/DragDrop/wordDroppings/drag_drop.js @@ -6,7 +6,7 @@ window.onload = function () { // try and find the sketch function tryLinkSketch() { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById( getProcessingSketchID() ); if ( sketch == undefined ) setTimeout(tryLinkSketch, 200); /*try again later*/ else { diff --git a/javascript/examples/HTML5/Input/colorRange/inteface.js b/javascript/examples/HTML5/Input/colorRange/inteface.js index 3185b1911..a49dc650d 100644 --- a/javascript/examples/HTML5/Input/colorRange/inteface.js +++ b/javascript/examples/HTML5/Input/colorRange/inteface.js @@ -6,7 +6,7 @@ window.onload = function () { } function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout(tryFindSketch, 200); // try again .. diff --git a/javascript/examples/HTML5/Input/variableInputs/interface.js b/javascript/examples/HTML5/Input/variableInputs/interface.js index d1522f3e4..1c62f6a80 100644 --- a/javascript/examples/HTML5/Input/variableInputs/interface.js +++ b/javascript/examples/HTML5/Input/variableInputs/interface.js @@ -3,7 +3,7 @@ window.onload = function () { } function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout(tryFindSketch, 200); var controller = new Controller(sketch,"form-form"); diff --git a/javascript/examples/HTML5/Video/charmyDance/charmyDance.pde b/javascript/examples/HTML5/Video/charmyDance/charmyDance.pde index d24f6ac77..2b3f5a7a0 100644 --- a/javascript/examples/HTML5/Video/charmyDance/charmyDance.pde +++ b/javascript/examples/HTML5/Video/charmyDance/charmyDance.pde @@ -13,14 +13,12 @@ * */ Video video; PImage frame; - float fSec = 1/25.0; - int fMillis = int(1000 * fSec); - int ts = 0; void setup () { diff --git a/javascript/examples/Libraries/Box2D/simpleBox2D/magic.js b/javascript/examples/Libraries/Box2D/simpleBox2D/magic.js index 7355f8a8c..46e251647 100644 --- a/javascript/examples/Libraries/Box2D/simpleBox2D/magic.js +++ b/javascript/examples/Libraries/Box2D/simpleBox2D/magic.js @@ -11,7 +11,7 @@ window.onload = function () { // try to get the sketch instance from Processing.js function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout( tryFindSketch, 200 ); // retry diff --git a/javascript/examples/Services/Flickr/flickrSearch/flix.js b/javascript/examples/Services/Flickr/flickrSearch/flix.js index cde71a351..b9a738813 100644 --- a/javascript/examples/Services/Flickr/flickrSearch/flix.js +++ b/javascript/examples/Services/Flickr/flickrSearch/flix.js @@ -18,7 +18,7 @@ window.onload = function () { var sendImage = null; function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout(tryFindSketch, 200); //retry later diff --git a/javascript/examples/Services/Twitter/twitterGewitter/twitt.js b/javascript/examples/Services/Twitter/twitterGewitter/twitt.js index fbba159e7..39b096ff8 100644 --- a/javascript/examples/Services/Twitter/twitterGewitter/twitt.js +++ b/javascript/examples/Services/Twitter/twitterGewitter/twitt.js @@ -6,7 +6,7 @@ window.onload = function () { var sendTweet = null; function tryFindSketch () { - var sketch = Processing.instances[0]; + var sketch = Processing.getInstanceById(getProcessingSketchID()); if ( sketch == undefined ) return setTimeout(tryFindSketch, 200); //retry later