mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
Some minor changes so current shape recording doesnt conflict with PDF recording
This commit is contained in:
@@ -7671,6 +7671,13 @@ public class PApplet extends Applet
|
||||
recorder.beginDraw();
|
||||
}
|
||||
|
||||
public PShape beginRecord() {
|
||||
if (!g.isRecordingShape()) {
|
||||
return g.beginRecord();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public void endRecord() {
|
||||
if (recorder != null) {
|
||||
@@ -7678,9 +7685,9 @@ public class PApplet extends Applet
|
||||
recorder.dispose();
|
||||
recorder = null;
|
||||
}
|
||||
// if (g.isRecording()) {
|
||||
// g.endRecord();
|
||||
// }
|
||||
if (g.isRecordingShape()) {
|
||||
g.endRecord();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10268,6 +10275,11 @@ public class PApplet extends Applet
|
||||
}
|
||||
|
||||
|
||||
public boolean isRecordingShape() {
|
||||
return g.isRecordingShape();
|
||||
}
|
||||
|
||||
|
||||
public void mergeShapes(boolean val) {
|
||||
if (recorder != null) recorder.mergeShapes(val);
|
||||
g.mergeShapes(val);
|
||||
|
||||
@@ -5938,21 +5938,22 @@ public class PGraphics extends PImage implements PConstants {
|
||||
showMissingWarning("textureBlend");
|
||||
}
|
||||
|
||||
// public PShape beginRecord() { // ignore
|
||||
// showMissingWarning("beginRecord");
|
||||
// return null;
|
||||
// }
|
||||
|
||||
public PShape beginRecord() { // ignore
|
||||
showMissingWarning("beginRecord");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public void endRecord() { // ignore
|
||||
showMissingWarning("endRecord");
|
||||
}
|
||||
|
||||
|
||||
// public void endRecord() { // ignore
|
||||
// showMissingWarning("endRecord");
|
||||
// }
|
||||
|
||||
|
||||
// public boolean isRecording() {
|
||||
// showMissingWarning("isRecording");
|
||||
// return false;
|
||||
// }
|
||||
public boolean isRecordingShape() {
|
||||
//showMissingWarning("isRecording");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
public void mergeShapes(boolean val) {
|
||||
|
||||
Reference in New Issue
Block a user