diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-01-07 17:11:00 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-01-07 17:11:00 +0300 |
| commit | 326c0a08a44f2922cf297090bf99a1ba5756eba5 (patch) | |
| tree | 6979f04fb6f0478670b69cd75240743db5f016ad /source/blender/renderconverter | |
| parent | aa3656dc452f5c3395ba507347d63613e221668f (diff) | |
Another round of cleanups for render code;
- removed ugly pointerhack from OSA render (negative indices denoted
pointers). this should solve memory errors when using >1.5 gig mem
- cleaned up usage of zbuffer values. These are signed in Blender, and
treated as unsigned all over, giving confusing code
- fixed incorrect gamma-adding for halos (caused in after xmas commit)
And bugfix #2101; wire render didn't give correct rendering for mist.
This caused by fact wires are 2D pixel lines, and not correctly filled
in faces. Retrieving the 3d coordinate while render cannot use a face-
equation then. Solved by retrieving 3D coordinate based on zbuffer value.
Still todo here: calculating correct texture coordinates for wire-edges
that are no faces.
Diffstat (limited to 'source/blender/renderconverter')
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 0108603e103..5d4498b348a 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -847,8 +847,8 @@ static void make_render_halos(Object *ob, Mesh *me, int totvert, MVert *mvert, M else hasize*= zn*zn*zn*zn; } - if(orco) har= RE_inithalo(ma, vec, 0, orco, hasize, 0, seed); - else har= RE_inithalo(ma, vec, 0, mvert->co, hasize, 0, seed); + if(orco) har= RE_inithalo(ma, vec, NULL, orco, hasize, 0.0, seed); + else har= RE_inithalo(ma, vec, NULL, mvert->co, hasize, 0.0, seed); if(har) har->lay= ob->lay; } if(orco) orco+= 3; @@ -941,7 +941,7 @@ static void render_particle_system(Object *ob, PartEff *paf) if(paf->stype==PAF_VECT) har= RE_inithalo(ma, vec, vec1, pa->co, hasize, paf->vectsize, seed); else { - har= RE_inithalo(ma, vec, 0, pa->co, hasize, 0, seed); + har= RE_inithalo(ma, vec, NULL, pa->co, hasize, 0.0, seed); if(har && ma->mode & MA_HALO_SHADE) { VecSubf(har->no, vec, vec1); Normalise(har->no); @@ -1081,7 +1081,7 @@ static void render_static_particle_system(Object *ob, PartEff *paf) if(paf->stype==PAF_VECT) har= RE_inithalo(ma, vec, vec1, pa->co, hasize, paf->vectsize, seed); else { - har= RE_inithalo(ma, vec, 0, pa->co, hasize, 0, seed); + har= RE_inithalo(ma, vec, NULL, pa->co, hasize, 0.0, seed); if(har && (ma->mode & MA_HALO_SHADE)) { VecSubf(har->no, vec, vec1); Normalise(har->no); |