[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/PPCanvas...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/PPCanvas... |
|
Date: |
Mon, 28 Apr 2003 07:17:17 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/28 07:17:16
Modified files:
. : up.sh
org/fenfire/modules/pp: PPCanvasCursor.java Pp.java
SinglePaper.java UniquePaperVob.java
org/fenfire/view: SpatialPlane.java
Removed files:
org/fenfire : Space.java
org/fenfire/impl: IdentityManager.java
Log message:
some cleanups
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.29
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.30
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.29 Fri Apr 25
07:19:39 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Mon Apr 28 07:17:16 2003
@@ -22,7 +22,7 @@
/** 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.29
2003/04/25 11:19:39 tjl Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.30
2003/04/28 11:17:16 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -67,8 +67,8 @@
panx = RDFUtil.getInt(fen, node, SPATIAL.coordX) + bs[0]/2;
pany = RDFUtil.getInt(fen, node, SPATIAL.coordY) + bs[1]/2;
} else {
- panx = 0;
- pany = 0;
+ panx = 5;
+ pany = 6;
}
}
@@ -185,8 +185,16 @@
zoom = m_state_zoom * (float)
Math.exp((m_state[1] - e.getY())/150.0);
AbstractUpdateManager.setNoAnimation();
- setZoomPan(oldVobScene, focusFrame);
- return true;
+
+ // in current/stupid awt implementation we can't use
+ // setOrthoParams because of complex coordinate systems.
+ if (GraphicsAPI.getInstance() instanceof GLAPI) {
+ setZoomPan(oldVobScene, focusFrame);
+ return true;
+ } else {
+ AbstractUpdateManager.chg();
+ return false;
+ }
}
// Move by dragging with button 1
@@ -194,8 +202,15 @@
panx = pan[0] + (m_state[0] - e.getX())/zoom;
pany = pan[1] + (m_state[1] - e.getY())/zoom;
- setZoomPan(oldVobScene, focusFrame);
- return true;
+ // in current/stupid awt implementation we can't use
+ // setOrthoParams because of complex coordinate systems.
+ if (GraphicsAPI.getInstance() instanceof GLAPI) {
+ setZoomPan(oldVobScene, focusFrame);
+ return true;
+ } else {
+ AbstractUpdateManager.chg();
+ return false;
+ }
}
// Move around by clicking
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.35
fenfire/org/fenfire/modules/pp/Pp.java:1.36
--- fenfire/org/fenfire/modules/pp/Pp.java:1.35 Fri Apr 25 11:40:31 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Mon Apr 28 07:17:16 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.35 2003/04/25 15:40:31
benja Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.36 2003/04/28 11:17:16
mudyc Exp $";
public static final boolean dbg = false;
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -167,7 +167,7 @@
}
if (focus.mouse(m, vs)) {
- //AbstractUpdateManager.setNoAnimation();
+ AbstractUpdateManager.setNoAnimation();
AbstractUpdateManager.chg();
reUseVS = vs;
}
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.13
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.14
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.13 Fri Apr 25
07:19:39 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java Mon Apr 28 07:17:16 2003
@@ -17,7 +17,7 @@
* the background and the vobs inside the plane.
*/
public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.13 2003/04/25
11:19:39 tjl Exp $";
+private static final String rcsid = "$Id: SinglePaper.java,v 1.14 2003/04/28
11:17:16 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SinglePaper::"+s); }
@@ -43,7 +43,7 @@
return i();
}
- /** Set the instance. This is usually made with i() method.
+ /** Set the instance.
*/
public void set(Fen fen, GraphicsAPI.Window win,
NodeView nodeview) {
@@ -110,11 +110,7 @@
final int bg2screen = vs.scaleCS(paper2screen, "BGSCA",
bgscale, bgscale);
- // BgVob takes two coordsys:
- // frame2screen and paper2screen
- final BgVob bg = BgVob.create(node, window);
-
- final int frameUnit = vs.unitSqCS(frameCS, "USQ");
+ final int frameUnit = vs.unitSqCS(frameCS, "USQ");
final int frameUnit2paper = vs.orthoCS(inversePanZoom, "PZIN", 0,
// -sqs[0], -sqs[1], sqs[0], sqs[1]);
@@ -135,16 +131,17 @@
Runnable placeContent = new Runnable() {
public void run() {
+ // BgVob takes two coordsys:
+ // frame2screen and paper2screen
+ final BgVob bg = BgVob.create(node, window);
+
// XXX Unclean!
// vs.map.put(bg, frameUnit, bg2screen);
bg.put(vs, frameUnit, bg2screen);
vs.map.put(black);
- //coordinatePlaneView.render(vs, paper2screen_shifted,
- // node, frameCS, space, hook_final);
-
- spatialplane.renderGL(vs, paper2screen_shifted,
- node, frameCS, fen, hook_final, nv);
+ spatialplane.render(vs, paper2screen_shifted,
+ node, frameCS, fen, hook_final, nv);
}};
if (GraphicsAPI.getInstance() instanceof GLAPI) {
@@ -164,16 +161,19 @@
placeContent.run();
}
} else {
- // XXX Need some work - later
+ // kludge.. (history and awt..)
+
+ float [] pan = vs.coords.transformPoints3(inversePanZoom, new
float[3], null);
+ float[] zsize = new float[2];
+ vs.coords.getSqSize(frameCS, zsize);
+
+ pa("zoom: " +zsize[0]);
- int zoom = 1;
- int panx=0, pany=0;
- int into = 0;
-
- int zo = (int)(zoom * 100000);
- int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1,
-panx, -pany);
- vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
- spatialplane.renderAWT(vs, into, geometry, node, nv, fen ,hook);
+ int zo = (int)(zsize[0] * 100000);
+ int geometry = vs.orthoBoxCS(frameCS, "FocusGeometry",0, zo,0, 1,1,
-pan[0], -pan[1]);
+ vs.map.put(new UniquePaperVob(paper.toString()), frameCS, geometry);
+ spatialplane.render(vs, paper2screen_shifted,
+ node, frameCS, fen, hook_final, nv);
}
}
}
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.11
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.12
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.11 Tue Apr 22
17:59:27 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java Mon Apr 28 07:17:16 2003
@@ -14,8 +14,8 @@
* surrounded by a rectangle of the current foreground color.
*/
public class UniquePaperVob extends AbstractVob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.11 2003/04/22
21:59:27 mudyc Exp $";
- public static boolean dbg = true;
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.12 2003/04/28
11:17:16 mudyc Exp $";
+ public static boolean dbg = false;
private static void pa(String s) {
System.out.println("UniquePaperVob::"+s); }
@@ -46,7 +46,7 @@
info2.getExtRect(geom);
int panx = geom.width, pany = geom.height;
- //pa("mx: "+mx+", gx: "+geom.x+", panx: "+panx+", pany: "+pany);
+ if (dbg) pa("mx: "+mx+", gx: "+geom.x+", panx: "+panx+", pany: "+pany);
float zoom = ((float)(geom.x))/100000;
int gx = geom.x;
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.26
fenfire/org/fenfire/view/SpatialPlane.java:1.27
--- fenfire/org/fenfire/view/SpatialPlane.java:1.26 Fri Apr 25 07:19:39 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Mon Apr 28 07:17:16 2003
@@ -25,7 +25,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.26 2003/04/25
11:19:39 tjl Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.27 2003/04/28
11:17:16 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -44,74 +44,13 @@
public int getCursorBox() { return cursorBox; }
- public void renderAWT(VobScene vs, int into, int geom,
- Object node, NodeView nodeview,
- Fen fen, NodePlacementHook hook)
- {
- if(dbg) pa("RenderAwt");
- Object current = node;
- Object container = current;
-
- if (RDFUtil.isNodeType(fen, current, cType)) {
- container = fen.constgraph.find1_X11(cont, current);
- }
-
-
-
- // get zoom geometry etc.
- float[] size = new float[2];
- vs.coords.getSqSize(into, size);
- float[] pt = vs.coords.transformPoints3(into, new float[3], null);
- pt[0] += size[0]/2;
- pt[1] += size[1]/2;
- if (size[0] < 10 || size[1] <10) return;
-
-
- float[] pan = new float[]{1,1};
- vs.coords.getSqSize(geom, pan);
- float zoom = (vs.coords.transformPoints3(geom, new float[3],
null))[0]/100000;
-
- float[] bs = new float[2];
- cursorBox = -1;
-
- Iterator iter = fen.constgraph.findN_11X_Iter(container, cont);
- while (iter.hasNext()) {
- Object n = iter.next();
-
- // get coords
- int[] coords = new int[2];
- coords[0] = RDFUtil.getInt(fen, n, SPATIAL.coordX);
- coords[1] = RDFUtil.getInt(fen, n, SPATIAL.coordY);
-
- nodeview.getSize(n, bs, zoom);
- Pair matchKey = new Pair(container, n);
- int box = vs.orthoCS(0, matchKey, pt[2]-.5f,
- pt[0] + (pan[0] - coords[0])*zoom - bs[0],
- pt[1] + (pan[1] - coords[1])*zoom - bs[1],
- bs[0], bs[1]);
- nodeview.place(n, vs, box);
-
- if (hook != null) hook.placed(n, vs, box);
-
- // XXX?
- //vs.activate(box);
-
- if(current.equals(n))
- cursorBox = box;
-
- if(dbg) pa("Placing: "+n+" "+coords[0]+" "+coords[1]);
- }
- }
-
-
-
-
- /** Render with culling.
+ /** Render spatial plane with culling.
* @param cullCS is the clip cs or under zero if not used.
*/
- public void renderGL(VobScene vs, int into,
+ public void render(VobScene vs, int into,
Object node, int cullCS,
- Fen fen, NodePlacementHook hook, NodeView nodeview)
+ Fen fen, NodePlacementHook hook,
+ NodeView nodeview)
{
if(dbg) pa("render GL, node: "+ node);
@@ -145,7 +84,7 @@
if (hook != null) hook.placed(n, vs, box);
// XXX?
- //vs.activate(box);
+ vs.activate(box);
if(current.equals(n))
cursorBox = box;
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.7 fenfire/up.sh:1.8
--- fenfire/up.sh:1.7 Wed Apr 23 13:04:06 2003
+++ fenfire/up.sh Mon Apr 28 07:17:16 2003
@@ -2,8 +2,7 @@
# associated with fenfire project.
# ASSUMES: .. directory to contain the parts of our project.
-#D=`pwd`
-#DIR=$D/../
+DIR=`pwd`
# cvs update
#cd $DIR
@@ -31,7 +30,7 @@
; do
if [ -d "../$dir" ]; then
echo $dir
- (cd ../$dir && cvs -z3 update -dP &)
+ (cd ../$dir && cvs -qz3 update -dP &)
sleep 1
fi
done
@@ -39,12 +38,10 @@
# make all projects
-# make all projects
-cd $DIR
-cd callgl && make; cd $DIR
-cd glmosaictext && make; cd $DIR
-cd navidoc && make java; cd $DIR
-cd storm && make clean java; cd $DIR
-cd alph && make clean java; cd $DIR
-cd libvob && make; cd $DIR
-cd fenfire && ant clean compile;
+cd $DIR/../callgl && make
+cd $DIR/../glmosaictext && make
+cd $DIR/../navidoc && make java
+cd $DIR/../storm && make clean java
+cd $DIR/../alph && make clean java
+cd $DIR/../libvob && make
+cd $DIR/../fenfire && ant clean compile