}
}
- // This MUST be called after OpenGL is instansiated (and activateSharedContext is functioning)
+ // This MUST be called after OpenGL is instansiated (and activateSharedInterpreter is functioning)
public void init() throws NotSupportedException {
natInit();
glVersion = parseVersion(version);
maxRectTexSize = 0;
rectangularTextures = false;
}
- Log.log(this,"Renderer: " + renderer);
- Log.log(this,"Version: " + version);
- Log.log(this,"Vendor: " + vendor);
- Log.log(this,"Rectangular textures: " + (rectangularTextures ? "supported" : "unsupported"));
- Log.log(this,"Max texture size: " + maxTexSize);
- Log.log(this,"Max rectangular texture size: " + maxRectTexSize);
+ Log.diag(this,"Renderer: " + renderer);
+ Log.diag(this,"Version: " + version);
+ Log.diag(this,"Vendor: " + vendor);
+ Log.diag(this,"Rectangular textures: " + (rectangularTextures ? "supported" : "unsupported"));
+ Log.diag(this,"Max texture size: " + maxTexSize);
+ Log.diag(this,"Max rectangular texture size: " + maxRectTexSize);
}
- protected abstract void activateSharedContext();
+ protected abstract void activateSharedInterpreter();
public static class NotSupportedException extends Exception {
public NotSupportedException(String s) { super(s); }
}
// This should activate the drawing context and prepare the double buffer for drawing
- protected abstract void activateContext();
+ protected abstract void activateInterpreter();
protected static native void drawableInit(int w, int h);
//System.out.println("drawString(): " + text);
}
- public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
- drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, rgb);
+ public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+ drawPicture_(((org.xwt.Platform.DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb);
}
public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);
}
private void drawPicture_(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int color) {
- activateContext();
+ activateInterpreter();
setColor(color);
- GLPicture p = (GLPicture) source;
+ GLPicture p = getInnerPicture(source, gl);
p.draw(dx,dy,cx1,cy1,cx2,cy2);
}
}
+
+ // FIXME ugly
+ public static OpenGL gl = null;
+ public OpenGL() { gl = this; }
public final static int roundToPowerOf2(int n) {
if(((n-1)&n)==0) return n;
for(int x=2;x!=0;x<<=1) if(n < x) return x;
return 0;
}
-
- private Picture _createPicture(Object data, int w, int h, boolean alphaOnly) {
- if(rectangularTextures && w <= maxRectTexSize && h <= maxRectTexSize) new RectGLPicture(data,w,h,alphaOnly,this);
- if(w <= maxTexSize && h <= maxTexSize) return new SquareGLPicture(data,w,h,alphaOnly,this);
- return new MosaicGLPicture(data,w,h,alphaOnly,this);
- }
- public Picture createPicture(int[] data, int w, int h) {
- if(w*h > data.length) throw new Error("should never happen");
- return _createPicture(data,w,h,false);
+ private static GLPicture getInnerPicture(Picture p, OpenGL gl) {
+ OpenGLPicture oglp = (OpenGLPicture)p;
+ if (!oglp.isLoaded || oglp.realPicture != null) return oglp.realPicture;
+ if (gl.rectangularTextures && p.width <= gl.maxRectTexSize && p.height <= gl.maxRectTexSize)
+ oglp.realPicture = new RectGLPicture(p.data,p.width,p.height,oglp.alphaOnly,gl);
+ else if (p.width <= gl.maxTexSize && p.height <= gl.maxTexSize)
+ oglp.realPicture = new SquareGLPicture(p.data,p.width,p.height,oglp.alphaOnly,gl);
+ else
+ oglp.realPicture = new MosaicGLPicture(p.data,p.width,p.height,oglp.alphaOnly,gl);
+ p.data = null;
+ return oglp.realPicture;
}
- public Picture createAlphaOnlyPicture(byte[] data, int w, int h) {
- if(w*h > data.length) throw new Error("should never happen");
- return _createPicture(data,w,h,true);
+
+ public Picture _createPicture(boolean alphaOnly) { return new OpenGLPicture(alphaOnly); }
+
+ public static class OpenGLPicture extends Picture {
+ public OpenGLPicture(boolean a) { alphaOnly = a; }
+ boolean alphaOnly;
+ GLPicture realPicture = null;
}
+
+ public Font.Glyph _createGlyph(org.xwt.Font f, char c) { return new OpenGLGlyph(f, c); }
+ public static class OpenGLGlyph extends Font.Glyph {
+ private Picture p = null;
+ public OpenGLGlyph(org.xwt.Font f, char c) { super(f, c); }
+ Picture getPicture() {
+ if (p == null && isLoaded) {
+ p = new OpenGLPicture(true);
+ p.data = new int[data.length];
+ for(int i=0; i<data.length; i++) p.data[i] = (data[i] & 0xff) << 24;
+ data = null;
+ p.width = this.width;
+ p.height = this.height;
+ }
+ return p;
+ }
+ }
+
private native void natDeleteTexture(int tex);
public void deleteTexture(final int tex) {
// CHECKME: Is this safe to do from finalize()?
Scheduler.add(new Scheduler.Task() { public void perform() { natDeleteTexture(tex); }});
}
- private static abstract class GLPicture extends Picture {
+ private static abstract class GLPicture {
protected int width;
protected int height;
super(w,h);
psize = gl.maxTexSize;
while(wastedSpace(w,h,psize) > 0.40) psize/=2;
- Log.log(this,"Using psize: " + psize + " for " + w + "x" + h + " image (wasted space: " + wastedSpace(w,h,psize));
+ Log.info(this,"Using psize: " + psize + " for " + w + "x" + h + " image (wasted space: " + wastedSpace(w,h,psize));
int rows = (h+psize-1)/psize;
int cols = (w+psize-1)/psize;
projects / org.ibex.core.git / blobdiff