Further removal of webcam.

This commit is contained in:
Sandy Noble 2013-05-07 13:58:57 +01:00
parent 256f2b8a05
commit 72747f18f5
2 changed files with 5 additions and 4 deletions

View File

@ -736,9 +736,9 @@ List<String> getControlNamesForWebcamPanel()
controlNames.add(MODE_LIVE_CONFIRM_DRAW); controlNames.add(MODE_LIVE_CONFIRM_DRAW);
// controlNames.add(MODE_VECTOR_PATH_LENGTH_HIGHPASS_CUTOFF); // controlNames.add(MODE_VECTOR_PATH_LENGTH_HIGHPASS_CUTOFF);
controlNames.add(MODE_SHOW_WEBCAM_RAW_VIDEO); // controlNames.add(MODE_SHOW_WEBCAM_RAW_VIDEO);
controlNames.add(MODE_FLIP_WEBCAM_INPUT); // controlNames.add(MODE_FLIP_WEBCAM_INPUT);
controlNames.add(MODE_ROTATE_WEBCAM_INPUT); // controlNames.add(MODE_ROTATE_WEBCAM_INPUT);
return controlNames; return controlNames;
} }

View File

@ -203,7 +203,8 @@ public void webcam_captureCurrentImage(PImage inImage)
public void webcam_captureCurrentImage() public void webcam_captureCurrentImage()
{ {
// capturedImage = webcam_buildLiveImage(); // capturedImage = webcam_buildLiveImage();
// webcam_captureCurrentImage(capturedImage); if (getDisplayMachine().imageIsReady())
webcam_captureCurrentImage(getDisplayMachine().getImage());
} }
public void webcam_processLoadedImage() public void webcam_processLoadedImage()