From f5b170cc70f27843c694e49a83fc7e0ff30dd965 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Mon, 3 Jun 2013 16:20:18 -0400 Subject: [PATCH] move video capture examples back to default renderer due to GL bug --- core/todo.txt | 2 +- .../video/examples/Capture/AsciiVideo/AsciiVideo.pde | 2 +- .../Capture/BackgroundSubtraction/BackgroundSubtraction.pde | 4 ++-- .../Capture/BrightnessThresholding/BrightnessThresholding.pde | 2 +- .../Capture/BrightnessTracking/BrightnessTracking.pde | 2 +- .../video/examples/Capture/ColorSorting/ColorSorting.pde | 2 +- .../examples/Capture/FrameDifferencing/FrameDifferencing.pde | 2 +- .../video/examples/Capture/Framingham/Framingham.pde | 2 +- .../Capture/GettingStartedCapture/GettingStartedCapture.pde | 2 +- java/libraries/video/examples/Capture/LivePocky/LivePocky.pde | 2 +- java/libraries/video/examples/Capture/Mirror/Mirror.pde | 2 +- java/libraries/video/examples/Capture/Mirror2/Mirror2.pde | 2 +- .../video/examples/Capture/RadialPocky/RadialPocky.pde | 2 +- java/libraries/video/examples/Capture/SlitScan/SlitScan.pde | 2 +- todo.txt | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/todo.txt b/core/todo.txt index e161724cc..1d83593f0 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,4 +1,4 @@ -0218 core (2.0b10 or 2.0) +0218 core (2.0) X textureWrap(REPEAT) + textureMode(IMAGE) clamps positive coordinates X https://github.com/processing/processing/issues/1809 X saveJSONArray() loops forever, triggers error diff --git a/java/libraries/video/examples/Capture/AsciiVideo/AsciiVideo.pde b/java/libraries/video/examples/Capture/AsciiVideo/AsciiVideo.pde index 01188fa0b..59364288b 100644 --- a/java/libraries/video/examples/Capture/AsciiVideo/AsciiVideo.pde +++ b/java/libraries/video/examples/Capture/AsciiVideo/AsciiVideo.pde @@ -27,7 +27,7 @@ float fontSize = 1.5; void setup() { - size(640, 480, P2D); + size(640, 480); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/BackgroundSubtraction/BackgroundSubtraction.pde b/java/libraries/video/examples/Capture/BackgroundSubtraction/BackgroundSubtraction.pde index dfcedd525..01f16016f 100644 --- a/java/libraries/video/examples/Capture/BackgroundSubtraction/BackgroundSubtraction.pde +++ b/java/libraries/video/examples/Capture/BackgroundSubtraction/BackgroundSubtraction.pde @@ -14,11 +14,11 @@ int[] backgroundPixels; Capture video; void setup() { - size(640, 480, P2D); + size(640, 480); // This the default video input, see the GettingStartedCapture // example if it creates an error - video = new Capture(this, 160, 120); + //video = new Capture(this, 160, 120); video = new Capture(this, width, height); // Start capturing the images from the camera diff --git a/java/libraries/video/examples/Capture/BrightnessThresholding/BrightnessThresholding.pde b/java/libraries/video/examples/Capture/BrightnessThresholding/BrightnessThresholding.pde index f2ee1a0bc..0902784ec 100644 --- a/java/libraries/video/examples/Capture/BrightnessThresholding/BrightnessThresholding.pde +++ b/java/libraries/video/examples/Capture/BrightnessThresholding/BrightnessThresholding.pde @@ -15,7 +15,7 @@ int numPixels; Capture video; void setup() { - size(640, 480, P2D); // Change size to 320 x 240 if too slow at 640 x 480 + size(640, 480); // Change size to 320 x 240 if too slow at 640 x 480 strokeWeight(5); // This the default video input, see the GettingStartedCapture diff --git a/java/libraries/video/examples/Capture/BrightnessTracking/BrightnessTracking.pde b/java/libraries/video/examples/Capture/BrightnessTracking/BrightnessTracking.pde index 53000f033..b1a1b5677 100644 --- a/java/libraries/video/examples/Capture/BrightnessTracking/BrightnessTracking.pde +++ b/java/libraries/video/examples/Capture/BrightnessTracking/BrightnessTracking.pde @@ -11,7 +11,7 @@ import processing.video.*; Capture video; void setup() { - size(640, 480, P2D); + size(640, 480); // Uses the default video input, see the reference if this causes an error video = new Capture(this, width, height); video.start(); diff --git a/java/libraries/video/examples/Capture/ColorSorting/ColorSorting.pde b/java/libraries/video/examples/Capture/ColorSorting/ColorSorting.pde index 34be988ba..e040a1923 100644 --- a/java/libraries/video/examples/Capture/ColorSorting/ColorSorting.pde +++ b/java/libraries/video/examples/Capture/ColorSorting/ColorSorting.pde @@ -20,7 +20,7 @@ int[] bright; int increment = 5; void setup() { - size(800, 600, P2D); + size(800, 600); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/FrameDifferencing/FrameDifferencing.pde b/java/libraries/video/examples/Capture/FrameDifferencing/FrameDifferencing.pde index 0350ab080..78869cd6d 100644 --- a/java/libraries/video/examples/Capture/FrameDifferencing/FrameDifferencing.pde +++ b/java/libraries/video/examples/Capture/FrameDifferencing/FrameDifferencing.pde @@ -13,7 +13,7 @@ int[] previousFrame; Capture video; void setup() { - size(640, 480, P2D); + size(640, 480); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/Framingham/Framingham.pde b/java/libraries/video/examples/Capture/Framingham/Framingham.pde index 8fcb8b1e8..70d775d72 100644 --- a/java/libraries/video/examples/Capture/Framingham/Framingham.pde +++ b/java/libraries/video/examples/Capture/Framingham/Framingham.pde @@ -18,7 +18,7 @@ int[] scoot; void setup() { - size(640, 480, P2D); + size(640, 480); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/GettingStartedCapture/GettingStartedCapture.pde b/java/libraries/video/examples/Capture/GettingStartedCapture/GettingStartedCapture.pde index 22012c7b4..33163dc0e 100644 --- a/java/libraries/video/examples/Capture/GettingStartedCapture/GettingStartedCapture.pde +++ b/java/libraries/video/examples/Capture/GettingStartedCapture/GettingStartedCapture.pde @@ -9,7 +9,7 @@ import processing.video.*; Capture cam; void setup() { - size(640, 480, P2D); + size(640, 480); String[] cameras = Capture.list(); diff --git a/java/libraries/video/examples/Capture/LivePocky/LivePocky.pde b/java/libraries/video/examples/Capture/LivePocky/LivePocky.pde index 3425caad8..64b4b6db5 100644 --- a/java/libraries/video/examples/Capture/LivePocky/LivePocky.pde +++ b/java/libraries/video/examples/Capture/LivePocky/LivePocky.pde @@ -16,7 +16,7 @@ int buffer[]; void setup() { - size(600, 400, P2D); + size(600, 400); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/Mirror/Mirror.pde b/java/libraries/video/examples/Capture/Mirror/Mirror.pde index abd69f7f9..0c527c802 100644 --- a/java/libraries/video/examples/Capture/Mirror/Mirror.pde +++ b/java/libraries/video/examples/Capture/Mirror/Mirror.pde @@ -17,7 +17,7 @@ Capture video; void setup() { - size(640, 480, P2D); + size(640, 480); frameRate(30); cols = width / cellSize; rows = height / cellSize; diff --git a/java/libraries/video/examples/Capture/Mirror2/Mirror2.pde b/java/libraries/video/examples/Capture/Mirror2/Mirror2.pde index da415c8c1..242e55a10 100644 --- a/java/libraries/video/examples/Capture/Mirror2/Mirror2.pde +++ b/java/libraries/video/examples/Capture/Mirror2/Mirror2.pde @@ -16,7 +16,7 @@ Capture video; void setup() { - size(640, 480, P2D); + size(640, 480); // Set up columns and rows cols = width / cellSize; rows = height / cellSize; diff --git a/java/libraries/video/examples/Capture/RadialPocky/RadialPocky.pde b/java/libraries/video/examples/Capture/RadialPocky/RadialPocky.pde index df41a9065..ed4ca728c 100644 --- a/java/libraries/video/examples/Capture/RadialPocky/RadialPocky.pde +++ b/java/libraries/video/examples/Capture/RadialPocky/RadialPocky.pde @@ -19,7 +19,7 @@ int angles[]; void setup() { // size must be set to video.width*video.height*2 in both directions - size(600, 600, P2D); + size(600, 600); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/java/libraries/video/examples/Capture/SlitScan/SlitScan.pde b/java/libraries/video/examples/Capture/SlitScan/SlitScan.pde index c58189245..8f4e06a02 100644 --- a/java/libraries/video/examples/Capture/SlitScan/SlitScan.pde +++ b/java/libraries/video/examples/Capture/SlitScan/SlitScan.pde @@ -17,7 +17,7 @@ int videoSliceX; int drawPositionX; void setup() { - size(600, 240, P2D); + size(600, 240); // This the default video input, see the GettingStartedCapture // example if it creates an error diff --git a/todo.txt b/todo.txt index 79d1e0a91..d759efb8f 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,4 @@ -0218 pde (2.0b10 or 2.0) +0218 pde (2.0) X Example window has the Java application icon X https://github.com/processing/processing/issues/1800 X in some cases, pde.jar was not getting built