Merge pull request #2090 from gforney/master

make new face drawing routine the default
firemodels · Nov 7, 2024 · 3605b3f · 3605b3f
2 parents 44a480c + 57b0343
commit 3605b3f
Show file tree

Hide file tree

Showing 7 changed files with 316 additions and 311 deletions.
diff --git a/Source/smokeview/IOpart.c b/Source/smokeview/IOpart.c
@@ -261,26 +261,20 @@ void DrawPart(const partdata *parti, int mode){
 
             if(datacopy->partclassbase->vis_type == PART_POINTS){
               if(select_part == 1 && selected_part_index > 0 && mode == DRAWSCENE){
-#ifdef pp_PART_SHOW
                 float *rvals=NULL;
 
                 if(itype>=0)rvals = datacopy->rvals + itype*datacopy->npoints_file;
-#endif
                 for(j = 0; j < datacopy->npoints_file; j += partdrawskip){
                   if(vis[j] == 1 && datacopy->tags[j]==selected_part_index){
                     char taglabel[64];
 
 
-#ifdef pp_PART_SHOW
                     if(itype >= 0){
                       sprintf(taglabel, "%i: %f", selected_part_index, rvals[j]);
                     }
                     else{
                       sprintf(taglabel, "%i", selected_part_index);
                     }
-#else
-                    sprintf(taglabel, "%i", selected_part_index);
-#endif
                     Output3Text(foregroundcolor, xpos[j], ypos[j], zpos[j], taglabel);
                   }
                 }