[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./build.xml org/fenfire/modules/pp/PPCa...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire ./build.xml org/fenfire/modules/pp/PPCa... |
|
Date: |
Wed, 09 Apr 2003 07:49:06 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/09 07:49:06
Modified files:
. : build.xml
org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java
Pp.java SinglePaper.java
UniquePaperVob.java
Log message:
work work work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.26 fenfire/build.xml:1.27
--- fenfire/build.xml:1.26 Wed Apr 2 03:47:09 2003
+++ fenfire/build.xml Wed Apr 9 07:49:05 2003
@@ -72,6 +72,14 @@
<classpath refid="theClassPath"/>
</java>
</target>
+ <target name="run-gl">
+ <java classname="org.fenfire.loom.Loom" fork="true">
+ <sysproperty key="vob.api" value="gl"/>
+ <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
+ <arg value="${file}"/>
+ <classpath refid="theClassPath"/>
+ </java>
+ </target>
<target name="pp">
<java classname="org.fenfire.modules.pp.Pp" fork="true">
@@ -79,16 +87,15 @@
<classpath refid="theClassPath"/>
</java>
</target>
-
-
- <target name="run-gl">
- <java classname="org.fenfire.loom.Loom" fork="true">
+ <target name="pp-gl">
+ <java classname="org.fenfire.modules.pp.Pp" fork="true">
<sysproperty key="vob.api" value="gl"/>
<env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
<arg value="${file}"/>
<classpath refid="theClassPath"/>
</java>
</target>
+
<target name="rundemo">
<java classname="org.python.util.jython" fork="true"
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.8
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.9
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.8 Tue Apr 8
20:56:51 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Wed Apr 9 07:49:05 2003
@@ -23,7 +23,7 @@
/** XXX
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.8 2003/04/09
00:56:51 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.9 2003/04/09
11:49:05 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -158,12 +158,17 @@
int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
setZoomPan(vs, into);
- // XXX SinglePaper.i(space, d, window, current).render(vs, into,
c2fCS, c2fCSInv, hook);
+ SinglePaper.i(space, node, window).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);
- vs.map.put(new UniquePaperVob(node.toString()), into, geometry);
+ RDFNode paper = node;
+ if (ShortRDF.isNodeType(space.getModel(), node, PP.noteType)) {
+ paper = ShortRDF.getSubj(space.getModel(), node, PP.contains);
+ }
+
+ vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
(new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry,
node,
nodeview, space.getModel(),hook);
}
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.8
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.9
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.8 Tue Apr 8
20:56:51 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Wed Apr 9 07:49:06 2003
@@ -21,7 +21,7 @@
import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.8 2003/04/09
00:56:51 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.9 2003/04/09
11:49:06 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
@@ -108,8 +108,13 @@
} else {
int zo = (int)(buoyZoom * 100000);
int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1,
pan[0], pan[1]);
+
+ RDFNode paper = node;
+ if (ShortRDF.isNodeType(space.getModel(), node, PP.noteType)) {
+ paper = ShortRDF.getSubj(space.getModel(), node, PP.contains);
+ }
- vs.map.put(new UniquePaperVob(node.toString()), into, geometry);
+ vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
(new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry,
node,
nodeview, space.getModel(),null);
}
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.7
fenfire/org/fenfire/modules/pp/Pp.java:1.8
--- fenfire/org/fenfire/modules/pp/Pp.java:1.7 Tue Apr 8 20:56:51 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Wed Apr 9 07:49:06 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.7 2003/04/09 00:56:51
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.8 2003/04/09 11:49:06
mudyc Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -55,7 +55,6 @@
new Enfilade1DImpl.Enfilade1DImplMaker()),
new ModelMem());
ppAct = new PPActionsImpl(space);
- nodeview = new DefaultNodeView(space);
String paper = ppAct.newPaper();
String n1 = ppAct.newNote(paper, 0,10, "A test note");
@@ -94,6 +93,8 @@
AbstractUpdateManager.addWindow(scr);
scr.window.setLocation(0, 0, 1024, 768);
+
+ nodeview = new DefaultNodeView(space);
adaptor.nodes = new NodeBuoyViewNodeType[]{
new PPCanvasNode(space, scr.window, nodeview)};
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.1
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.2
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.1 Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java Wed Apr 9 07:49:06 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.1 2003/03/31
12:37:47 mudyc Exp $";
+private static final String rcsid = "$Id: SinglePaper.java,v 1.2 2003/04/09
11:49:06 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SinglePaper:"+s); }
@@ -95,6 +95,8 @@
void render(final VobScene vs, final int frameCS, final int panZoom,
final int inversePanZoom,
NodePlacementHook hook) {
+ pa("foo");
+
final NodePlacementHook hook_final = hook;
// don't want to move this away from here..
@@ -120,8 +122,10 @@
// frame2screen and paper2screen
final BgVob bg = BgVob.create(node, window);
+ pa("bar");
final IrregularFrame irregu =
IrregularFrame.create(-16000,-16000,16000,16000,
irreguBorder,
irreguRipple, 2);
+ pa("bar");
final int frameUnit = vs.unitSqCS(frameCS, "USQ");
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.5
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.6
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.5 Tue Apr 8
20:56:51 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java Wed Apr 9 07:49:06 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.5 2003/04/09
00:56:51 mudyc Exp $";
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.6 2003/04/09
11:49:06 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("UniquePaperVob::"+s); }
@@ -52,22 +52,46 @@
// Make SEEPRA! ;)
float k = rand.nextFloat() * 2 -1;
+ float j = (float)Math.cos(k - Math.PI/2);
+
float ratio = rand.nextFloat();
Color c1 = getUniqColor();
Color c2 = getUniqColor();
- float a =(float) Math.PI * rand.nextFloat();
+ float a=0;
+ for (boolean again=true; again;) {
+ try {
+ a =(float) Math.PI * rand.nextFloat();
+ Math.tan(a);
+ again = false;
+ } catch (ArithmeticException e) { again = true; }
+ }
if (a > Math.PI/4 && a <= Math.PI *3f/4) {
// verticals..
- float begin_x = mx - mw * 2 + (panx%mw)/zoom;
- if (panx < 0) begin_x = mx - mw * 2 - (-panx%mw)/zoom;
- begin_x += (pany/zoom)/Math.tan(a);
+ float linew = mw/(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) {
+ f += Math.abs( ((ratio * linew)/j)*zoom );
+ f += Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+
+ // << if too near
+ while( f > mx-2*mw ) {
+ f -= Math.abs( ((ratio * linew)/j)*zoom );
+ f -= Math.abs( (((1-ratio) * linew)/j)*zoom );
+ }
+
+ // add y component
+ begin_x = f + (pany/zoom)/(float)Math.tan(a);
+
boolean black = true;
- float end_x = mx+mw + Math.abs(mh/(float)Math.tan(a));
- float linew = mw/(rand.nextInt()%5 + 3);
+ 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];
@@ -80,9 +104,9 @@
x[1] = (int)( begin_x + mh/Math.tan(a) );
y[1] = my;
if (black)
- begin_x += Math.abs(zoom* ratio * linew);
+ begin_x += Math.abs(zoom* (ratio * linew)/j);
else
- begin_x += Math.abs(zoom* (1-ratio) * linew);
+ begin_x += Math.abs(zoom* ((1-ratio) * linew)/j);
black = !black;
x[2] = (int)( begin_x + mh/Math.tan(a));
@@ -121,7 +145,7 @@
private Color getUniqColor() {
float brigh = .8f;
- return Color.getHSBColor(rand.nextFloat(), .4f +
(rand.nextFloat()*2-1)/8, brigh);
+ return Color.getHSBColor(rand.nextFloat(), .7f +
(rand.nextFloat()*2-1)/8, brigh);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire ./build.xml org/fenfire/modules/pp/PPCa...,
Matti Katila <=