[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob include/vob/geom/Fillets.hxx vob/demo/mu...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] libvob include/vob/geom/Fillets.hxx vob/demo/mu... |
Date: |
Thu, 29 May 2003 12:35:16 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Tuomas J. Lukka <address@hidden> 03/05/29 12:35:16
Modified files:
include/vob/geom: Fillets.hxx
vob/demo : multifil.py
Log message:
More debugging to find problem: the projection flips to the b side
before it has hit the center -- next: fix
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/geom/Fillets.hxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: libvob/include/vob/geom/Fillets.hxx
diff -u libvob/include/vob/geom/Fillets.hxx:1.3
libvob/include/vob/geom/Fillets.hxx:1.4
--- libvob/include/vob/geom/Fillets.hxx:1.3 Thu May 29 12:14:06 2003
+++ libvob/include/vob/geom/Fillets.hxx Thu May 29 12:35:16 2003
@@ -236,16 +236,18 @@
}
ZVec res = ctr + d * resr;
if(intern) {
- if(ra > rb) {
+ if(fract > .48 && fract < .52) {
+ *intern = ctr;
+ } else if(ra > rb) {
*intern = d*resr;
*intern -= intern->dot(a.dirconn.cw90()) * a.dirconn.cw90();
- intern->z = z;
+ intern->z = z - ctr.z;
if(intern->length() <= r) *intern = ZVec(0,0,0);
*intern += ctr;
} else {
*intern = d*resr;
*intern -= intern->dot(b.dirconn.cw90()) * b.dirconn.cw90();
- intern->z = z;
+ intern->z = z - ctr.z;
if(intern->length() <= r) *intern = ZVec(0,0,0);
*intern += ctr;
}
Index: libvob/vob/demo/multifil.py
diff -u libvob/vob/demo/multifil.py:1.3 libvob/vob/demo/multifil.py:1.4
--- libvob/vob/demo/multifil.py:1.3 Thu May 29 12:14:06 2003
+++ libvob/vob/demo/multifil.py Thu May 29 12:35:16 2003
@@ -19,19 +19,25 @@
Toggle("drawEdge", 1, "Draw edge", "e"),
Toggle("drawInside", 1, "Draw inside", "i"),
Toggle("depthColor", 0, "Color from depth", "d"),
+ Toggle("lines", 0, "Toggle showing lines", "l"),
)
def scene(self, vs):
putnoc(vs, background((.5,1,.2)))
vs.put(getDListNocoords("""
+ PushAttrib POLYGON_BIT
Enable DEPTH_TEST
- LineWidth 3
- PolygonOffset 100 100
+ LineWidth 1
+ PolygonOffset 0 0
"""))
+ if self.lines:
+ vs.put(getDListNocoords("PolygonMode FRONT_AND_BACK LINE"))
+
+ dice = 20
conns = GLRen.createSortedConnections(
- GLRen.createFilletSpan1(1000, 1 + 4*self.depthColor))
+ GLRen.createFilletSpan1(dice, 1 + 4*self.depthColor))
conns_l = GLRen.createSortedConnections(
- GLRen.createFilletSpan1(1000, 2 + 4*self.depthColor))
+ GLRen.createFilletSpan1(dice, 2 + 4*self.depthColor))
size = 50
@@ -62,4 +68,8 @@
Color 0 0 0
"""))
if self.drawEdge: pc(conns_l)
+
+ vs.put(getDListNocoords("""
+ PopAttrib
+ """))
- [Gzz-commits] libvob include/vob/geom/Fillets.hxx vob/demo/mu...,
Tuomas J. Lukka <=