vmario
/
polargraphcontroller
mirror of https://github.com/euphy/polargraphcontroller
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/euphy/polargraphcontroller 

Conflicts:
	trace.pde
This commit is contained in:
Sandy Noble 2013-05-09 23:38:42 +01:00
parent 6c8555eda9 72747f18f5
commit 65a9c9afc1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trace.pde
View File

@ -201,8 +201,9 @@ public void trace_captureCurrentImage(PImage inImage)
public void trace_captureCurrentImage()
{
// capturedImage = trace_buildLiveImage();
trace_captureCurrentImage(getDisplayMachine().getImage());
// capturedImage = webcam_buildLiveImage();
if (getDisplayMachine().imageIsReady())
webcam_captureCurrentImage(getDisplayMachine().getImage());
}
public void trace_processLoadedImage()