radar txt

diff --git a/csRadar.c b/csRadar.c
index 955a7902dd649885e77add47786045b7af6142cb..e3b5209a350dd48dad8fb199d5c58ed2849a931b 100644 (file)
--- a/csRadar.c
+++ b/csRadar.c
@@ -193,6 +193,13 @@ int main( int argc, char *argv[] )
                                        csr_ext_main( &api );
                                        
                                        // Do other
+                                       if( api.write_txt )
+                                       {
+                                               char radar_path[512];
+                                               strcpy( radar_path, api.output_path );
+                                               strcat( radar_path, ".txt" );
+                                               csr_write_txt( radar_path, api.vmf_name, &api.target );
+                                       }
                                        
                                        csr_ext_exit( &api );
                                }

diff --git a/csrDraw.h b/csrDraw.h
index 18580477ff78ca93ec965e8cef981b22e52e9a44..6bcd6e5ac3975734ef00ddef35cec2ffd6965566 100644 (file)
--- a/csrDraw.h
+++ b/csrDraw.h
@@ -44,13 +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
-__attribute__ ((deprecated))
-void csr_rt_save_buffers( csr_target *rt, const char *basename, const char *subname );
 
 // Implementation
 //=======================================================================================================================
@@ -233,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
@@ -497,39 +477,32 @@ 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 )
 {
-       char output[ 512 ];
-       
-       float *image = (float *)csr_malloc( 1024*1024*sizeof(float)*3 );
+       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  )
+{
+       FILE *write_ptr;
        
-       float contrib = 1.f/(float)rt->num_samples;
+       write_ptr = fopen( path, "w" );
        
-       for( int l = 0; l < rt->x; l ++ )
+       if( write_ptr )
        {
-               for( int x = 0; x < rt->y; x ++ )
-               {
-                       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 );
-                       }
-               }
+               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 );
        }
-       
-       // Save position buffer
-       strcpy( output, basename );
-       strcat( output, "." );
-       strcat( output, subname );
-       strcat( output, "_position.pfm" );
-       csr_32f_write( output, rt->x, rt->y, image );   
-       
-       free( image );
 }
 
 // ALWAYS RGB32
@@ -551,7 +524,9 @@ void csr_rt_save_c32f( csr_target *rt, const char *path, u32 offset )
                }
        }
        
-       csr_32f_write( path, rt->x, rt->y, image );
+       if( !csr_32f_write( path, rt->x, rt->y, image ) )
+               csr_write_filerr( path );
+               
        free( image );
 }
 
@@ -587,7 +562,9 @@ void csr_rt_save_tga( csr_target *rt, const char *path, u32 offset, u32 nc )
                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 );
 }