[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java modules/pp/PPV...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java modules/pp/PPV... |
|
Date: |
Sat, 08 Feb 2003 05:19:21 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 03/02/08 05:19:20
Modified files:
gzz/gfx/gl : GLVobCoorder.java
gzz/modules/pp : PPView2.java demotest.py
gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java
SinglePaper.java
gzz/view : CoordinatePlaneView.java
gzz/view/buoy : AbstractAnimationNode.java
Log message:
small changes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/SinglePaper.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CoordinatePlaneView.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/AbstractAnimationNode.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -u gzz/gzz/gfx/gl/GLVobCoorder.java:1.67
gzz/gzz/gfx/gl/GLVobCoorder.java:1.68
--- gzz/gzz/gfx/gl/GLVobCoorder.java:1.67 Thu Feb 6 06:53:14 2003
+++ gzz/gzz/gfx/gl/GLVobCoorder.java Sat Feb 8 05:19:20 2003
@@ -31,14 +31,14 @@
import gzz.client.gl.*;
public final class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.67 2003/02/06
11:53:14 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.68 2003/02/08
10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
- float[] floats = new float[10000];
+ float[] floats = new float[10000*2];
int nfloats = 0;
- int[] inds = new int[5000];
+ int[] inds = new int[5000*2];
int ninds = 1; // zero is special (the root)
public void activate(int cs) {
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.65
gzz/gzz/modules/pp/PPView2.java:1.66
--- gzz/gzz/modules/pp/PPView2.java:1.65 Fri Feb 7 03:27:40 2003
+++ gzz/gzz/modules/pp/PPView2.java Sat Feb 8 05:19:20 2003
@@ -36,7 +36,7 @@
import java.util.*;
public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.65 2003/02/07
08:27:40 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.66 2003/02/08
10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -62,6 +62,7 @@
/** The width of the main view.
*/
public float mainWidth = 660;
+ //public float mainWidth = 480;
/** The width of the left edge panel.
*/
@@ -83,6 +84,7 @@
/** The height of the main view.
*/
public float mainHeight = 660;
+ //public float mainHeight = 480;
/** The Y position of the main view.
*/
@@ -95,6 +97,7 @@
/** Buoy viewport geometry.
*/
public float buoyVPWidth = 400, buoyVPHeight = 400;
+ //public float buoyVPWidth = 300, buoyVPHeight = 300;
/** Link buoy viewport geometry.
*/
@@ -379,6 +382,7 @@
TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
CellView cellview = new ImageCell(new PPCellView(style,
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
+ // "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
// public so can be replaced from jython
public Vob filletState = GLCache.getCallList(
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.72 gzz/gzz/modules/pp/demotest.py:1.73
--- gzz/gzz/modules/pp/demotest.py:1.72 Fri Feb 7 03:25:10 2003
+++ gzz/gzz/modules/pp/demotest.py Sat Feb 8 05:19:20 2003
@@ -50,7 +50,7 @@
slicer = SingleSlicer("foo")
usingNormalBindings = 0
-ownUse = 0
+ownUse = 1
if ownUse:
PPDIR=os.getcwd()+'/pp/'
@@ -78,6 +78,7 @@
class PPView2Scene:
def __init__(self):
w.setLocation(0,0,1024,768)
+ #w.setLocation(0,0,800,600)
return_data()
if firstTime:
clean_data('full')
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.5
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.6
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.5 Fri Feb 7 15:27:48 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java Sat Feb 8 05:19:20 2003
@@ -40,7 +40,7 @@
/** XXX
*/
public class PPCanvasCursor extends AbstractAnimationNode {
- private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.5
2003/02/07 20:27:48 mudyc Exp $";
+ private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.6
2003/02/08 10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor:"+s); }
@@ -152,7 +152,7 @@
// cell to frame CS
int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
vs.matcher.add(frameCS, c2fCS, "C2F");
- SinglePaper.i(avc, d, window).render(vs, frameCS, c2fCS);
+ SinglePaper.i(avc, d, window, current).render(vs, frameCS, c2fCS);
hook.placed(current, vs, into, (ViewContext)avc);
}
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.7
gzz/gzz/modules/pp2/PPCanvasNode.java:1.8
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.7 Fri Feb 7 03:29:10 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java Sat Feb 8 05:19:20 2003
@@ -33,7 +33,7 @@
/** XXX
*/
public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.7 2003/02/07
08:29:10 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.8 2003/02/08
10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
@@ -86,7 +86,7 @@
vs.coords.ortho(0, 0, -pan[0]*buoyZoom, -pan[1]*buoyZoom,
buoyZoom, buoyZoom);
vs.matcher.add(into, c2fCS, "C2F");
- SinglePaper.i(avc,d,win).render(vs, into, c2fCS);
+ SinglePaper.i(avc,d,win,c).render(vs, into, c2fCS);
return into;
}
Index: gzz/gzz/modules/pp2/SinglePaper.java
diff -u gzz/gzz/modules/pp2/SinglePaper.java:1.1
gzz/gzz/modules/pp2/SinglePaper.java:1.2
--- gzz/gzz/modules/pp2/SinglePaper.java:1.1 Wed Feb 5 09:46:08 2003
+++ gzz/gzz/modules/pp2/SinglePaper.java Sat Feb 8 05:19:20 2003
@@ -1,4 +1,4 @@
-//(c): Matti Katila
+//(c): Matti Katila, Tuomas J. Lukka
package gzz.modules.pp2;
import gzz.modules.pp.*;
@@ -16,7 +16,7 @@
* the background and the vobs inside the plane.
*/
public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.1 2003/02/05
14:46:08 mudyc Exp $";
+private static final String rcsid = "$Id: SinglePaper.java,v 1.2 2003/02/08
10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SinglePaper:"+s); }
@@ -31,17 +31,22 @@
return paper;
}
- public static SinglePaper i(ViewContext vc, PPDims d, GraphicsAPI.Window
win) {
- i().set(vc,d, win);
+ /** Get instance
+ */
+ public static SinglePaper i(ViewContext vc, PPDims d, GraphicsAPI.Window
win, Cell current) {
+ i().set(vc,d, win,current);
return i();
}
- public void set(ViewContext vc, PPDims d, GraphicsAPI.Window win) {
+ /** Set the instance. This is usually made with i() method.
+ */
+ public void set(ViewContext vc, PPDims d, GraphicsAPI.Window win, Cell
current) {
this.context = vc;
((AbstractViewContext)context).setCellView(cellview);
this.d = d;
this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
this.window = win;
+ this.current = current;
}
@@ -50,7 +55,7 @@
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
private PPDims d;
private ViewContext context;
-
+ private Cell current;
@@ -112,7 +117,7 @@
final int bg2screen = vs.scaleCS(paper2screen, "BGSCA",
bgscale, bgscale);
- final Cell cursor = context.getAccursed();
+ final Cell cursor = current;
final Cell plane = cursor.h(d.contains);
// BgVob takes two coordsys:
@@ -148,7 +153,8 @@
// vs.map.put(bg, frameUnit, bg2screen);
bg.put(vs, frameUnit, bg2screen);
vs.map.put(black);
- coordinatePlaneView.render(vs, paper2screen_shifted,
context, frameCS);
+ coordinatePlaneView.render(vs, paper2screen_shifted,
+ context, frameCS, current);
}};
if(useStencil)
Index: gzz/gzz/view/CoordinatePlaneView.java
diff -u gzz/gzz/view/CoordinatePlaneView.java:1.11
gzz/gzz/view/CoordinatePlaneView.java:1.12
--- gzz/gzz/view/CoordinatePlaneView.java:1.11 Wed Feb 5 08:34:43 2003
+++ gzz/gzz/view/CoordinatePlaneView.java Sat Feb 8 05:19:20 2003
@@ -25,8 +25,7 @@
import gzz.*;
import gzz.vob.*;
import gzz.vob.vobs.*;
-import gzz.vob.*;
-import gzz.vob.vobs.*;
+import gzz.view.*;
import gzz.gfx.gl.GLVobCoorder;
@@ -37,8 +36,8 @@
*/
public class CoordinatePlaneView implements View {
-public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.11
2003/02/05 13:34:43 mudyc Exp $";
- public static boolean dbg = true;
+public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.12
2003/02/08 10:19:20 mudyc Exp $";
+ public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
private Dim d_rank;
@@ -53,6 +52,20 @@
/** Get the box into which the cursor cell was placed.
*/
public int getCursorBox() { return cursorBox; }
+
+ /** Next generation of PP doens't set accursed when drawing the paper
+ */
+ public void render(VobScene vs, int into, ViewContext context, int cullCS,
Cell accursed) {
+ // push
+ Cell temp = context.getAccursed();
+ ((AbstractViewContext)context).setAccursed(accursed);
+
+ // render
+ render(vs, into, context, cullCS);
+
+ // pop
+ ((AbstractViewContext)context).setAccursed(temp);
+ }
public void render(VobScene vs, int into, ViewContext context) {
render(vs, into, context, -1);
Index: gzz/gzz/view/buoy/AbstractAnimationNode.java
diff -u gzz/gzz/view/buoy/AbstractAnimationNode.java:1.1
gzz/gzz/view/buoy/AbstractAnimationNode.java:1.2
--- gzz/gzz/view/buoy/AbstractAnimationNode.java:1.1 Fri Feb 7 15:10:53 2003
+++ gzz/gzz/view/buoy/AbstractAnimationNode.java Sat Feb 8 05:19:20 2003
@@ -6,36 +6,39 @@
import java.awt.event.MouseEvent;
public abstract class AbstractAnimationNode implements BuoyViewMainNode {
-private static final String rcsid = "$Id: AbstractAnimationNode.java,v 1.1
2003/02/07 20:10:53 mudyc Exp $";
+private static final String rcsid = "$Id: AbstractAnimationNode.java,v 1.2
2003/02/08 10:19:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("AbstractAnimationNode:"+s); }
-
private boolean makeAnimationFromSomething = false;
-
+ private final int fromCS;
+
public AbstractAnimationNode() {
+ makeAnimationFromSomething = false;
+ this.fromCS = -1;
+ }
+
+ public AbstractAnimationNode(int fromCS) {
makeAnimationFromSomething = true;
+ this.fromCS = fromCS;
}
public void renderMain(VobScene vs, int into) {
-
- int fromXXX = 0;
-
if (makeAnimationFromSomething) {
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(into,
- fromXXX);
+ fromCS);
makeAnimationFromSomething = false;
}
}
public void keystroke(String s) {
-
+ pa("override abstract keystroke");
}
public boolean mouse(MouseEvent e, VobScene oldVobScene) {
- pa("mouse e"+e);
+ pa("override the abstract class, mouse e"+e);
return true;
}
- [Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java modules/pp/PPV...,
Matti Katila <=