shithub: cstory

Info  •  Files  •  Log  •  Branches

Software renderer cleanup

--- a/src/Backends/Rendering/Software.cpp

+++ b/src/Backends/Rendering/Software.cpp

@@ -23,7 +23,7 @@

 typedef struct Backend_Glyph

 {

-	void *pixels;

+	float *pixels;

 	unsigned int width;

 	unsigned int height;

 } Backend_Glyph;

@@ -304,7 +304,7 @@

 	if (glyph == NULL)

 		return NULL;

-	glyph->pixels = malloc(width * height * sizeof(float));

+	glyph->pixels = (float*)malloc(width * height * sizeof(float));

 	if (glyph->pixels == NULL)

 	{

@@ -312,11 +312,11 @@

 		return NULL;

 	}

-	float *destination_pointer = (float*)glyph->pixels;

+	float *destination_pointer = glyph->pixels;

 	for (unsigned int y = 0; y < height; ++y)

 	{

-		const unsigned char *source_pointer = pixels + y * pitch;

+		const unsigned char *source_pointer = &pixels[y * pitch];

 		for (unsigned int x = 0; x < width; ++x)

 			*destination_pointer++ = *source_pointer++ / 255.0f;

@@ -356,9 +356,9 @@

 	{

 		for (unsigned int ix = MAX(-x, 0); x + ix < MIN(x + glyph->width, glyph_destination_surface->width); ++ix)

 		{

-			const float alpha = ((float*)glyph->pixels)[iy * glyph->width + ix];

+			const float alpha = glyph->pixels[iy * glyph->width + ix];

-			if (alpha)

+			if (alpha != 0.0f)

 			{

 				unsigned char *bitmap_pixel = glyph_destination_surface->pixels + (y + iy) * glyph_destination_surface->pitch + (x + ix) * 3;

-- 

⑨