X-Git-Url: https://harrygodden.com/git/?p=csRadar.git;a=blobdiff_plain;f=csrDraw.h;fp=csrDraw.h;h=18580477ff78ca93ec965e8cef981b22e52e9a44;hp=fff159094fd7b12bec3dac8e97ca4964eac95583;hb=7033ae666b8bd2998864670d08108efa177ad8f4;hpb=0ee9d77f45e007b119de2d44feef81516aaddaaf

diff --git a/csrDraw.h b/csrDraw.h
index fff1590..1858047 100644
--- a/csrDraw.h
+++ b/csrDraw.h
@@ -46,8 +46,10 @@ void csr_vmf_render( csr_target *rt, vmf_map *map, vdf_node *root, csr_filter *f
 
 
 void csr_rt_save_tga( csr_target *rt, const char *path, u32 offset, u32 nc );
+void csr_rt_save_c32f( csr_target *rt, const char *path, u32 offset );
 
 // Obsolete
+__attribute__ ((deprecated))
 void csr_rt_save_buffers( csr_target *rt, const char *basename, const char *subname );
 
 // Implementation
@@ -530,6 +532,29 @@ void csr_rt_save_buffers( csr_target *rt, const char *basename, const char *subn
 	free( image );
 }
 
+// ALWAYS RGB32
+void csr_rt_save_c32f( csr_target *rt, const char *path, u32 offset )
+{
+	float *image = (float *)csr_malloc( rt->x*rt->y*3*sizeof(float) );
+	
+	float contrib = 255.f/(float)rt->num_samples;
+	
+	for( int i = 0; i < rt->x*rt->y; i ++ )
+	{
+		void *src = rt->colour + offset + i * rt->num_samples * rt->shader->stride;
+		float *dst = image + i*3;
+		
+		v3_zero( dst );
+		for( int k = 0; k < rt->num_samples; k ++ )
+		{
+			v3_muladds( dst, (float *)(src + k*rt->shader->stride), contrib, dst );
+		}
+	}
+	
+	csr_32f_write( path, rt->x, rt->y, image );
+	free( image );
+}
+
 // Save floating point buffer to tga. Must be in range (0-1)
 // Offset and stride are in bytes
 void csr_rt_save_tga( csr_target *rt, const char *path, u32 offset, u32 nc )
@@ -538,33 +563,28 @@ void csr_rt_save_tga( csr_target *rt, const char *path, u32 offset, u32 nc )
 	
 	float contrib = 255.f/(float)rt->num_samples;
 	
-	for( int y = 0; y < rt->y; y ++ )
+	for( int i = 0; i < rt->x*rt->y; i ++ )
 	{
-		for( int x = 0; x < rt->x; x ++ )
+		void *src = rt->colour + offset + i * rt->num_samples * rt->shader->stride;
+		u8 *dst = image + i*4;
+		
+		v4f accum = { 0.f, 0.f, 0.f, 0.f };
+		
+		for( int k = 0; k < rt->num_samples; k ++ )
 		{
-			u32 pixel_index = (y*rt->x + x);
+			float *src_sample = (float *)(src + k*rt->shader->stride);
 		
-			void *src = rt->colour + offset + pixel_index * rt->num_samples * rt->shader->stride;
-			u8 *dst = image + pixel_index*4;
-			
-			v4f accum = { 0.f, 0.f, 0.f, 0.f };
-			
-			for( int k = 0; k < rt->num_samples; k ++ )
+			for( int j = 0; j < nc; j ++ )
 			{
-				float *src_sample = (float *)(src + k*rt->shader->stride);
-			
-				for( int j = 0; j < nc; j ++ )
-				{
-					accum[ j ] += src_sample[ j ] * contrib;
-				}
+				accum[ j ] += src_sample[ j ] * contrib;
 			}
-			
-			// TODO: Clamp this value
-			dst[0] = accum[0];
-			dst[1] = accum[1];
-			dst[2] = accum[2];
-			dst[3] = accum[3];
 		}
+		
+		// TODO: Clamp this value
+		dst[0] = accum[0];
+		dst[1] = accum[1];
+		dst[2] = accum[2];
+		dst[3] = accum[3];
 	}
 	
 	csr_tga_write( path, rt->x, rt->y, nc, image );