From f87ffe80f545b7cab08cbf6594cfc181f49ae9b5 Mon Sep 17 00:00:00 2001 From: benfry Date: Mon, 7 Feb 2005 17:23:44 +0000 Subject: [PATCH] beginning rev 77: new jikes 1.22 on windows, and fixing warnings generated by it --- app/PdeEditorStatus.java | 44 ++++++++-------- app/PdePreprocessor.java | 6 ++- app/PdeSketch.java | 6 +-- core/PApplet.java | 43 ++++++++-------- core/PFont.java | 5 +- core/PGraphics.java | 33 +++++++----- core/PLine.java | 106 +++++++++++++++++++-------------------- core/PSound2.java | 13 +++-- core/PTriangle.java | 29 ++++++----- core/done.txt | 4 ++ core/todo.txt | 5 +- done.txt | 7 +++ todo.txt | 17 ++++--- 13 files changed, 173 insertions(+), 145 deletions(-) diff --git a/app/PdeEditorStatus.java b/app/PdeEditorStatus.java index acbc63cd5..4a96fbbac 100644 --- a/app/PdeEditorStatus.java +++ b/app/PdeEditorStatus.java @@ -17,8 +17,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -34,7 +34,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { static Color fgcolor[]; static final int NOTICE = 0; - static final int ERROR = 1; + static final int ERR = 1; static final int PROMPT = 2; static final int EDIT = 3; @@ -109,7 +109,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { public void error(String message) { - mode = ERROR; + mode = ERR; this.message = message; repaint(); } @@ -151,7 +151,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { editField.selectAll(); editField.requestFocus(); - repaint(); + repaint(); } public void unedit() { @@ -193,7 +193,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { } else { // who cares, just resize - sizeW = size.width; + sizeW = size.width; sizeH = size.height; setButtonBounds(); } @@ -237,7 +237,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { cancelButton = new JButton(PdePreferences.PROMPT_CANCEL); okButton = new JButton(PdePreferences.PROMPT_OK); - // !@#(* aqua ui #($*(( that turtle-neck wearing #(** (#$@)( + // !@#(* aqua ui #($*(( that turtle-neck wearing #(** (#$@)( // os9 seems to work if bg of component is set, but x still a bastard if (PdeBase.platform == PdeBase.MACOSX) { yesButton.setBackground(bgcolor[PROMPT]); @@ -275,30 +275,30 @@ public class PdeEditorStatus extends JPanel implements ActionListener { //} // use keyTyped to catch when the feller is actually - // added to the text field. with keyTyped, as opposed to - // keyPressed, the keyCode will be zero, even if it's + // added to the text field. with keyTyped, as opposed to + // keyPressed, the keyCode will be zero, even if it's // enter or backspace or whatever, so the keychar should // be used instead. grr. public void keyTyped(KeyEvent event) { - //System.out.println("got event " + event + " " + + //System.out.println("got event " + event + " " + // KeyEvent.VK_SPACE); int c = event.getKeyChar(); if (c == KeyEvent.VK_ENTER) { // accept the input String answer = editField.getText(); editor.sketch.nameCode(answer); - unedit(); + unedit(); event.consume(); // easier to test the affirmative case than the negative } else if ((c == KeyEvent.VK_BACK_SPACE) || - (c == KeyEvent.VK_DELETE) || - (c == KeyEvent.VK_RIGHT) || - (c == KeyEvent.VK_LEFT) || - (c == KeyEvent.VK_UP) || - (c == KeyEvent.VK_DOWN) || - (c == KeyEvent.VK_HOME) || - (c == KeyEvent.VK_END) || + (c == KeyEvent.VK_DELETE) || + (c == KeyEvent.VK_RIGHT) || + (c == KeyEvent.VK_LEFT) || + (c == KeyEvent.VK_UP) || + (c == KeyEvent.VK_DOWN) || + (c == KeyEvent.VK_HOME) || + (c == KeyEvent.VK_END) || (c == KeyEvent.VK_SHIFT)) { //System.out.println("nothing to see here"); //noop(); @@ -313,12 +313,12 @@ public class PdeEditorStatus extends JPanel implements ActionListener { // if a space, insert an underscore //editField.insert("_", editField.getCaretPosition()); /* tried to play nice and see where it got me - editField.dispatchEvent(new KeyEvent(editField, + editField.dispatchEvent(new KeyEvent(editField, KeyEvent.KEY_PRESSED, System.currentTimeMillis(), 0, 45, '_')); */ - //System.out.println("start/end = " + + //System.out.println("start/end = " + // editField.getSelectionStart() + " " + // editField.getSelectionEnd()); String t = editField.getText(); @@ -395,7 +395,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { } public Dimension getMaximumSize() { - return new Dimension(3000, PdePreferences.GRID_SIZE); + return new Dimension(3000, PdePreferences.GRID_SIZE); } @@ -412,7 +412,7 @@ public class PdeEditorStatus extends JPanel implements ActionListener { editor.handleSave(); editor.checkModified2(); - } else if (e.getSource() == cancelButton) { + } else if (e.getSource() == cancelButton) { // don't do anything, don't continue with checkModified2 if (mode == PROMPT) unprompt(); else if (mode == EDIT) unedit(); diff --git a/app/PdePreprocessor.java b/app/PdePreprocessor.java index 933397d96..6d75bb863 100644 --- a/app/PdePreprocessor.java +++ b/app/PdePreprocessor.java @@ -257,8 +257,10 @@ public class PdePreprocessor { // unclear if this actually works, but it's worth a shot // - ((CommonAST)parserAST).setVerboseStringConversion( - true, parser.getTokenNames()); + //((CommonAST)parserAST).setVerboseStringConversion( + // true, parser.getTokenNames()); + // (made to use the static version because of jikes 1.22 warning) + CommonAST.setVerboseStringConversion(true, parser.getTokenNames()); // if this is an advanced program, the classname is already defined. // diff --git a/app/PdeSketch.java b/app/PdeSketch.java index 11982a8ad..bb05c3455 100644 --- a/app/PdeSketch.java +++ b/app/PdeSketch.java @@ -1576,11 +1576,11 @@ public class PdeSketch { // if a file called 'export.txt' is in there, it contains // a list of the files that should be exported. // otherwise, all files are exported. - Enumeration enum = importedLibraries.elements(); - while (enum.hasMoreElements()) { + Enumeration en = importedLibraries.elements(); + while (en.hasMoreElements()) { // in the list is a File object that points the // library sketch's "library" folder - File libraryFolder = (File)enum.nextElement(); + File libraryFolder = (File)en.nextElement(); //System.out.println("exporting files from " + libFolder); File exportSettings = new File(libraryFolder, "export.txt"); String exportList[] = null; diff --git a/core/PApplet.java b/core/PApplet.java index a55b4539f..68f28f5d5 100644 --- a/core/PApplet.java +++ b/core/PApplet.java @@ -442,8 +442,8 @@ public class PApplet extends Applet //} public void registerSize(Object o) { - Class args[] = new Class[] { Integer.TYPE, Integer.TYPE }; - registerWithArgs(preMethods, "size", o, args); + Class methodArgs[] = new Class[] { Integer.TYPE, Integer.TYPE }; + registerWithArgs(preMethods, "size", o, methodArgs); } public void registerPre(Object o) { @@ -459,14 +459,14 @@ public class PApplet extends Applet } public void registerMouseEvent(Object o) { - Class args[] = new Class[] { MouseEvent.class }; - registerWithArgs(mouseEventMethods, "mouseEvent", o, args); + Class methodArgs[] = new Class[] { MouseEvent.class }; + registerWithArgs(mouseEventMethods, "mouseEvent", o, methodArgs); } public void registerKeyEvent(Object o) { - Class args[] = new Class[] { KeyEvent.class }; - registerWithArgs(keyEventMethods, "keyEvent", o, args); + Class methodArgs[] = new Class[] { KeyEvent.class }; + registerWithArgs(keyEventMethods, "keyEvent", o, methodArgs); } public void registerDispose(Object o) { @@ -618,8 +618,9 @@ public class PApplet extends Applet this.width = g.width; this.height = g.height; - Object args[] = new Object[] { new Integer(width), new Integer(height) }; - sizeMethods.handle(args); + Object methodArgs[] = + new Object[] { new Integer(width), new Integer(height) }; + sizeMethods.handle(methodArgs); /* for (int i = 0; i < libraryCount; i++) { if (libraryCalls[i][PLibrary.SIZE]) { @@ -2003,8 +2004,8 @@ public class PApplet extends Applet // [toxi 031112] // noise broke due to recent change of cos table in PGraphics // this will take care of it - perlin_cosTable = g.cosLUT; - perlin_TWOPI = perlin_PI = g.SINCOS_LENGTH; + perlin_cosTable = PGraphics.cosLUT; + perlin_TWOPI = perlin_PI = PGraphics.SINCOS_LENGTH; perlin_PI >>= 1; } @@ -2366,18 +2367,18 @@ public class PApplet extends Applet } public File inputFile(String prompt) { - Frame frame = null; + Frame parentFrame = null; Component comp = getParent(); while (comp != null) { if (comp instanceof Frame) { - frame = (Frame) comp; + parentFrame = (Frame) comp; break; } comp = comp.getParent(); } //System.out.println("found frame " + frame); - if (frame == null) frame = new Frame(); - FileDialog fd = new FileDialog(frame, prompt, FileDialog.LOAD); + if (parentFrame == null) parentFrame = new Frame(); + FileDialog fd = new FileDialog(parentFrame, prompt, FileDialog.LOAD); fd.show(); String directory = fd.getDirectory(); @@ -2392,20 +2393,20 @@ public class PApplet extends Applet } public File outputFile(String prompt) { - Frame frame = null; + Frame parentFrame = null; Component comp = getParent(); //System.out.println(comp + " " + comp.getClass()); while (comp != null) { System.out.println(comp + " " + comp.getClass()); if (comp instanceof Frame) { - frame = (Frame) comp; + parentFrame = (Frame) comp; break; } comp = comp.getParent(); } //System.out.println("found frame " + frame); - if (frame == null) frame = new Frame(); - FileDialog fd = new FileDialog(frame, prompt, FileDialog.SAVE); + if (parentFrame == null) parentFrame = new Frame(); + FileDialog fd = new FileDialog(parentFrame, prompt, FileDialog.SAVE); fd.show(); String directory = fd.getDirectory(); @@ -4363,7 +4364,7 @@ public class PApplet extends Applet } - public void setupExternal(Frame frame) { + public void setupExternal(Frame parentFrame) { //externalRuntime = true; /* @@ -4438,7 +4439,7 @@ v PApplet.this.stop(); //ethread.start(); */ - frame.addComponentListener(new ComponentAdapter() { + parentFrame.addComponentListener(new ComponentAdapter() { public void componentMoved(ComponentEvent e) { //System.out.println(e); Point where = ((Frame) e.getSource()).getLocation(); @@ -4449,7 +4450,7 @@ v PApplet.this.stop(); } }); - frame.addWindowListener(new WindowAdapter() { + parentFrame.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { System.err.println(PApplet.EXTERNAL_QUIT); System.err.flush(); // important diff --git a/core/PFont.java b/core/PFont.java index 906fa2625..e272e5b23 100644 --- a/core/PFont.java +++ b/core/PFont.java @@ -1213,10 +1213,9 @@ public class PFont implements PConstants { for (int y = minY; y <= maxY; y++) { for (int x = minX; x <= maxX; x++) { - int value = 255 - (samples[y * mbox3 + x] & 0xff); - //int value = 255 - raster.getSample(x, y, 0); + int val = 255 - (samples[y * mbox3 + x] & 0xff); int pindex = (y - minY) * width[index] + (x - minX); - bitmaps[index].pixels[pindex] = value; + bitmaps[index].pixels[pindex] = val; } } index++; diff --git a/core/PGraphics.java b/core/PGraphics.java index 017e1ee1c..2a239731c 100644 --- a/core/PGraphics.java +++ b/core/PGraphics.java @@ -2392,6 +2392,8 @@ public class PGraphics extends PImage implements PMethods, PConstants { public void image(PImage image, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2) { + float hr, vr; + switch (imageMode) { case CORNERS: break; @@ -2401,9 +2403,16 @@ public class PGraphics extends PImage implements PMethods, PConstants { case CENTER: x2 /= 2f; y2 /= 2f; + hr = x2; + vr = y2; + x2 = x1 + hr; + y2 = y1 + vr; + x1 -= hr; + y1 -= vr; + break; case CENTER_RADIUS: - float hr = x2; - float vr = y2; + hr = x2; + vr = y2; x2 = x1 + hr; y2 = y1 + vr; x1 -= hr; @@ -4067,11 +4076,11 @@ public class PGraphics extends PImage implements PMethods, PConstants { message(COMPLAINT, "matrix stack overflow, to much pushmatrix"); return; } - float cm[] = matrixStack[matrixStackDepth]; - cm[ 0] = m00; cm[ 1] = m01; cm[ 2] = m02; cm[ 3] = m03; - cm[ 4] = m10; cm[ 5] = m11; cm[ 6] = m12; cm[ 7] = m13; - cm[ 8] = m20; cm[ 9] = m21; cm[10] = m22; cm[11] = m23; - cm[12] = m30; cm[13] = m31; cm[14] = m32; cm[15] = m33; + float mat[] = matrixStack[matrixStackDepth]; + mat[ 0] = m00; mat[ 1] = m01; mat[ 2] = m02; mat[ 3] = m03; + mat[ 4] = m10; mat[ 5] = m11; mat[ 6] = m12; mat[ 7] = m13; + mat[ 8] = m20; mat[ 9] = m21; mat[10] = m22; mat[11] = m23; + mat[12] = m30; mat[13] = m31; mat[14] = m32; mat[15] = m33; matrixStackDepth++; } @@ -4082,11 +4091,11 @@ public class PGraphics extends PImage implements PMethods, PConstants { return; } matrixStackDepth--; - float cm[] = matrixStack[matrixStackDepth]; - m00 = cm[ 0]; m01 = cm[ 1]; m02 = cm[ 2]; m03 = cm[ 3]; - m10 = cm[ 4]; m11 = cm[ 5]; m12 = cm[ 6]; m13 = cm[ 7]; - m20 = cm[ 8]; m21 = cm[ 9]; m22 = cm[10]; m23 = cm[11]; - m30 = cm[12]; m31 = cm[13]; m32 = cm[14]; m33 = cm[15]; + float mat[] = matrixStack[matrixStackDepth]; + m00 = mat[ 0]; m01 = mat[ 1]; m02 = mat[ 2]; m03 = mat[ 3]; + m10 = mat[ 4]; m11 = mat[ 5]; m12 = mat[ 6]; m13 = mat[ 7]; + m20 = mat[ 8]; m21 = mat[ 9]; m22 = mat[10]; m23 = mat[11]; + m30 = mat[12]; m31 = mat[13]; m32 = mat[14]; m33 = mat[15]; if ((matrixStackDepth == 0) && (m00 == 1) && (m01 == 0) && (m02 == 0) && (m03 == 0) && diff --git a/core/PLine.java b/core/PLine.java index befa337f7..7d4a415de 100644 --- a/core/PLine.java +++ b/core/PLine.java @@ -79,11 +79,11 @@ public class PLine implements PConstants private int o1; // start values - private float r0; - private float g0; - private float b0; - private float a0; - private float z0; + private float m_r0; + private float m_g0; + private float m_b0; + private float m_a0; + private float m_z0; // deltas private float dz; @@ -325,9 +325,9 @@ public class PLine implements PConstants dt = (shortLen << 16) / longLen; } - r0 = r_array[o0]; - g0 = g_array[o0]; - b0 = b_array[o0]; + m_r0 = r_array[o0]; + m_g0 = g_array[o0]; + m_b0 = b_array[o0]; if (INTERPOLATE_RGB) { dr = (r_array[o1] - r_array[o0]) / length; @@ -339,7 +339,7 @@ public class PLine implements PConstants db = 0; } - a0 = a_array[o0]; + m_a0 = a_array[o0]; if (INTERPOLATE_ALPHA) { da = (a_array[o1] - a_array[o0]) / length; @@ -347,7 +347,7 @@ public class PLine implements PConstants da = 0; } - z0 = z_array[o0]; + m_z0 = z_array[o0]; //z0 += -0.001f; // [rocha] ugly fix for z buffer precision if (INTERPOLATE_Z) { @@ -500,7 +500,7 @@ public class PLine implements PConstants private void drawPoint(int x0, int y0) { - float iz = z0; + float iz = m_z0; int offset = y0 * SCREEN_WIDTH + x0; if (iz <= m_zbuffer[offset]) { @@ -515,7 +515,7 @@ public class PLine implements PConstants int pr = m_stroke & 0xFF0000; int pg = m_stroke & 0xFF00; int pb = m_stroke & 0xFF; - float iz = z0; + float iz = m_z0; int offset = y0 * SCREEN_WIDTH + x0; if (iz <= m_zbuffer[offset]) { @@ -554,7 +554,7 @@ public class PLine implements PConstants for (int j = 0x8000 + (x0<<16); y0 <= length; ++y0) { offset = y0 * SCREEN_WIDTH + (j>>16); m_pixels[offset] = m_stroke; - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; j+=dt; } @@ -564,7 +564,7 @@ public class PLine implements PConstants for (int j = 0x8000 + (y0<<16); x0 <= length; ++x0) { offset = (j>>16) * SCREEN_WIDTH + x0; m_pixels[offset] = m_stroke; - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; j+=dt; } } @@ -579,7 +579,7 @@ public class PLine implements PConstants int pg = m_stroke & 0xFF00; int pb = m_stroke & 0xFF; - int ia = (int) (a0); + int ia = (int) (m_a0); if (vertical) { length += y0; @@ -597,7 +597,7 @@ public class PLine implements PConstants m_pixels[offset] = 0xFF000000 | (r0 & 0xFF0000) | (g0 & 0xFF00) | (b0 & 0xFF); - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; ia += da; j += dt; @@ -619,7 +619,7 @@ public class PLine implements PConstants m_pixels[offset] = 0xFF000000 | (r0 & 0xFF0000) | (g0 & 0xFF00) | (b0 & 0xFF); - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; ia += da; j += dt; @@ -632,9 +632,9 @@ public class PLine implements PConstants int length, boolean vertical) { int offset = 0; - int ir = (int) r0; - int ig = (int) g0; - int ib = (int) b0; + int ir = (int) m_r0; + int ig = (int) m_g0; + int ib = (int) m_b0; if (vertical) { length += y0; @@ -642,11 +642,11 @@ public class PLine implements PConstants offset = y0 * SCREEN_WIDTH + (j>>16); m_pixels[offset] = 0xFF000000 | ((ir & 0xFF0000) | ((ig >> 8) & 0xFF00) | (ib >> 16)); - m_zbuffer[offset] = z0; - ir+= dr; - ig+= dg; - ib+= db; - j+=dt; + m_zbuffer[offset] = m_z0; + ir += dr; + ig += dg; + ib += db; + j +=dt; } } else { // horizontal @@ -655,11 +655,11 @@ public class PLine implements PConstants offset = (j>>16) * SCREEN_WIDTH + x0; m_pixels[offset] = 0xFF000000 | ((ir & 0xFF0000) | ((ig >> 8) & 0xFF00) | (ib >> 16)); - m_zbuffer[offset] = z0; - ir+= dr; - ig+= dg; - ib+= db; - j+=dt; + m_zbuffer[offset] = m_z0; + ir += dr; + ig += dg; + ib += db; + j += dt; } } } @@ -669,10 +669,10 @@ public class PLine implements PConstants int length, boolean vertical) { int offset = 0; - int ir = (int) r0; - int ig = (int) g0; - int ib = (int) b0; - int ia = (int) (a0); + int ir = (int) m_r0; + int ig = (int) m_g0; + int ib = (int) m_b0; + int ia = (int) m_a0; if (vertical) { length += y0; @@ -696,7 +696,7 @@ public class PLine implements PConstants m_pixels[offset] = 0xFF000000 | (r0 & 0xFF0000) | (g0 & 0xFF00) | (b0 & 0xFF); - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; ir+= dr; ig+= dg; @@ -727,7 +727,7 @@ public class PLine implements PConstants m_pixels[offset] = 0xFF000000 | (r0 & 0xFF0000) | (g0 & 0xFF00) | (b0 & 0xFF); - m_zbuffer[offset] = z0; + m_zbuffer[offset] = m_z0; ir+= dr; ig+= dg; @@ -742,7 +742,7 @@ public class PLine implements PConstants private void drawLine_plain_spatial(int x0, int y0, int dt, int length, boolean vertical) { int offset = 0; - float iz = z0; + float iz = m_z0; if (vertical) { length += y0; @@ -774,13 +774,13 @@ public class PLine implements PConstants private void drawLine_plain_alpha_spatial(int x0, int y0, int dt, int length, boolean vertical) { int offset = 0; - float iz = z0; + float iz = m_z0; int pr = m_stroke & 0xFF0000; int pg = m_stroke & 0xFF00; int pb = m_stroke & 0xFF; - int ia = (int) (a0); + int ia = (int) m_a0; if (vertical) { length += y0; @@ -836,11 +836,11 @@ public class PLine implements PConstants private void drawLine_color_spatial(int x0, int y0, int dt, int length, boolean vertical) { int offset = 0; - float iz = z0; + float iz = m_z0; - int ir = (int) r0; - int ig = (int) g0; - int ib = (int) b0; + int ir = (int) m_r0; + int ig = (int) m_g0; + int ib = (int) m_b0; if (vertical) { length += y0; @@ -881,12 +881,12 @@ public class PLine implements PConstants private void drawLine_color_alpha_spatial(int x0, int y0, int dt, int length, boolean vertical) { int offset = 0; - float iz = z0; + float iz = m_z0; - int ir = (int) r0; - int ig = (int) g0; - int ib = (int) b0; - int ia = (int) (a0); + int ir = (int) m_r0; + int ig = (int) m_g0; + int ib = (int) m_b0; + int ia = (int) m_a0; if (vertical) { length += y0; @@ -964,12 +964,12 @@ public class PLine implements PConstants int temp; int end; - float iz = z0; + float iz = m_z0; - int ir = (int) r0; - int ig = (int) g0; - int ib = (int) b0; - int ia = (int) (a0); + int ir = (int) m_r0; + int ig = (int) m_g0; + int ib = (int) m_b0; + int ia = (int) m_a0; if (vertical) { xi = x0 << 16; diff --git a/core/PSound2.java b/core/PSound2.java index ce3b6f173..d6ea192dc 100755 --- a/core/PSound2.java +++ b/core/PSound2.java @@ -34,7 +34,6 @@ import javax.sound.sampled.*; public class PSound2 extends PSound { //PApplet parent; - Method soundEventMethod; Clip clip; FloatControl gainControl; @@ -44,12 +43,12 @@ public class PSound2 extends PSound { this.parent = iparent; try { - AudioInputStream stream = + AudioInputStream ais = AudioSystem.getAudioInputStream(input); // At present, ALAW and ULAW encodings must be converted // to PCM_SIGNED before it can be played - AudioFormat format = stream.getFormat(); + AudioFormat format = ais.getFormat(); if (format.getEncoding() != AudioFormat.Encoding.PCM_SIGNED) { // *** this code appears as though it may just be faulty *** format = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, @@ -59,15 +58,15 @@ public class PSound2 extends PSound { format.getFrameSize()*2, format.getFrameRate(), true); // big endian - stream = AudioSystem.getAudioInputStream(format, stream); + ais = AudioSystem.getAudioInputStream(format, ais); //} else { //System.out.println("no conversion necessary"); } - int frameLength = (int) stream.getFrameLength(); + int frameLength = (int) ais.getFrameLength(); int frameSize = format.getFrameSize(); DataLine.Info info = - new DataLine.Info(Clip.class, stream.getFormat(), + new DataLine.Info(Clip.class, ais.getFormat(), frameLength * frameSize); clip = (Clip) AudioSystem.getLine(info); @@ -77,7 +76,7 @@ public class PSound2 extends PSound { (FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN); // This method does not return until completely loaded - clip.open(stream); + clip.open(ais); // determining when a sample is done // Add a listener for line events diff --git a/core/PTriangle.java b/core/PTriangle.java index f7633878c..eb062e7ff 100644 --- a/core/PTriangle.java +++ b/core/PTriangle.java @@ -964,26 +964,25 @@ public class PTriangle implements PConstants //m_zbuffer[xstart] = iz; int alpha = ia >> 16; - int r0 = m_pixels[xstart]; - int g0 = r0 & 0xFF00; - int b0 = r0 & 0xFF; - r0&=0xFF0000; + int mr0 = m_pixels[xstart]; + int mg0 = mr0 & 0xFF00; + int mb0 = mr0 & 0xFF; + mr0 &= 0xFF0000; - r0 = r0 + (((pr - r0) * alpha) >> 8); - g0 = g0 + (((pg - g0) * alpha) >> 8); - b0 = b0 + (((pb - b0) * alpha) >> 8); - m_pixels[xstart] = (r0 & 0xFF0000) | (g0 & 0xFF00) | (b0 & 0xFF); + mr0 = mr0 + (((pr - mr0) * alpha) >> 8); + mg0 = mg0 + (((pg - mg0) * alpha) >> 8); + mb0 = mb0 + (((pb - mb0) * alpha) >> 8); + m_pixels[xstart] = (mr0 & 0xFF0000) | (mg0 & 0xFF00) | (mb0 & 0xFF); m_stencil[xstart] = p; } - iz+=izadd; - ia+=iaadd; + iz += izadd; + ia += iaadd; } - - ytop+=SCREEN_WIDTH; - xleft+=leftadd; - xrght+=rghtadd; - zleft+=zleftadd; + ytop += SCREEN_WIDTH; + xleft += leftadd; + xrght += rghtadd; + zleft += zleftadd; } } diff --git a/core/done.txt b/core/done.txt index 2863a43a8..e08258130 100644 --- a/core/done.txt +++ b/core/done.txt @@ -1,3 +1,7 @@ +0076 core +X no changes, only launcher issues + + 0075 X textureMode(NORMAL_SPACE) screws up the image() command X image() appears to require IMAGE_SPACE to function properly. diff --git a/core/todo.txt b/core/todo.txt index d32d8f429..e9e323463 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,4 +1,7 @@ -0076 core +0077 core + +_ metaballs example dies when using box() +_ long string of exceptions, which are also missing their newlines _ when running externally, applets don't always get placed properly _ if size is never set, then doesn't always layout diff --git a/done.txt b/done.txt index a9537240c..2302520c7 100644 --- a/done.txt +++ b/done.txt @@ -1,3 +1,10 @@ +0076 pde +X fix launcher issues on windows (didn't include registry.jar) +X also fix run.bat and run-expert.bat +X fix launcher issues on mac os x +X fix Info.plist, and chmod +x JavaApplicationStub + + 0075 pde X backported to 73 X change horizontal offset to 5 instead of 4 diff --git a/todo.txt b/todo.txt index 0206dc08e..a4584d237 100644 --- a/todo.txt +++ b/todo.txt @@ -1,11 +1,16 @@ -0076 pde -X fix launcher issues on windows (didn't include registry.jar) -X also fix run.bat and run-expert.bat -X fix launcher issues on mac os x -X fix Info.plist, and chmod +x JavaApplicationStub +0077 pde +X make compatible with jikes 1.22 +X fix all warnings generated by the new jikes +X update windows version of jikes.exe +_ update macosx version of jikes +_ get source and build on osx (or is it shipped by default?) +_ make sure that fink is not in the path when building +_ what are the args to configure a release version? +_ update linux version of jikes _ get an xml library in there _ nanoxml problems with manifest +_ appears to use 1.6.8 version since it's just two classes check these errors to see if they still exist _ odd error in System.err stream coming from running external @@ -20,7 +25,7 @@ _ should we queue lib events until the end of loop? _ lib could call queueEvent with the args _ then call them inside post() _ add prompt() method to Camera ("" means default, null is prompt) -_ add prompt() method to Serial +_ add prompt() method to Serial (simple dialog box that pops up) _ straighten out int() -> toInt() conversion in the preproc _ add use of doubles on casting -- particularly for Math.cos() et al