[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob include/vob/vobs/Fillet.hxx vob/fillet/l...
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] libvob include/vob/vobs/Fillet.hxx vob/fillet/l... |
Date: |
Fri, 27 Jun 2003 03:55:56 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Branch:
Changes by: Janne V. Kujala <address@hidden> 03/06/27 03:55:56
Modified files:
include/vob/vobs: Fillet.hxx
vob/fillet : light3d.py
Log message:
geom fix
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Fillet.hxx.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/fillet/light3d.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: libvob/include/vob/vobs/Fillet.hxx
diff -u libvob/include/vob/vobs/Fillet.hxx:1.28
libvob/include/vob/vobs/Fillet.hxx:1.29
--- libvob/include/vob/vobs/Fillet.hxx:1.28 Thu Jun 26 06:56:58 2003
+++ libvob/include/vob/vobs/Fillet.hxx Fri Jun 27 03:55:56 2003
@@ -557,7 +557,7 @@
int i;
vector<Vec> v;
- for (i = 0; i < ndice; i++)
+ for (i = 0; i < ndice - 1; i++)
v.push_back(f1.point(i / (ndice - 1.0)));
for (i = 0; i < ndice; i++)
v.push_back(f0.point(i / (ndice - 1.0)));
Index: libvob/vob/fillet/light3d.py
diff -u libvob/vob/fillet/light3d.py:1.1 libvob/vob/fillet/light3d.py:1.2
--- libvob/vob/fillet/light3d.py:1.1 Thu Jun 26 09:14:11 2003
+++ libvob/vob/fillet/light3d.py Fri Jun 27 03:55:56 2003
@@ -35,6 +35,9 @@
col.rgb = lighting.y * diffusemat + lighting.z * specularmat
+ diffuse2 * diffusemat2;
+ // Fog
+ // float t = 8*mul(glstate.matrix.mvp, pos).z;
+ // col.rgb = col.rgb * (1 - t) + float3(1,.5,.2) * t;
col.a = 1;
}
- [Gzz-commits] libvob include/vob/vobs/Fillet.hxx vob/fillet/l...,
Janne V. Kujala <=