[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/demo/hierarch.py gfx/libcoords/Coords.c...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz gfx/demo/hierarch.py gfx/libcoords/Coords.c... |
Date: |
Thu, 26 Sep 2002 07:01:50 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/26 07:01:47
Modified files:
gfx/demo : hierarch.py
gfx/libcoords : Coords.cxx
gzz/gfx/gl : GLVobCoorder.java
gzz/vob : DefaultVobMatcher.java
Log message:
Interp doesn't work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/hierarch.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/DefaultVobMatcher.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/hierarch.py
diff -c gzz/gfx/demo/hierarch.py:1.1 gzz/gfx/demo/hierarch.py:1.2
*** gzz/gfx/demo/hierarch.py:1.1 Thu Sep 26 06:02:52 2002
--- gzz/gfx/demo/hierarch.py Thu Sep 26 07:01:47 2002
***************
*** 1,7 ****
class HierarchScene:
def __init__(self):
! self.angles = [0, 60]
def key(self, key):
if key == 'a':
rotatelist(self.angles)
--- 1,7 ----
class HierarchScene:
def __init__(self):
! self.angles = [0, 60, 180, 270]
def key(self, key):
if key == 'a':
rotatelist(self.angles)
***************
*** 9,18 ****
--- 9,36 ----
vs.map.put(background((0.3, 0.4, 0.1)))
angle = self.angles[0]
+ print angle
cs0 = vs.coords.coordsys(0, 10, 400, 400, 100, 100)
cs1 = vs.coords.rotateXY(cs0, angle)
+ cs2 = vs.coords.coordsys(cs1, 10, 400, 400, 100, 100)
+ cs02 = vs.coords.coordsys(cs0, -5, 0.5, 0.5, 4, 4)
+
+ vs.matcher.add(cs0, "0")
+ vs.matcher.add(cs1, "1")
+ vs.matcher.add(cs2, "2")
+ vs.matcher.add(cs02, "02")
+ # vs.matcher.addSub(cs0, cs1, "1")
+ # vs.matcher.addSub(cs1, cs2, "2")
+ # vs.matcher.addSub(cs0, cs02, "3")
+
+ vs.map.put(coloredQuad((0.1,0.1,0.1)), cs0)
vs.map.put(coloredQuad((1,0.1,0.1)), cs1)
+ vs.map.put(coloredQuad((1,1,0.1)), cs2)
+
+ vs.map.put(coloredQuad((1,1,0.6)), cs02 )
+
+
currentScene = HierarchScene()
Index: gzz/gfx/libcoords/Coords.cxx
diff -c gzz/gfx/libcoords/Coords.cxx:1.8 gzz/gfx/libcoords/Coords.cxx:1.9
*** gzz/gfx/libcoords/Coords.cxx:1.8 Thu Sep 26 06:02:52 2002
--- gzz/gfx/libcoords/Coords.cxx Thu Sep 26 07:01:47 2002
***************
*** 194,201 ****
continue; // If parent's not interpolating, neither are we.
}
int ind1 = inds1[i+2];
! int csind2 = (interpinds ? interpinds[i/3] : -1);
! DBG(dbg) << "inds: "<<parind<<" "<<tp<<" "<<npars<<" "<<parent<<"
"<<parentcs<<" "<<ind1<<" "<<csind2<<"\n";
if(csind2 <= 0) {
if(show1) {
for(int j = 0; j<npars; j++) {
--- 194,203 ----
continue; // If parent's not interpolating, neither are we.
}
int ind1 = inds1[i+2];
! int csind2 = ((interpinds && i/3 < interpinds[0]) ? interpinds[i/3]
: -1);
! DBG(dbg) << "inds: "<<parind<<" typ:"<<tp<<" npars:"<<npars<<
! " parent:"<<parent<<" "<<parentcs<<
! " ind1:"<<ind1<<" "<<csind2<<"\n";
if(csind2 <= 0) {
if(show1) {
for(int j = 0; j<npars; j++) {
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.29
gzz/gzz/gfx/gl/GLVobCoorder.java:1.30
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.29 Thu Sep 26 05:09:53 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java Thu Sep 26 07:01:47 2002
***************
*** 29,35 ****
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.29 2002/09/26
09:09:53 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 29,35 ----
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.30 2002/09/26
11:01:47 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 75,81 ****
int paramInd = nfloats;
nfloats += 1;
! inds[ninds + 0] = 1; // rotation = 2
inds[ninds + 1] = into;
inds[ninds + 2] = paramInd;
int was = ninds / 3;
--- 75,81 ----
int paramInd = nfloats;
nfloats += 1;
! inds[ninds + 0] = 2; // rotation = 2
inds[ninds + 1] = into;
inds[ninds + 2] = paramInd;
int was = ninds / 3;
Index: gzz/gzz/vob/DefaultVobMatcher.java
diff -c gzz/gzz/vob/DefaultVobMatcher.java:1.4
gzz/gzz/vob/DefaultVobMatcher.java:1.5
*** gzz/gzz/vob/DefaultVobMatcher.java:1.4 Wed Sep 25 15:27:32 2002
--- gzz/gzz/vob/DefaultVobMatcher.java Thu Sep 26 07:01:47 2002
***************
*** 92,97 ****
--- 92,99 ----
public int[] interpList(VobMatcher other0) {
DefaultVobMatcher other = (DefaultVobMatcher)other0;
int[] interpList = new int[maxcs+1];
+ interpList[0] = maxcs+1;
+ if(dbg) pa("interplist: "+interpList[0]);
for(int i=1; i<maxcs+1; i++) {
if(keyByCs[i] == null)
interpList[i] = -1;
***************
*** 110,116 ****
--- 112,120 ----
if(dbg) pa(i+" "+k.parent+" "+other_parent+" "+
interpList[i]+" "+k.key);
}
+ if(dbg) pa(": "+interpList[i]);
}
+
return interpList;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz gfx/demo/hierarch.py gfx/libcoords/Coords.c...,
Tuomas J. Lukka <=