X-Git-Url: https://harrygodden.com/git/?p=csRadar.git;a=blobdiff_plain;f=csrDraw.h;h=a3f601e722575d887b965ccd1865f4f64f86ac8d;hp=fff159094fd7b12bec3dac8e97ca4964eac95583;hb=HEAD;hpb=0ee9d77f45e007b119de2d44feef81516aaddaaf

diff --git a/csrDraw.h b/csrDraw.h
index fff1590..a3f601e 100644
--- a/csrDraw.h
+++ b/csrDraw.h
@@ -44,11 +44,9 @@ void csr_draw( csr_target *rt, vmf_vert *triangles, u32 triangle_count, m4x3f tr
 // Filter is optional, it can be st to NULL to just render everything.
 void csr_vmf_render( csr_target *rt, vmf_map *map, vdf_node *root, csr_filter *filter, m4x3f prev, m4x3f inst );
 
-
 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
-void csr_rt_save_buffers( csr_target *rt, const char *basename, const char *subname );
 
 // Implementation
 //=======================================================================================================================
@@ -231,22 +229,6 @@ void csr_auto_fit( csr_target *rt, float padding )
 	csr_update_subsamples( rt );
 }
 
-void csr_write_txt( char const *path, const char *name, csr_target *rt  )
-{
-	FILE *write_ptr;
-	
-	write_ptr = fopen( path, "w" );
-	
-	fprintf( write_ptr, "\"%s\"\n\{\n", name );
-	fprintf( write_ptr, "\t\"material\" \"overviews/%s\"\n", name );
-	fprintf( write_ptr, "\t\"pos_x\" \"%.8f\"\n", rt->bounds[0][0] );
-	fprintf( write_ptr, "\t\"pos_y\" \"%.8f\"\n", rt->bounds[0][1] );
-	fprintf( write_ptr, "\t\"scale\" \"%.8f\"\n", rt->scale / (float)rt->x );
-	fprintf( write_ptr, "}\n" );
-	
-	fclose( write_ptr );
-}
-
 void simple_raster( csr_target *rt, vmf_vert tri[3] )
 {
 	// Very very simplified rasterizing algorithm
@@ -495,38 +477,56 @@ void csr_vmf_render( csr_target *rt, vmf_map *map, vdf_node *root, csr_filter *f
 	solidgen_ctx_free( &solid );
 }
 
-// Obsolete
-void csr_rt_save_buffers( csr_target *rt, const char *basename, const char *subname )
+void csr_write_filerr( const char *path )
+{
+	log_error( "File write error (No such file or directory): '%s'\n", path );
+}
+
+void csr_write_txt( char const *path, const char *name, csr_target *rt  )
 {
-	char output[ 512 ];
+	FILE *write_ptr;
 	
-	float *image = (float *)csr_malloc( 1024*1024*sizeof(float)*3 );
+	write_ptr = fopen( path, "w" );
+	
+	if( write_ptr )
+	{
+		fprintf( write_ptr, "\"%s\"\n\{\n", name );
+		fprintf( write_ptr, "\t\"material\" \"overviews/%s\"\n", name );
+		fprintf( write_ptr, "\t\"pos_x\" \"%.8f\"\n", rt->bounds[0][0] );
+		fprintf( write_ptr, "\t\"pos_y\" \"%.8f\"\n", rt->bounds[0][1] );
+		fprintf( write_ptr, "\t\"scale\" \"%.8f\"\n", rt->scale / (float)rt->x );
+		fprintf( write_ptr, "}\n" );
+		
+		fclose( write_ptr );
+	}
+	else
+	{
+		csr_write_filerr( path );
+	}
+}
+
+// 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 = 1.f/(float)rt->num_samples;
 	
-	for( int l = 0; l < rt->x; l ++ )
+	for( int i = 0; i < rt->x*rt->y; i ++ )
 	{
-		for( int x = 0; x < rt->y; x ++ )
+		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 ++ )
 		{
-			float *dst = &image[ (l*1024+x)*3 ];
-			void *src = rt->colour + ((1023-l)*1024+x) * rt->num_samples * rt->shader->stride;
-			
-			v3_muls( (float *)src, contrib, dst );
-			
-			for( int j = 1; j < rt->num_samples; j ++ )
-			{
-				v3_muladds( dst, (float *)(src + j*rt->shader->stride), contrib, dst );
-			}
+			v3_muladds( dst, (float *)(src + k*rt->shader->stride), contrib, dst );
 		}
 	}
 	
-	// Save position buffer
-	strcpy( output, basename );
-	strcat( output, "." );
-	strcat( output, subname );
-	strcat( output, "_position.pfm" );
-	csr_32f_write( output, rt->x, rt->y, image );	
-	
+	if( !csr_32f_write( path, rt->x, rt->y, image ) )
+		csr_write_filerr( path );
+		
 	free( image );
 }
 
@@ -538,36 +538,33 @@ 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 );
+	if( !csr_tga_write( path, rt->x, rt->y, nc, image ) )
+		csr_write_filerr( path );
+		
 	free( image );
 }