[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./Makefile ./up.sh docs/SwampTutorial.r...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire ./Makefile ./up.sh docs/SwampTutorial.r... |
|
Date: |
Tue, 22 Apr 2003 08:14:32 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/22 08:14:32
Modified files:
. : Makefile up.sh
docs : SwampTutorial.rst
org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java
Pp.java SinglePaper.java
UniquePaperVob.java
org/fenfire/view: SpatialPlane.java
Log message:
train trip + fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/SwampTutorial.rst.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.6 fenfire/Makefile:1.7
--- fenfire/Makefile:1.6 Tue Apr 22 08:11:42 2003
+++ fenfire/Makefile Tue Apr 22 08:14:32 2003
@@ -25,3 +25,9 @@
make -C "../navidoc/" html-loop $(DBG) RST="../fenfire/$(RST)"
# Navidoc targets end
######################
+
+######
+# TAGS
+tags:
+ cd .. && find fenfire libvob alph callgl glmosaictext alph storm
navidoc -type d -name CVS -exec sed -e '/^[^/]/d' -e 's:^\(/[^/]*\).*:{}\1:' -e
's:/CVS/:/:' {}/Entries \;|xargs etags --append
+
Index: fenfire/docs/SwampTutorial.rst
diff -u fenfire/docs/SwampTutorial.rst:1.2 fenfire/docs/SwampTutorial.rst:1.3
--- fenfire/docs/SwampTutorial.rst:1.2 Wed Apr 16 01:36:12 2003
+++ fenfire/docs/SwampTutorial.rst Tue Apr 22 08:14:32 2003
@@ -12,6 +12,9 @@
fen.constgraph = fen.graph = new HashGraph();
fen.txt = new SimpleNodeContent(fen);
+Or for speed you probably want caching: ::
+
+ fen.txt = new CachingNodeContent(new SimpleNodeContent(fen));
Adding triplet in the Swamp?
----------------------------
@@ -31,12 +34,12 @@
::
-< mudyc> hmm.. so how literal is done?
-< mudyc> like the coords of a note?
-<@tuomasl2> graph.add(foo,bar, Nodes.getStringLiteral(""+42))
-< mudyc> and other direction?
-<@tuomasl2> x = graph.find1_11X(foo,bar)
-<@tuomasl2> ((Literal)x).getTextString()
+ < mudyc> hmm.. so how literal is done?
+ < mudyc> like the coords of a note?
+ <@tuomasl2> graph.add(foo,bar, Nodes.getStringLiteral(""+42))
+ < mudyc> and other direction?
+ <@tuomasl2> x = graph.find1_11X(foo,bar)
+ <@tuomasl2> ((Literal)x).getTextString()
New node
@@ -55,17 +58,24 @@
How to make a triplet?
----------------------
-13:01 < mudyc> tuomasl2: how do i do a new triplet?
-13:02 <@tuomasl2> mudyc: if the last element is unique, set1_11X
+::
+
+ < mudyc> tuomasl2: how do i do a new triplet?
+ <@tuomasl2> mudyc: if the last element is unique, set1_11X
+
+otherwise you should use graph.add method: ::
+ fen.graph.add(sub, pred, onj);
Find nodes
----------
-14:46 < mudyc> after this: Iterator findN_11X_Iter(Object e0,Object e1) ; what
does the iterator
- return after iter.next()?
-14:47 < mudyc> Triplet?
-14:48 <@tuomasl2> no, no Triplet objects here yet
-14:48 <@tuomasl2> it returns e2
+::
+
+ < mudyc> after this: Iterator findN_11X_Iter(Object e0,Object e1) ; what
does the iterator
+ return after iter.next()?
+ < mudyc> Triplet?
+ <@tuomasl2> no, no Triplet objects here yet
+ <@tuomasl2> it returns e2
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.19
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.20
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.19 Wed Apr 16
04:45:58 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Tue Apr 22 08:14:32 2003
@@ -12,8 +12,6 @@
import org.nongnu.libvob.impl.gl.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.vobs.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
import java.awt.event.*;
@@ -21,10 +19,10 @@
// implement fisheye in here later..
-/** XXX
+/** PPCanvas which has been selected/created to be the focus one.
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.19
2003/04/16 08:45:58 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.20
2003/04/22 12:14:32 mudyc Exp $";
public static boolean dbg = false;
private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -141,9 +139,11 @@
vs.coords.setOrthoParams(csinv, 0, panx, pany, 1/zoom, 1/zoom);
}
+ private int focusFrame = -1;
private int c2fCS = -1;
public void renderMain(VobScene vs, int into) {
p("con: "+ context);
+ focusFrame = into;
Object node = context.getAccursed();
Object paper = node;
if (RDFUtil.isNodeType(fen, node, PP.Note)) {
@@ -175,7 +175,7 @@
.render(vs, into, c2fCS, c2fCSInv, hook);
} else {
int zo = (int)(zoom * 100000);
- int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1,
panx, pany);
+ int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1,
-panx, -pany);
vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
(new SpatialPlane(PP.Note, PP.contains)).renderAWT(vs, into,
geometry,
@@ -225,19 +225,28 @@
if (m_state[2] == e.BUTTON3_MASK) {
zoom = m_state_zoom * (float)
Math.exp((m_state[1] - e.getY())/150.0);
- return true;
+ AbstractUpdateManager.setNoAnimation();
+ if (GraphicsAPI.getInstance() instanceof GLAPI) {
+ setZoomPan(oldVobScene, focusFrame);
+ return true;
+ } else {
+ AbstractUpdateManager.chg();
+ return false;
+ }
}
// Move by dragging with button 1
if (m_state[2] == e.BUTTON1_MASK && e.getID() ==
MouseEvent.MOUSE_DRAGGED) {
+ panx = pan[0] + (m_state[0] - e.getX())/zoom;
+ pany = pan[1] + (m_state[1] - e.getY())/zoom;
+
if (GraphicsAPI.getInstance() instanceof GLAPI) {
- ;
+ setZoomPan(oldVobScene, focusFrame);
+ return true;
} else {
- ;
+ AbstractUpdateManager.chg();
+ return false;
}
- panx = pan[0] - (m_state[0] - e.getX())/zoom;
- pany = pan[1] - (m_state[1] - e.getY())/zoom;
- return true;
}
// Move around by clicking
@@ -248,10 +257,11 @@
if (GraphicsAPI.getInstance() instanceof GLAPI) {
// We must transform into Frame, and then the C2F coordinate
system
- int mainctrCS =
((DefaultVobMatcher)oldVobScene.matcher).getCS(0, "Center");
- pa("mainctr"+ mainctrCS);
+ int mainctrCS =
((DefaultVobMatcher)oldVobScene.matcher).getCS(0, "FocusCtr");
+ //pa("mainctr"+ mainctrCS);
- int frame =
((DefaultVobMatcher)oldVobScene.matcher).getCS(mainctrCS, "MAINVP");
+ //int frame =
((DefaultVobMatcher)oldVobScene.matcher).getCS(mainctrCS, "MAINVP");
+ int frame = focusFrame;
int c2f = ((DefaultVobMatcher)oldVobScene.matcher).getCS(frame,
"C2F");
if (c2f < 0) c2f = c2fCS;
if(frame < 0 || c2f < 0)
@@ -259,38 +269,31 @@
// XXX vp, not frame!
oldVobScene.coords.inverseTransformPoints3(mainctrCS, pt, pt);
+ //oldVobScene.coords.inverseTransformPoints3(frame, pt, pt);
oldVobScene.coords.inverseTransformPoints3(c2f, pt, pt);
panx = pt[0]; pany = pt[1];
// XXX current = current.h(d.contains);
- AbstractUpdateManager.chg();
+ //setZoomPan(oldVobScene, focusFrame);
+ return false;
} else {
int focusFrame = oldVobScene.matcher.getCS("FocusFrame");
float box[] = new float[3];
box = oldVobScene.coords.transformPoints3(focusFrame, box,
null);
float size[] = new float[2];
oldVobScene.coords.getSqSize(focusFrame, size);
- panx -= ((pt[0] - box[0]) - size[0]/2)/ zoom;
- pany -= ((pt[1] - box[1]) - size[1]/2)/ zoom;
+ panx += ((pt[0] - box[0]) - size[0]/2)/ zoom;
+ pany += ((pt[1] - box[1]) - size[1]/2)/ zoom;
// XXX current = current.h(d.contains);
- AbstractUpdateManager.chg();
}
- return false;
}
-
-
AbstractUpdateManager.chg();
return false;
}
public void setZoom(float z) { zoom = z; }
-
- public void moveTo(float x, float y) {
- panx=x;
- pany=y;
- }
-
+ public void moveTo(float x, float y) { panx=x; pany=y; }
}
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.20
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.21
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.20 Wed Apr 16
06:42:53 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Tue Apr 22 08:14:32 2003
@@ -17,8 +17,8 @@
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.20 2003/04/16
10:42:53 mudyc Exp $";
- public static boolean dbg = true;
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.21 2003/04/22
12:14:32 mudyc Exp $";
+ public static boolean dbg = false;
private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
@@ -83,7 +83,7 @@
*/
public int renderBuoy(VobScene vs, int into, Object node, Object content,
Object cachedSize){
- pa("renderBuoy: "+ node);
+ p("renderBuoy: "+ node);
int[] pan = getCoords(node);
float [] bs = new float[2];
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.27
fenfire/org/fenfire/modules/pp/Pp.java:1.28
--- fenfire/org/fenfire/modules/pp/Pp.java:1.27 Thu Apr 17 06:22:05 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Tue Apr 22 08:14:32 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.27 2003/04/17 10:22:05
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.28 2003/04/22 12:14:32
mudyc Exp $";
public static final boolean dbg = false;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -54,6 +54,8 @@
private BuoyAdaptor adaptor = new BuoyAdaptor();
private BuoyViewMainNode focus;
private NodeView nodeview;
+
+ // Should be moved to some view context
private Object accursed;
@@ -112,13 +114,20 @@
AbstractUpdateManager.chg();
}
+ // for zooming with gl
+ private VobScene reUseVS = null;
private final Shower shower = new Shower() {
Screen screen;
public void setScreen(Screen s) {this.screen = s; }
public VobScene generate() {
- VobScene old = this.screen.getVobSceneForEvents();
- VobScene vs = this.screen.window.createVobScene();
- render(vs);
+ VobScene vs;
+ if (reUseVS == null) {
+ vs = this.screen.window.createVobScene();
+ render(vs);
+ } else {
+ vs = reUseVS;
+ reUseVS = null;
+ }
return vs;
}
public void chg() {}
@@ -157,8 +166,9 @@
}
if (focus.mouse(m, vs)) {
- AbstractUpdateManager.setNoAnimation();
+ //AbstractUpdateManager.setNoAnimation();
AbstractUpdateManager.chg();
+ reUseVS = vs;
}
}
public void setScreen(Screen s) { this.screen = s; }
@@ -169,7 +179,7 @@
};
// --------------------------------------------------
- // WievContext
+ // ViewContext
public class Context implements NodeView.Context, PpContext {
public void nodeIsToBePlaced(Object node, NodeView nv) {
@@ -216,15 +226,17 @@
ctrX = ((float)vs.size.width)/2;
ctrY = ((float)vs.size.height)/2;
- /*
- int focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
- int frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 200,
+ int frameCS;
+ if (GraphicsAPI.getInstance() instanceof GLAPI) {
+ int focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
+ frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 200,
-width/2, -height/2, 1, 1,
width, height);
- */
- int frameCS = vs.orthoBoxCS(0, "FocusFrame", 200,
+ } else {
+ frameCS = vs.orthoBoxCS(0, "FocusFrame", 200,
ctrX - width/2, ctrY - height/2, 1, 1,
width, height);
+ }
vs.activate(frameCS);
if (focus == null)
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.10
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.11
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.10 Wed Apr 16
06:42:53 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java Tue Apr 22 08:14:32 2003
@@ -17,8 +17,8 @@
* the background and the vobs inside the plane.
*/
public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.10 2003/04/16
10:42:53 mudyc Exp $";
- public static boolean dbg = true;
+private static final String rcsid = "$Id: SinglePaper.java,v 1.11 2003/04/22
12:14:32 mudyc Exp $";
+ public static boolean dbg = false;
private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) { System.out.println("SinglePaper::"+s); }
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.9
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.10
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.9 Mon Apr 14
08:18:55 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java Tue Apr 22 08:14:32 2003
@@ -14,7 +14,7 @@
* surrounded by a rectangle of the current foreground color.
*/
public class UniquePaperVob extends AbstractVob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.9 2003/04/14
12:18:55 mudyc Exp $";
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.10 2003/04/22
12:14:32 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("UniquePaperVob::"+s); }
@@ -60,79 +60,131 @@
Color c2 = getUniqColor();
float a =(float) Math.PI * rand.nextFloat();
- if (a > Math.PI/4 && a <= Math.PI *3f/4) {
- // verticals..
+ if ( Math.abs(rand.nextInt())%4 != 0) {
float linew = mw/((Math.abs(rand.nextInt())%5) + 3);
- float begin_x;
- float f = mx + mw/2 + panx*zoom;
-
- // >> if too far we have to be at least mw away from mx.
- while ( f < mx - 2*mw) {
- try {
- f += Math.abs( ((ratio * linew)/j)*zoom );
- f += Math.abs( (((1-ratio) * linew)/j)*zoom );
- } catch (Exception e) { pa("e:"+e); }
- }
+ float begin_x = -1;
+ float begin_y = -1;
+ float f;
+
+ if (a > Math.PI/4 && a <= Math.PI *3f/4) {
+ // verticals..
+ f = mx + mw/2 - panx*zoom;
+
+ // >> if too far we have to be at least mw away from mx.
+ while ( f < mx - 2*mw) {
+ f += Math.abs( ((ratio * linew)/j)*zoom );
+ f += Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+ // add y component
+ f += (pany*zoom)/(float)Math.tan(a);
- // << if too near
- while( f > mx-2*mw ) {
- f -= Math.abs( ((ratio * linew)/j)*zoom );
- f -= Math.abs( (((1-ratio) * linew)/j)*zoom );
- }
+ if (a < Math.PI/2)
+ f += (mh/2)/(float)Math.tan(a);
+ else
+ f -= (mh/2)/(float)Math.tan(a);
- // add y component
- begin_x = f + (pany*zoom)/(float)Math.tan(a);
+ // << if too near
+ while( f > mx-2*mw ) {
+ f -= Math.abs( ((ratio * linew)/j)*zoom );
+ f -= Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+ begin_x = f;
+ } else {
+ j = (float)Math.sin(k - Math.PI/2);
+ // horizontals..
+ f = my + mh/2 - pany*zoom;
+
+ // >> if too far we have to be at least mw away from my.
+ while ( f < my - 2*mh) {
+ f += Math.abs( ((ratio * linew)/j)*zoom );
+ f += Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+ // add x component
+ f += (panx*zoom)*(float)Math.tan(a);
+ if (a < Math.PI/4)
+ f += (mw/2)*(float)Math.tan(a);
+ else
+ f -= (mw/2)*(float)Math.tan(a);
+
- boolean black = true;
+ // << if too near
+ while( f > my-2*mh ) {
+ f -= Math.abs( ((ratio * linew)/j)*zoom );
+ f -= Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+ begin_y = f;
+ }
+ boolean black = true;
float end_x = mx + mw + Math.abs(mh/(float)Math.tan(a));
- while (begin_x < end_x) {
- int[] x = new int[4];
- int[] y = new int[4];
-
- //pa("foo"+begin_x+"/"+end_x);
-
- x[0] = (int)(begin_x);
- y[0] = (my+mh);
-
- x[1] = (int)( begin_x + mh/Math.tan(a) );
- y[1] = my;
- if (black)
- begin_x += Math.abs(zoom* (ratio * linew)/j);
- else
- begin_x += Math.abs(zoom* ((1-ratio) * linew)/j);
- black = !black;
-
- x[2] = (int)( begin_x + mh/Math.tan(a));
- y[2] = my;
- x[3] = (int)(begin_x);
- y[3] = my+mh;
-
- if (black) g.setColor(c1);
- else g.setColor(c2);
+ float end_y = my + mh + Math.abs(mw*(float)Math.tan(a));
+
+ int[] x = new int[4];
+ int[] y = new int[4];
- g.fillPolygon(x,y,4);
+ if (a > Math.PI/4 && a <= Math.PI *3f/4) {
+ if (begin_x > end_x) throw new Error("UniquePaperVob::begin_x >
end_x!");
+ while (begin_x < end_x) {
+ x[0] = (int)begin_x;
+ y[0] = (my+mh);
+
+ x[1] = (int)( begin_x + mh/Math.tan(a) );
+ y[1] = my;
+ if (black)
+ begin_x += Math.abs(zoom* (ratio * linew)/j);
+ else
+ begin_x += Math.abs(zoom* ((1-ratio) * linew)/j);
+ black = !black;
+
+ x[2] = (int)( begin_x + mh/Math.tan(a));
+ y[2] = my;
+ x[3] = (int)(begin_x);
+ y[3] = my+mh;
+
+ if (black) g.setColor(c1);
+ else g.setColor(c2);
+ g.fillPolygon(x,y,4);
+ }
+ } else {
+ if (begin_y > end_y) throw new Error("UniquePaperVob::begin_y >
end_y!");
+ while (begin_y < end_y) {
+ y[0] = (int)begin_y;
+ x[0] = mx;
+
+ y[1] = (int)( begin_y + mw * Math.tan(a));
+ x[1] = mx+mw;
+ if (black)
+ begin_y += Math.abs(zoom* (ratio * linew)/j);
+ else
+ begin_y += Math.abs(zoom* ((1-ratio) * linew)/j);
+ black = !black;
+
+ y[2] = (int)( begin_y + mw * Math.tan(a));
+ x[2] = mx+mw;
+ y[3] = (int)(begin_y);
+ x[3] = mx;
+
+ if (black) g.setColor(c1);
+ else g.setColor(c2);
+ g.fillPolygon(x,y,4);
+ }
}
} else {
- // horizontals..
g.setColor(c1);
g.fillRect(mx, my, mw, mh);
}
-
- int x = mx + mw/2 - (int)((mw*zoom)/4) + (int)(panx * zoom),
- y = my + mh/2 - (int)((mh*zoom)/4) + (int)(pany * zoom),
- w = (int) ((float)mw*zoom)/2,
- h = (int) ((float)mh*zoom)/2;
-
- //pa("x"+x+"y"+y+"w"+w+"h"+h);
-
- g.setColor(Color.gray);
- g.fillRect(x, y, w, h);
-
+ if (dbg) {
+ int x = mx + mw/2 - (int)((mw*zoom)/4) + (int)(panx * zoom),
+ y = my + mh/2 - (int)((mh*zoom)/4) + (int)(pany * zoom),
+ w = (int) ((float)mw*zoom)/2,
+ h = (int) ((float)mh*zoom)/2;
+ g.setColor(Color.gray);
+ g.fillRect(x, y, w, h);
+ }
g.setColor(oldfg);
g.setClip(oldClip);
}
@@ -142,56 +194,8 @@
return Color.getHSBColor(rand.nextFloat(), .7f +
(rand.nextFloat()*2-1)/8, brigh);
}
-
-
- Vob glList;
-
public int putGL(VobScene vs, int coordsys1) {
-
- /*
- if(dbg) pa("Addtolistgl rectbg "+coordsys1);
- if(glList == null) {
- String bgcall = "";
- if(colors != null && NColors > 0) {
- double w = 1.0 / NColors;
-
- for(int i=0; i<NColors; i++) {
- double x1 = i*w;
- double x2 = x1 + w;
- bgcall += (
- "Color "+ColorUtil.colorGLString(colors[i])+" 1\n"+
- "Begin QUAD_STRIP\n"+
- "Vertex "+x1+" 1\n" +
- "Vertex "+x1+" 0\n"+
- "Vertex "+x2+" 1\n"+
- "Vertex "+x2+" 0\n"+
- "End\n");
- }
- } else {
- bgcall = (
- "Color "+ColorUtil.colorGLString(bgColor)+" 1\n" +
- "Begin QUAD_STRIP\n"+
- "Vertex 1 1\nVertex 1 0\n"+
- "Vertex 0 1\nVertex 0 0\n"+
- "End\n");
- }
-
- if (drawBorder) bgcall += glBorderString();
-
- glList = GLRen.createCallListBoxCoorded(
- "PushAttrib CURRENT_BIT ENABLE_BIT\n"+
- "Disable TEXTURE_2D\n"+
-
- bgcall +
-
- "PopAttrib\n"
- );
- }
- vs.map.put(glList, coordsys1);
-
- */
- return 0;
+ throw new Error("Use libpaper with OpenGL instead of UniquePaperVob");
}
-
}
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.19
fenfire/org/fenfire/view/SpatialPlane.java:1.20
--- fenfire/org/fenfire/view/SpatialPlane.java:1.19 Wed Apr 16 06:42:53 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Tue Apr 22 08:14:32 2003
@@ -25,9 +25,9 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.19 2003/04/16
10:42:53 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.20 2003/04/22
12:14:32 mudyc Exp $";
public static boolean dbg = false;
- private static void p(String s) { pa(s); }
+ private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -52,7 +52,7 @@
Object node, NodeView nodeview,
Fen fen, NodePlacementHook hook)
{
- if(dbg) pa("RenderAwt");
+ p("RenderAwt");
Object current = node;
Object container = current;
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.3 fenfire/up.sh:1.4
--- fenfire/up.sh:1.3 Mon Apr 14 08:18:55 2003
+++ fenfire/up.sh Tue Apr 22 08:14:32 2003
@@ -18,3 +18,10 @@
# do cd $DIR/$x && pwd && make -s;
#done;
#cd $DIR/fenfire && ant clean compile
+
+# Make tags
+#cd $DIR
+#find fenfire libvob alph callgl glmosaictext alph storm navidoc -type d
+#-name CVS -exec sed -e '/^[^/]/d' -e 's:^\(/[^/]*\).*:{}\1:' -e
+#'s:/CVS/:/:' {}/Entries \;|xargs etags --append
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire ./Makefile ./up.sh docs/SwampTutorial.r...,
Matti Katila <=