working on opengl and getting things straightened out

This commit is contained in:
benfry
2005-02-27 22:18:28 +00:00
parent 8704e5a24d
commit 23b1a91e82
5 changed files with 18 additions and 17 deletions
+7 -7
View File
@@ -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
*/
@@ -43,7 +43,7 @@ class PdeMessageSiphon implements Runnable {
}
public void run() {
public void run() {
try {
// process data until we hit EOF; this will happily block
// (effectively sleeping the thread) until new data comes in.
@@ -51,7 +51,7 @@ class PdeMessageSiphon implements Runnable {
//
String currentLine;
while ((currentLine = streamReader.readLine()) != null) {
consumer.message(currentLine);
consumer.message(currentLine + "\n");
}
thread = null;
@@ -59,12 +59,12 @@ class PdeMessageSiphon implements Runnable {
// Fairly common exception during shutdown
thread = null;
} catch (Exception e) {
// On Linux and sometimes on Mac OS X, a "bad file descriptor"
} catch (Exception e) {
// On Linux and sometimes on Mac OS X, a "bad file descriptor"
// message comes up when closing an applet that's run externally.
// That message just gets supressed here..
String mess = e.getMessage();
if ((mess != null) &&
if ((mess != null) &&
(mess.indexOf("Bad file descriptor") != -1)) {
//if (e.getMessage().indexOf("Bad file descriptor") == -1) {
//System.err.println("PdeMessageSiphon err " + e);
+6 -1
View File
@@ -332,11 +332,16 @@ public class PdeRuntime implements PdeMessageConsumer {
// always shove out the mesage, since it might not fall under
// the same setup as we're expecting
System.err.print(s);
//System.err.println("[" + s.length() + "] " + s);
System.err.flush();
// if s.length <=2, ignore it because that probably means
// that it's just the platform line-terminators.
if (s.length() < 2) return;
//if (s.length() < 2) return;
// annoying, because it seems as though the terminators
// aren't being sent properly
//System.err.println(s);
//if (newMessage && s.length() > 2) {
if (newMessage) {
-5
View File
@@ -4399,11 +4399,6 @@ v PApplet.this.stop();
}
public void pixelsUpdated() {
g.pixelsUpdated();
}
public int get(int x, int y) {
return g.get(x, y);
}
+2 -1
View File
@@ -532,7 +532,8 @@ public class PGraphics2 extends PGraphics {
who.pixels,
who.my1*who.width + who.mx1, // offset for copy
who.width); // scan size
who.pixelsUpdated();
//who.pixelsUpdated();
who.modified = false;
}
int x2 = (int) (x + w);
+3 -3
View File
@@ -345,13 +345,13 @@ public class PImage implements PConstants, Cloneable {
}
public void pixelsUpdated() {
//public void pixelsUpdated() {
//mx1 = Integer.MAX_VALUE;
//my1 = Integer.MAX_VALUE;
//mx2 = -Integer.MAX_VALUE;
//my2 = -Integer.MAX_VALUE;
modified = false;
}
//modified = false;
//}
//////////////////////////////////////////////////////////////