[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob doc/pegboard/vob_interface--benja/peg.rs...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] libvob doc/pegboard/vob_interface--benja/peg.rs... |
|
Date: |
Tue, 08 Apr 2003 16:25:03 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Tuomas J. Lukka <address@hidden> 03/04/08 16:25:03
Modified files:
doc/pegboard/vob_interface--benja: peg.rst
doc/pegboard/vobscene_recursion--tjl: peg.rst
include/vob/trans: DisablablePrimitives.hxx
org/nongnu/libvob: Vob.java
org/nongnu/libvob/demo: fpfont.py
org/nongnu/libvob/gl: GL.java
org/nongnu/libvob/linebreaking: HBox.java
org/nongnu/libvob/vobs: OvalBgVob.java RectBgVob.java
SimpleConnection.java
SolidBackdropVob.java TestSpotVob.java
src/jni : Font.cxx
Added files:
org/nongnu/libvob: AbstractVob.java
Log message:
Fpfont work ; implement vob_interface peg
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/doc/pegboard/vob_interface--benja/peg.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/trans/DisablablePrimitives.hxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/AbstractVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/Vob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/fpfont.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GL.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/linebreaking/HBox.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/OvalBgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/RectBgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/SimpleConnection.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/TestSpotVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Font.cxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: libvob/doc/pegboard/vob_interface--benja/peg.rst
diff -u libvob/doc/pegboard/vob_interface--benja/peg.rst:1.1
libvob/doc/pegboard/vob_interface--benja/peg.rst:1.2
--- libvob/doc/pegboard/vob_interface--benja/peg.rst:1.1 Mon Mar 31
05:00:04 2003
+++ libvob/doc/pegboard/vob_interface--benja/peg.rst Tue Apr 8 16:25:01 2003
@@ -6,7 +6,7 @@
:Date: 2003-02-23
:Type: Interface
:Scope: Minor
-:Status: Current
+:Status: Accepted
``Vob`` is currently an abstract class; for Java,
Index: libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst
diff -u libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst:1.3
libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst:1.4
--- libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst:1.3 Tue Apr 8
03:59:41 2003
+++ libvob/doc/pegboard/vobscene_recursion--tjl/peg.rst Tue Apr 8 16:25:02 2003
@@ -3,9 +3,9 @@
=============================================================
:Author: Tuomas J. Lukka
-:Last-Modified: $Date: 2003/04/08 07:59:41 $
-:Revision: $Revision: 1.3 $
-:Status: Incomplete
+:Last-Modified: $Date: 2003/04/08 20:25:02 $
+:Revision: $Revision: 1.4 $
+:Status: Current
Performance problems in PP show that we should soon make a big
change I've been mulling over for some time: make vobscenes
@@ -126,13 +126,24 @@
A new Vob class which embeds a complete VobScene.
- public class VobSceneVob {
+ public class VobSceneVob implements Vob {
/** Create a new vobscenevob from the given VobScene.
* The given VobScene must not be modified after this call.
* @param scene The VobScene
- * @param
+ * @param n The number of initial coordinate systems in scene
+ * to replace with coordinate systems of the surrounding scene.
*/
public VobSceneVob(VobScene scene, int n);
}
+
+
+VobScene methods
+----------------
+
+Finally, a method getting VobSceneVob coordinate systems, in VobScene::
+
+ public int subSceneCoordsys(int vobId, int nth);
+
+
Index: libvob/include/vob/trans/DisablablePrimitives.hxx
diff -u libvob/include/vob/trans/DisablablePrimitives.hxx:1.2
libvob/include/vob/trans/DisablablePrimitives.hxx:1.3
--- libvob/include/vob/trans/DisablablePrimitives.hxx:1.2 Fri Apr 4
07:34:59 2003
+++ libvob/include/vob/trans/DisablablePrimitives.hxx Tue Apr 8 16:25:02 2003
@@ -157,7 +157,7 @@
static void findBoundingBox(const Transform *t, ZPt &p1, ZPt &p2) {
float i, j;
Pt box = t->getSqSize();
- float x1, y1, x2, y2;
+ float x1=0, y1=0, x2=0, y2=0;
for (i=0; i<=box.x; i+=box.x) {
for (j=0; j<=box.y; j+=box.y) {
if (i==0 && j==0) {
Index: libvob/org/nongnu/libvob/Vob.java
diff -u libvob/org/nongnu/libvob/Vob.java:1.2
libvob/org/nongnu/libvob/Vob.java:1.3
--- libvob/org/nongnu/libvob/Vob.java:1.2 Fri Mar 7 06:38:20 2003
+++ libvob/org/nongnu/libvob/Vob.java Tue Apr 8 16:25:02 2003
@@ -2,21 +2,22 @@
Vob.java
*
* Copyright (c) 2000-2001, Ted Nelson and Tuomas Lukka
+ * Copyright (c) 2003 Tuomas Lukka
*
- * This file is part of Gzz.
+ * This file is part of Libvob.
*
- * Gzz is free software; you can redistribute it and/or modify it under
+ * Libvob is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * Gzz is distributed in the hope that it will be useful, but WITHOUT
+ * Libvob is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
* Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with Gzz; if not, write to the Free
+ * Public License along with Libvob; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
@@ -45,18 +46,10 @@
* @see VobCoorder
*/
-public abstract class Vob {
-public static final String rcsid = "$Id: Vob.java,v 1.2 2003/03/07 11:38:20
tjl Exp $";
- public static boolean dbg = false;
- private static void pa(String s) { System.err.println(s); }
+public interface Vob {
+String rcsid = "$Id: Vob.java,v 1.3 2003/04/08 20:25:02 tjl Exp $";
- public Vob() {
- }
-
- public boolean intersect(int x, int y, RenderInfo info1,
- RenderInfo info2) {
- return false;
- }
+ boolean intersect(int x, int y, RenderInfo info1, RenderInfo info2) ;
/** Renders this vob at the given screen coordinates and in given size.
* @param g The graphics context to draw into
@@ -73,23 +66,7 @@
* @see VobPlacer#put(Vob vob, int depth, int x, int y, int w, int h)
* @see RenderInfo
*/
- abstract public void render(Graphics g,
- boolean fast,
- RenderInfo info1,
- RenderInfo info2
- ) ;
-
- private final void render(Graphics g,
- boolean fast,
- boolean foo,
- RenderInfo info1,
- RenderInfo info2) { }
-
- public final int addToListGL(
- int[] list, int curs, int coordsys1,
- int coordsys2) {
- throw new Error();
- }
+ void render(Graphics g, boolean fast, RenderInfo info1, RenderInfo info2) ;
/** For OpenGL: Add the current vob to the given display list, using
* the given coordinate systems.
@@ -97,26 +74,10 @@
* call vs.put for the components, for "real" GL Vobs,
* this will return the GL index.
*/
- public int putGL(VobScene vs) {
- throw new Error("Wrong # coordsys: 0 for " + this);
- }
- public int putGL(VobScene vs, int cs1) {
- throw new Error("Wrong # coordsys: 1 for " + this);
- }
- public int putGL(VobScene vs, int cs1, int cs2) {
- throw new Error("Wrong # coordsys: 2 for " + this);
- }
- public int putGL(VobScene vs, int cs1, int cs2, int cs3) {
- throw new Error("Wrong # coordsys: 3 for " + this);
- }
-
-
-
- public final int addToListGL(GraphicsAPI.RenderingSurface win,
- int[] list, int curs, int coordsys1,
- int coordsys2) {
- throw new Error();
- }
+ int putGL(VobScene vs) ;
+ int putGL(VobScene vs, int cs1) ;
+ int putGL(VobScene vs, int cs1, int cs2) ;
+ int putGL(VobScene vs, int cs1, int cs2, int cs3) ;
/** An interface which provides information about the current
* rendering context.
Index: libvob/org/nongnu/libvob/demo/fpfont.py
diff -u libvob/org/nongnu/libvob/demo/fpfont.py:1.4
libvob/org/nongnu/libvob/demo/fpfont.py:1.5
--- libvob/org/nongnu/libvob/demo/fpfont.py:1.4 Tue Apr 8 10:57:31 2003
+++ libvob/org/nongnu/libvob/demo/fpfont.py Tue Apr 8 16:25:02 2003
@@ -6,6 +6,7 @@
vob.AbstractUpdateManager.defaultAnimationTime = 10000
from math import sin
+import math
from org.nongnu.libvob.paper.texcache import getCachedTexture
@@ -23,7 +24,65 @@
tex = getCachedTexture(args[7])
-fp = [GL.createProgram("""!!FP1.0
+fp = [
+GL.createProgram("""!!FP1.0
+MOV R10, f[TEX0].xyzw;
+DDX R8, R10;
+DDY R9, R10;
+MUL R18, R8, 1;
+MUL R19, R9, 1;
+
+TXD R0, R10, R18, R19, TEX0, 2D;
+ADD R11, R10, R18;
+TXD R1, R11, R18, R19, TEX0, 2D;
+# ADD R11, R11, R18;
+# TXD R3, R11, R18, R19, TEX0, 2D;
+SUB R11, R10, R18;
+TXD R2, R11, R18, R19, TEX0, 2D;
+# SUB R11, R11, R18;
+# TXD R4, R11, R18, R19, TEX0, 2D;
+
+ADD R11, R10, R19;
+TXD R5, R11, R18, R19, TEX0, 2D;
+SUB R11, R10, R19;
+TXD R6, R11, R18, R19, TEX0, 2D;
+
+# Now we have 3 horizontal samples
+# in R2, R0, R1
+# and 3 vertical in R6, R0, R5.
+# Set the pixel if it's maximum in one
+# direction
+
+MAX R7.x, R2.w, R1.w;
+MAX R7.y, R5.w, R6.w;
+
+SUB R7, R0.w, R7;
+
+RCP R1.w, R0.w;
+MUL R7.xy, R7, R1.w;
+
+# MAX R7.w, R7.x, R7.y;
+MAX R7.w, R7.x, R7.x;
+
+# ADDC_SAT R7.w, R7.w, .1;
+MOVC_SAT R7.w, R7.w;
+MOV R7(GT), 1;
+
+# SGEC R7.x, R0.w, R2.w;
+# SGE R7.x(NE), R0.w, R1.w;
+# SGEC R7.y, R0.w, R5.w;
+# SGE R7.y(NE), R0.w, R6.w;
+# ADD R7.w, R7.x, R7.y;
+
+MUL R0, R7.w, R0;
+SUB R0.xyz, 1, R0.w;
+# MOV R0.xy, R7;
+MOV R0.w, 1;
+MOV o[COLR], R0;
+
+END
+"""),
+GL.createProgram("""!!FP1.0
MOV R10, f[TEX0].xyzw;
DDX R8, R10;
@@ -125,7 +184,7 @@
MOV o[COLR], R0;
END
"""),
-][1:]
+]
loremipsum = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed
diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed
diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
@@ -143,6 +202,7 @@
"""
words = loremipsum.split(" ")
+
t = 0
class Scene:
def __init__(self):
@@ -153,8 +213,34 @@
SlideLin("y", 100, 10, "x coord", "Up", "Down"),
SlideLin("a", 0, 15, "Rotation", "Prior", "Next"),
ListIndex("prognum", "prognum_dummylist", 0, "prog type", "T", "t"),
+ Action("Create dist texture", "d", self.makeDist),
)
+ def makeDist(self, foo, foo2):
+ vs = vob.putil.demowindow.w.createVobScene()
+ vs.put(background((0,0,0)))
+
+
+ vs.put(getDListNocoords("""
+ BlendFunc ONE ONE
+ BlendEquation MAX
+ Enable ALPHA_TEST
+ AlphaFunc GREATER 0.99
+ """))
+ tx = vob.vobs.TextVob(vob.GraphicsAPI.getInstance().getTextStyle(
+ "serif", 1, 64),
+ "address@hidden", 0, None)
+ for x in range(-10,11):
+ for y in range(-10,11):
+ d = 1 - math.hypot(x,y) / 20
+ print d
+ vs.put(getDListNocoords("""
+ Color %s %s %s 1
+ """ % (d, d, d)))
+ cs = vs.orthoCS(0,"", 0, x+40, y+40, 20, 20)
+ vs.put(tx, cs)
+ vob.putil.demowindow.w.renderStill(vs, 0)
+
def scene(self, vs):
putnoc(vs, background((1,1,1)))
@@ -163,7 +249,8 @@
print fpid
putnoc(vs, getDListNocoords("""
- PushAttrib ENABLE_BIT
+ PushAttrib ENABLE_BIT CURRENT_BIT COLOR_BUFFER_BIT TEXTURE_BIT
+
BindProgram FRAGMENT_PROGRAM_ARB %s
Enable FRAGMENT_PROGRAM_ARB
Enable ALPHA_TEST
Index: libvob/org/nongnu/libvob/gl/GL.java
diff -u libvob/org/nongnu/libvob/gl/GL.java:1.8
libvob/org/nongnu/libvob/gl/GL.java:1.9
--- libvob/org/nongnu/libvob/gl/GL.java:1.8 Tue Apr 8 08:48:50 2003
+++ libvob/org/nongnu/libvob/gl/GL.java Tue Apr 8 16:25:02 2003
@@ -167,7 +167,7 @@
/** The Java proxy for a C++ object.
*/
- static public abstract class JavaObject extends Vob
+ static public abstract class JavaObject extends AbstractVob
implements GLDeletable {
private int id = 0;
JavaObject(int id) { super(); this.id = id; }
@@ -334,7 +334,10 @@
* Here, id == directly the texture id.
*/
static public class Texture extends NonRenderableJavaObject {
- private Texture(int id) { super(id); }
+ boolean delReal;
+ private Texture(int id) { super(id); delReal = false; }
+ private Texture(int id, boolean delReal) { super(id);
+ this.delReal = delReal; }
protected void deleteObj() { impl_deleteTexture(getId()); }
/** Get the OpenGL texture id of this texture.
@@ -450,7 +453,7 @@
/** Create a new OpenGL texture object.
*/
static public Texture createTexture() {
- return new Texture(impl_createTexture());
+ return new Texture(impl_createTexture(), true);
}
static private native int impl_createTexture();
static private native void impl_deleteTexture(int id);
@@ -504,6 +507,16 @@
* in the font.
*/
public void getWidths(float[] w) { putFontWidths(getId(), w); }
+
+ /** Get the number of textures in the font.
+ */
+ public int getNTextures() { return impl_Font_getNTextures(getId()); }
+
+ /** Get the ith texture of the font.
+ */
+ public Texture getTexture(int i) {
+ return new Texture(impl_Font_getTexture(getId(), i), false);
+ }
}
static String defaultFontFile =
"/usr/share/fonts/type1/gsfonts/n019004l.pfb";
@@ -529,6 +542,8 @@
static private native float getFontYOffs(int id);
static private native void deleteFont(int id);
static private native void putFontWidths(int id, float[] w);
+ static private native int impl_Font_getNTextures(int id);
+ static private native int impl_Font_getTexture(int id, int i);
//--------- OpenGL Program
Index: libvob/org/nongnu/libvob/linebreaking/HBox.java
diff -u libvob/org/nongnu/libvob/linebreaking/HBox.java:1.1
libvob/org/nongnu/libvob/linebreaking/HBox.java:1.2
--- libvob/org/nongnu/libvob/linebreaking/HBox.java:1.1 Sun Mar 16 10:55:04 2003
+++ libvob/org/nongnu/libvob/linebreaking/HBox.java Tue Apr 8 16:25:02 2003
@@ -38,7 +38,7 @@
*/
public interface HBox {
-String rcsid = "$Id: HBox.java,v 1.1 2003/03/16 15:55:04 benja Exp $";
+String rcsid = "$Id: HBox.java,v 1.2 2003/04/08 20:25:02 tjl Exp $";
float getWidth(float scale);
@@ -111,7 +111,7 @@
/** A useful base class for hboxes that are vobs.
* The second coordsys will contain the width and height for this vob.
*/
- abstract class VobHBox extends Vob implements HBox {
+ abstract class VobHBox extends AbstractVob implements HBox {
// public VobHBox(Object key) { super(key); }
protected float scale = 0;
public float getScale() { return scale; }
Index: libvob/org/nongnu/libvob/vobs/OvalBgVob.java
diff -u libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.2
libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.3
--- libvob/org/nongnu/libvob/vobs/OvalBgVob.java:1.2 Wed Mar 26 07:39:26 2003
+++ libvob/org/nongnu/libvob/vobs/OvalBgVob.java Tue Apr 8 16:25:02 2003
@@ -41,8 +41,8 @@
* Draws a filled (possibly with several colors) background circle,
* surrounded by a circle of the current foreground color.
*/
-public class OvalBgVob extends Vob {
-public static final String rcsid = "$Id: OvalBgVob.java,v 1.2 2003/03/26
12:39:26 humppake Exp $";
+public class OvalBgVob extends AbstractVob {
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.3 2003/04/08
20:25:02 tjl Exp $";
public static boolean dbg = false;
private static final void p(String s) { if(dbg) System.out.println(s); }
Index: libvob/org/nongnu/libvob/vobs/RectBgVob.java
diff -u libvob/org/nongnu/libvob/vobs/RectBgVob.java:1.2
libvob/org/nongnu/libvob/vobs/RectBgVob.java:1.3
--- libvob/org/nongnu/libvob/vobs/RectBgVob.java:1.2 Wed Mar 26 08:13:50 2003
+++ libvob/org/nongnu/libvob/vobs/RectBgVob.java Tue Apr 8 16:25:02 2003
@@ -40,8 +40,8 @@
* Draws a filled (possibly with several colors) background rectangle,
* surrounded by a rectangle of the current foreground color.
*/
-public class RectBgVob extends Vob {
-public static final String rcsid = "$Id: RectBgVob.java,v 1.2 2003/03/26
13:13:50 humppake Exp $";
+public class RectBgVob extends AbstractVob {
+public static final String rcsid = "$Id: RectBgVob.java,v 1.3 2003/04/08
20:25:02 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: libvob/org/nongnu/libvob/vobs/SimpleConnection.java
diff -u libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.3
libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.4
--- libvob/org/nongnu/libvob/vobs/SimpleConnection.java:1.3 Wed Mar 26
08:36:35 2003
+++ libvob/org/nongnu/libvob/vobs/SimpleConnection.java Tue Apr 8 16:25:02 2003
@@ -34,8 +34,8 @@
/** A plain line drawn between two coordinate sets.
*/
-public class SimpleConnection extends Vob {
-public static final String rcsid = "$Id: SimpleConnection.java,v 1.3
2003/03/26 13:36:35 humppake Exp $";
+public class SimpleConnection extends AbstractVob {
+public static final String rcsid = "$Id: SimpleConnection.java,v 1.4
2003/04/08 20:25:02 tjl Exp $";
float x0, y0, x1, y1;
Color color;
Index: libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java
diff -u libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java:1.2
libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java:1.3
--- libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java:1.2 Wed Mar 26
06:50:14 2003
+++ libvob/org/nongnu/libvob/vobs/SolidBackdropVob.java Tue Apr 8 16:25:02 2003
@@ -35,11 +35,9 @@
import java.awt.Rectangle;
/** A solid clear-and-paint-background vob.
- * CONFUSING NAME: NOT TO BE USED FOR BOX BACKGROUNDS, THIS IS FOR WHOLE
- * VOBSCENES ONLY
* This vob must be placed *without* coordinate systems.
*/
-public class SolidBackdropVob extends Vob{
+public class SolidBackdropVob extends AbstractVob {
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: libvob/org/nongnu/libvob/vobs/TestSpotVob.java
diff -u libvob/org/nongnu/libvob/vobs/TestSpotVob.java:1.3
libvob/org/nongnu/libvob/vobs/TestSpotVob.java:1.4
--- libvob/org/nongnu/libvob/vobs/TestSpotVob.java:1.3 Mon Mar 17 06:00:43 2003
+++ libvob/org/nongnu/libvob/vobs/TestSpotVob.java Tue Apr 8 16:25:02 2003
@@ -38,8 +38,8 @@
* constant in screen coordinates; scaling does not affect it.
* This is most likely not useful for anything else.
*/
-public class TestSpotVob extends Vob {
-public static final String rcsid = "$Id: TestSpotVob.java,v 1.3 2003/03/17
11:00:43 tjl Exp $";
+public class TestSpotVob extends AbstractVob {
+public static final String rcsid = "$Id: TestSpotVob.java,v 1.4 2003/04/08
20:25:02 tjl Exp $";
float x, y, z;
Index: libvob/src/jni/Font.cxx
diff -u libvob/src/jni/Font.cxx:1.2 libvob/src/jni/Font.cxx:1.3
--- libvob/src/jni/Font.cxx:1.2 Tue Apr 8 07:37:31 2003
+++ libvob/src/jni/Font.cxx Tue Apr 8 16:25:03 2003
@@ -84,6 +84,16 @@
env->ReleaseFloatArrayElements(widths, w, 0);
}
+jf( jint, impl_1Font_1getNTextures )
+ (JNIEnv *env, jclass, jint fontId) {
+ return textrenderers[fontId]->rend->g.mosaic.textures.size();
+}
+
+jf( jint, impl_1Font_1getTexture )
+ (JNIEnv *env, jclass, jint fontId, jint i) {
+ return
textrenderers[fontId]->rend->g.mosaic.textures[i]->tex->getId().getTexId();
+}
+
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob doc/pegboard/vob_interface--benja/peg.rs...,
Tuomas J. Lukka <=