[ff-cvs] libvob/vob demo/multifil/randgraph.py fillet/li...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/08/25 01:22:50

Modified files:
        vob/demo/multifil: randgraph.py 
        vob/fillet     : light3d.py 
        vob/usertest   : fillet1.py 

Log message:
        exper twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/randgraph.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/fillet/light3d.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/usertest/fillet1.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/vob/demo/multifil/randgraph.py
diff -u libvob/vob/demo/multifil/randgraph.py:1.29 
libvob/vob/demo/multifil/randgraph.py:1.30
--- libvob/vob/demo/multifil/randgraph.py:1.29  Tue Aug 19 11:14:35 2003
+++ libvob/vob/demo/multifil/randgraph.py       Mon Aug 25 01:22:50 2003
@@ -139,6 +139,13 @@
             nodes1 = filter(lambda y: y != x and y["cs"] not in x["conns"],
                             nodes)
 
+            if 1:
+                if self.path2:
+                    nodes2 = filter(lambda y: y["cs"] in x["conns"], nodes)
+                else:
+                    nodes2 = nodes1
+                break
+
             if self.path2:
                 nodes2 = filter(lambda y: p2(x, y), nodes1)
             else:
Index: libvob/vob/fillet/light3d.py
diff -u libvob/vob/fillet/light3d.py:1.39 libvob/vob/fillet/light3d.py:1.40
--- libvob/vob/fillet/light3d.py:1.39   Thu Aug 21 08:20:15 2003
+++ libvob/vob/fillet/light3d.py        Mon Aug 25 01:22:50 2003
@@ -215,9 +215,15 @@
 TEX R1, R1.xyxx, TEX0, RECT;
 DP4R R2.w, R1, {1.5258789e-05, 0.00390625, 1, 0};
 
+#ADDR R3, R2.xyzw, R2.yxwz;
+#MADR R3, -0.5, R3, R0.x;
+#ADDR R3, |R3.x|, |R3.z|;
+#MULR R3, R3, 100;
+
 ADDR R2, R2, -R0.x;
 MAXR R1.xy, |R2.xyxx|, |R2.wzxx|;
 MAXR R1.x, R1.x, R1.y;
+#MAXR R1.x, R1.x, R3.x;#########
 SGTR H0.x, R1.x, {0.0020000001}.x;
 MOVR o[COLR].xyz, {0, 0, 0}.xyzx;
 MOVR o[COLR].w, H0.x;
Index: libvob/vob/usertest/fillet1.py
diff -u libvob/vob/usertest/fillet1.py:1.3 libvob/vob/usertest/fillet1.py:1.4
--- libvob/vob/usertest/fillet1.py:1.3  Thu Aug 21 10:20:28 2003
+++ libvob/vob/usertest/fillet1.py      Mon Aug 25 01:22:50 2003
@@ -51,6 +51,7 @@
     sc.box = 1100
     sc.blend3d = 1
     sc.drawInside = 0
+    #sc.depthColor = 0
 
     vs0 = getvs()
     vs0.put(background((.5,1,.2)))
@@ -58,7 +59,7 @@
     graphs = []
     for i in range(0,6):
         for path2 in (0,1):
-            for N in (24,48,96):#(9,15,21):
+            for N in (6,18,30):#(24,48,96):#(9,15,21):
                 graphs.append( (r.nextInt(), r.nextInt(), path2, N) )
 
     trials = []
@@ -78,6 +79,12 @@
         #sc.fillets = r.nextBoolean()
 
         sc.seed, sc.seed2, sc.path2, sc.N, sc.fillets = trials.pop()
+
+        if sc.fillets:
+            sc.rot = (0,0,1,0)
+        else:
+            sc.rot = (0,0,0,1)
+        
 
         vs1 = getvs()
         sc.scene(vs1)