shithub: tinygl

Info  •  Files  •  Log  •  Branches

Code consistency update, and bug fix

--- a/src/zline.c

+++ b/src/zline.c

@@ -3,7 +3,8 @@

 #define ZCMP(z, zpix) (!(zbdt) || z >= (zpix))

-/* TODO: Implement point size */

+/* TODO: Implement point size. */

+/* TODO: Implement blending for lines and points. */

 void ZB_plot(ZBuffer* zb, ZBufferPoint* p) {

 	GLushort* pz;

@@ -11,14 +12,14 @@

 	GLint zz;

 	GLubyte zbdw = zb->depth_write; 

 	GLubyte zbdt = zb->depth_test;

-	TGL_BLEND_VARS

+	//TGL_BLEND_VARS

 	//	PIXEL col;

 	pz = zb->zbuf + (p->y * zb->xsize + p->x);

 	pp = (PIXEL*)((GLbyte*)zb->pbuf + zb->linesize * p->y + p->x * PSZB);

 	zz = p->z >> ZB_POINT_Z_FRAC_BITS;

 	if (ZCMP(zz, *pz)) {

-		//*pp =

-		TGL_BLEND_FUNC_RGB(p->r, p->g, p->b, (*pp))

+		*pp = RGB_TO_PIXEL(p->r, p->g, p->b);

+		//TGL_BLEND_FUNC_RGB(p->r, p->g, p->b, (*pp))

 		if(zbdw)

 			*pz = zz;

 	}

--- a/src/zline.h

+++ b/src/zline.h

@@ -46,6 +46,7 @@

 #define RGBPIXEL pp[0] = r >> 16, pp[1] = g >> 16, pp[2] = b >> 16

 #else

 #define RGBPIXEL *pp = RGB_TO_PIXEL(r >> 8, g >> 8, b >> 8)

+//#define RGBPIXEL TGL_BLEND_FUNC_RGB(r>>8, g>>8, b>>8, (*pp))

 #endif

 #else /* INTERP_RGB */

 #define RGB(x)

@@ -53,6 +54,7 @@

 #define RGBPIXEL pp[0] = r, pp[1] = g, pp[2] = b

 #else

 #define RGBPIXEL *pp = color

+//#define RGBPIXEL *pp = color

 #endif

 #endif /* INTERP_RGB */