Updated opengl2 to remove use of PParameters class

This commit is contained in:
codeanticode
2011-02-07 06:27:04 +00:00
parent 49cd6b4501
commit 9441f3e1fc
3 changed files with 6 additions and 9 deletions
@@ -6181,12 +6181,12 @@ public class PGraphicsOpenGL2 extends PGraphics {
}
protected PShape loadShape(String filename, PParameters params) {
protected PShape loadShape(String filename, Object params) {
return new PShape3D(parent, filename, (PShape3D.Parameters)params);
}
protected PShape createShape(int size, PParameters params) {
protected PShape createShape(int size, Object params) {
return new PShape3D(parent, size, (PShape3D.Parameters)params);
}
@@ -29,7 +29,6 @@ import processing.core.PApplet;
import processing.core.PConstants;
import processing.core.PGraphics;
import processing.core.PImage;
import processing.core.PParameters;
import processing.core.PShape;
import processing.core.PVector;
import java.nio.FloatBuffer;
@@ -2440,7 +2439,7 @@ public class PShape3D extends PShape implements PConstants {
}
static public class Parameters extends PParameters {
static public class Parameters {
public int drawMode;
public int updateMode;
@@ -29,8 +29,6 @@ import java.nio.*;
import processing.core.PApplet;
import processing.core.PConstants;
import processing.core.PImage;
import processing.core.PParameters;
/**
* This class wraps an OpenGL texture.
@@ -91,7 +89,7 @@ public class PTexture implements PConstants {
* @param height int
* @param params Parameters
*/
public PTexture(PApplet parent, int width, int height, PParameters params) {
public PTexture(PApplet parent, int width, int height, Object params) {
this.parent = parent;
this.width = width;
this.height = height;
@@ -122,7 +120,7 @@ public class PTexture implements PConstants {
* @param filename String
* @param params Parameters
*/
public PTexture(PApplet parent, String filename, PParameters params) {
public PTexture(PApplet parent, String filename, Object params) {
this.parent = parent;
pgl = (PGraphicsOpenGL2)parent.g;
@@ -1006,7 +1004,7 @@ public class PTexture implements PConstants {
* This class stores the parameters for a texture: target, internal format, minimization filter
* and magnification filter.
*/
static public class Parameters extends PParameters {
static public class Parameters {
/**
* Texture target.
*/