From: hgn Date: Sat, 17 Jul 2021 08:43:26 +0000 (+0100) Subject: c32f saving revision X-Git-Url: https://harrygodden.com/git/?p=csRadar.git;a=commitdiff_plain;h=7033ae666b8bd2998864670d08108efa177ad8f4 c32f saving revision --- diff --git a/csRadar.c b/csRadar.c index f79fa3b..955a790 100644 --- a/csRadar.c +++ b/csRadar.c @@ -120,13 +120,11 @@ int main( int argc, char *argv[] ) "Options:\n" " -g Required if you are loading models\n" " -r 1024 Output resolution\n" - " -o Specify output name/path\n" + " -o Specify output name/path (no extension, dir must exist)\n" " -e Same as default arg, but instead filters for entity class\n" - //" -s Add a vertical split at this height\n" " --padding=128 When cropping radar, add padding units to border\n" - //" --standard-layers Use standard TAR layers/groups\n" " --no-txt Don't create matching radar txt\n" - " --multi-sample=RGSS [ none, 2x, rgss, 8r ]\n" + " --multi-sample=rgss [ none, 2x, rgss, 8r ]\n" " --extension=TAR Use an extension binary instead\n" " --min=z Miniumum height to render\n" " --max=z Maxiumum height to render\n" 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 ); diff --git a/ext_csr_substance.c b/ext_csr_substance.c index 4dd2627..17184d5 100644 --- a/ext_csr_substance.c +++ b/ext_csr_substance.c @@ -55,6 +55,22 @@ void csr_ext_exit( csr_api *api ) csr_rt_free( &api->target ); } +void save_layers( csr_api *api, const char *layer ) +{ + char output[512]; + strcpy( output, api->output_path ); + strcat( output, "_" ); + strcat( output, layer ); + + char *ext = output + strlen( output ); + + strcpy( ext, ".pfm" ); + csr_rt_save_c32f( &api->target, output, 0 ); + + strcpy( ext, ".tga" ); + csr_rt_save_tga( &api->target, output, 3*sizeof(float), 4 ); +} + void draw_buffers( csr_api *api, int bounds_only ) { csr_filter filter = { .compute_bounds_only = bounds_only }; @@ -67,8 +83,7 @@ void draw_buffers( csr_api *api, int bounds_only ) if( !bounds_only ) { - csr_rt_save_buffers( &api->target, api->output_path, "all" ); - csr_rt_save_tga( &api->target, "test_test_test.tga", 3*sizeof(float), 4 ); + save_layers( api, "all" ); } } else @@ -82,13 +97,7 @@ void draw_buffers( csr_api *api, int bounds_only ) if( !bounds_only ) { - csr_rt_save_buffers( &api->target, api->output_path, api->strings[i].str ); - //csr_rt_save_c32f( ... ); - //csr_rt_save_tga( ... ); - - // tar_write_dds( ... ); - csr_rt_save_tga( &api->target, "test_test_test.tga", 3*sizeof(float), 4 ); - + save_layers( api, api->strings[i].str ); csr_rt_clear( &api->target ); } }