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.

1 files changed, 3 insertions, 13 deletions

diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index 44aedf5392a..158977cef5a 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -57,10 +57,8 @@ typedef struct ShadeResult
 typedef struct PixStr
 {
 	struct PixStr *next;
-	int vlak0, vlak;
-	unsigned int z;
-	unsigned int mask;
-	short aantal, ronde;
+	int facenr, z;
+	unsigned short mask, amount;
 } PixStr;
 
 /* ------------------------------------------------------------------------- */
@@ -104,7 +102,7 @@ void zbufshadeDA(void);	/* Delta Accum Pixel Struct */
 /**
  * Also called in: zbuf.c
  */
-void *shadepixel(float x, float y, int vlaknr, int mask, float *col);
+void *shadepixel(float x, float y, int z, int facenr, int mask, float *col);
 
 /**
  * A cryptic but very efficient way of counting the number of bits that 
@@ -112,13 +110,5 @@ void *shadepixel(float x, float y, int vlaknr, int mask, float *col);
  */
 int count_mask(unsigned short mask);
 
-/* These defines are only used internally :) */
-/* dirty hack: pointers are negative, indices positive */
-/* pointers should be converted to positive numbers */
-	
-#define IS_A_POINTER_CODE(a)		((a)<0)
-#define POINTER_FROM_CODE(a)		((void *)(-(a)))
-#define POINTER_TO_CODE(a)			(-(long)(a))
-
 #endif /* RENDER_EXT_H */