From a5325860afb8ff60eb08fa3b074ca7b5d3b75dcf Mon Sep 17 00:00:00 2001 From: codeanticode Date: Mon, 7 Feb 2011 06:19:17 +0000 Subject: [PATCH] Updated opengl2 to remove use of PMetadata class --- .../opengl2/src/processing/opengl2/PFontTexture.java | 3 +-- java/libraries/opengl2/src/processing/opengl2/PTexture.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java/libraries/opengl2/src/processing/opengl2/PFontTexture.java b/java/libraries/opengl2/src/processing/opengl2/PFontTexture.java index 1fbb2b7c1..f6ce8b4b7 100644 --- a/java/libraries/opengl2/src/processing/opengl2/PFontTexture.java +++ b/java/libraries/opengl2/src/processing/opengl2/PFontTexture.java @@ -27,7 +27,6 @@ import java.util.HashMap; import processing.core.PApplet; import processing.core.PConstants; import processing.core.PFont; -import processing.core.PMetadata; /** * All the infrastructure needed for optimized font rendering @@ -35,7 +34,7 @@ import processing.core.PMetadata; * By Andres Colubri * */ -class PFontTexture extends PMetadata implements PConstants { +class PFontTexture implements PConstants { protected PApplet parent; protected PFont font; diff --git a/java/libraries/opengl2/src/processing/opengl2/PTexture.java b/java/libraries/opengl2/src/processing/opengl2/PTexture.java index 1028bd2c6..db022cdee 100644 --- a/java/libraries/opengl2/src/processing/opengl2/PTexture.java +++ b/java/libraries/opengl2/src/processing/opengl2/PTexture.java @@ -29,7 +29,6 @@ import java.nio.*; import processing.core.PApplet; import processing.core.PConstants; import processing.core.PImage; -import processing.core.PMetadata; import processing.core.PParameters; @@ -39,7 +38,7 @@ import processing.core.PParameters; * */ @SuppressWarnings("unused") -public class PTexture extends PMetadata implements PConstants { +public class PTexture implements PConstants { public int width, height; protected PApplet parent; @@ -137,7 +136,7 @@ public class PTexture extends PMetadata implements PConstants { } - public void delete() { + public void delete() { deleteTexture(); }