Skip to content

Commit 08f330a

Browse files
benfrybenfry
committed
move PConstants around a bit, add annotations for overrides, cleaning up unapproved PShape additions
1 parent 52f2326 commit 08f330a

21 files changed

+753
-462
lines changed

‎android/core/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
3+
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
4+
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
5+
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
6+
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
27
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
38
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
49
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -17,40 +22,56 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
1722
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
1823
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
1924
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
25+
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
2026
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
2127
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
2228
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
2329
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
2430
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
2531
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
2632
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
33+
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
2734
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
2835
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
29-
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
36+
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
3037
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
3138
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
39+
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
3240
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
41+
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
3342
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
3443
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
44+
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
3545
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
3646
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
3747
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
3848
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
3949
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
50+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
4051
org.eclipse.jdt.core.compiler.problem.nullReference=warning
52+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
53+
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
4154
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
4255
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
4356
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
4457
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
58+
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
4559
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
60+
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
4661
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
62+
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
4763
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
64+
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
65+
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
4866
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
4967
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
68+
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
5069
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
5170
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
5271
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
72+
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
5373
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
74+
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
5475
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
5576
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
5677
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
@@ -63,6 +84,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
6384
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
6485
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
6586
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
87+
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
6688
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
6789
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
6890
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

‎android/core/src/processing/core/PApplet.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import android.text.format.Time;
4646
import android.util.*;
4747
import android.view.*;
48+
import android.view.ViewGroup.LayoutParams;
4849
import android.widget.*;
4950

5051
import org.apache.http.client.HttpClient;
@@ -493,8 +494,8 @@ public void onCreate(Bundle savedInstanceState) {
493494
// can keep your "talentless hack" comments to yourself. Ahem.)
494495
RelativeLayout overallLayout = new RelativeLayout(this);
495496
RelativeLayout.LayoutParams lp =
496-
new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT,
497-
RelativeLayout.LayoutParams.WRAP_CONTENT);
497+
new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
498+
LayoutParams.WRAP_CONTENT);
498499
lp.addRule(RelativeLayout.CENTER_IN_PARENT);
499500

500501
LinearLayout layout = new LinearLayout(this);
@@ -9225,7 +9226,7 @@ public void copy(PImage src,
92259226
* built with Processing.</P>
92269227
*/
92279228
static public int blendColor(int c1, int c2, int mode) {
9228-
return PGraphics.blendColor(c1, c2, mode);
9229+
return PImage.blendColor(c1, c2, mode);
92299230
}
92309231

92319232

‎android/core/src/processing/core/PConstants.java‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -35,80 +35,14 @@
3535
* as possible. For instance, the constant is TIFF instead of
3636
* FILE_TYPE_TIFF. We'll do this as long as we can get away with it.
3737
*/
38-
public interface PConstants {
39-
// vertex fields
38+
public interface PConstants {
4039

40+
// vertex fields
4141
static public final int X = 0; // model coords xyz (formerly MX/MY/MZ)
4242
static public final int Y = 1;
4343
static public final int Z = 2;
4444

45-
static public final int R = 3; // actual rgb, after lighting
46-
static public final int G = 4; // fill stored here, transform in place
47-
static public final int B = 5; // TODO don't do that anymore (?)
48-
static public final int A = 6;
49-
50-
static public final int U = 7; // texture
51-
static public final int V = 8;
52-
53-
static public final int NX = 9; // normal
54-
static public final int NY = 10;
55-
static public final int NZ = 11;
56-
57-
static public final int EDGE = 12;
58-
59-
// stroke
60-
61-
/** stroke argb values */
62-
static public final int SR = 13;
63-
static public final int SG = 14;
64-
static public final int SB = 15;
65-
static public final int SA = 16;
66-
67-
/** stroke weight */
68-
static public final int SW = 17;
69-
70-
/*
71-
static public final int TX = 18; // transformed xyzw
72-
static public final int TY = 19;
73-
static public final int TZ = 20;
74-
75-
static public final int VX = 21; // view space coords
76-
static public final int VY = 22;
77-
static public final int VZ = 23;
78-
static public final int VW = 24;
79-
80-
// Ambient color (usually to be kept the same as diffuse)
81-
// fill(_) sets both ambient and diffuse.
82-
static public final int AR = 25;
83-
static public final int AG = 26;
84-
static public final int AB = 27;
85-
86-
// Diffuse is shared with fill.
87-
static public final int DR = 3; // TODO needs to not be shared, this is a material property
88-
static public final int DG = 4;
89-
static public final int DB = 5;
90-
static public final int DA = 6;
91-
92-
// specular (by default kept white)
93-
static public final int SPR = 28;
94-
static public final int SPG = 29;
95-
static public final int SPB = 30;
96-
97-
static public final int SHINE = 31;
98-
99-
// emissive (by default kept black)
100-
static public final int ER = 32;
101-
static public final int EG = 33;
102-
static public final int EB = 34;
103-
*/
104-
105-
// has this vertex been assigned a normal yet
106-
static public final int HAS_NORMAL = 18;
107-
108-
static public final int VERTEX_FIELD_COUNT = 19;
109-
11045
// built-in rendering options
111-
11246
static final String JAVA2D = "processing.core.PGraphicsAndroid2D";
11347
static final String P2D = "processing.opengl.PGraphics2D";
11448
static final String P3D = "processing.opengl.PGraphics3D";

‎android/core/src/processing/core/PGraphics.java‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,87 @@ public class PGraphics extends PImage implements PConstants {
170170
protected boolean[] hints = new boolean[HINT_COUNT];
171171

172172

173+
////////////////////////////////////////////////////////////
174+
175+
// Vertex fields, moved from PConstants (after 2.0a8) because they're too
176+
// general to show up in all sketches as defined variables.
177+
178+
// X, Y and Z are still stored in PConstants because of their general
179+
// usefulness, and that X we'll always want to be 0, etc.
180+
181+
static public final int R = 3; // actual rgb, after lighting
182+
static public final int G = 4; // fill stored here, transform in place
183+
static public final int B = 5; // TODO don't do that anymore (?)
184+
static public final int A = 6;
185+
186+
static public final int U = 7; // texture
187+
static public final int V = 8;
188+
189+
static public final int NX = 9; // normal
190+
static public final int NY = 10;
191+
static public final int NZ = 11;
192+
193+
static public final int EDGE = 12;
194+
195+
// stroke
196+
197+
/** stroke argb values */
198+
static public final int SR = 13;
199+
static public final int SG = 14;
200+
static public final int SB = 15;
201+
static public final int SA = 16;
202+
203+
/** stroke weight */
204+
static public final int SW = 17;
205+
206+
// transformations (2D and 3D)
207+
208+
static public final int TX = 18; // transformed xyzw
209+
static public final int TY = 19;
210+
static public final int TZ = 20;
211+
212+
static public final int VX = 21; // view space coords
213+
static public final int VY = 22;
214+
static public final int VZ = 23;
215+
static public final int VW = 24;
216+
217+
218+
// material properties
219+
220+
// Ambient color (usually to be kept the same as diffuse)
221+
// fill(_) sets both ambient and diffuse.
222+
static public final int AR = 25;
223+
static public final int AG = 26;
224+
static public final int AB = 27;
225+
226+
// Diffuse is shared with fill.
227+
static public final int DR = 3; // TODO needs to not be shared, this is a material property
228+
static public final int DG = 4;
229+
static public final int DB = 5;
230+
static public final int DA = 6;
231+
232+
// specular (by default kept white)
233+
static public final int SPR = 28;
234+
static public final int SPG = 29;
235+
static public final int SPB = 30;
236+
237+
static public final int SHINE = 31;
238+
239+
// emissive (by default kept black)
240+
static public final int ER = 32;
241+
static public final int EG = 33;
242+
static public final int EB = 34;
243+
244+
// has this vertex been lit yet
245+
static public final int BEEN_LIT = 35;
246+
247+
// has this vertex been assigned a normal yet
248+
static public final int HAS_NORMAL = 36;
249+
250+
static public final int VERTEX_FIELD_COUNT = 37;
251+
252+
253+
173254
////////////////////////////////////////////////////////////
174255

175256
// STYLE PROPERTIES

0 commit comments

Comments
 (0)