Skip to content

by default draw isosurfaces as a shaded surface (no outlines), fix boundary file loading logic when some of the boundary files do not exist #2539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gforney merged 2 commits into from
Jan 30, 2026
+8 −11
Merged

by default draw isosurfaces as a shaded surface (no outlines), fix boundary file loading logic when some of the boundary files do not exist #2539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0bb043
smokeview source: hide isosurface outlines by default
gforney Jan 29, 2026
a0dd636
smokeview source: fix logic when loading boundary files when some of …
gforney Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/for_bundle/smokeview.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ SHOWTRACERSALWAYS
SHOWTRANSPARENT
0
SHOWTRIANGLES
1 1 0 0 1 1 1
1 0 0 0 1 1 1
SHOWTRANSPARENTVENTS
1
SHOWTRIANGLECOUNT
Expand Down
15 changes: 6 additions & 9 deletions Source/smokeview/glui_bounds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,9 +2178,9 @@ extern "C" void GLUIPartBoundsCPP_CB(int var){
}
}

/* ------------------ HavePatchData ------------------------ */
/* ------------------ HaveAnyPatchData ------------------------ */

int HavePatchData(void){
int HaveAnyPatchData(void){
int i;

for(i = 0; i<global_scase.npatchinfo; i++){
Expand All @@ -2193,10 +2193,10 @@ int HavePatchData(void){
case PATCH_STRUCTURED_NODE_CENTER:
case PATCH_STRUCTURED_CELL_CENTER:
meshi = global_scase.meshescoll.meshinfo+patchi->blocknumber;
if(meshi->patchval==NULL||meshi->cpatchval==NULL)return 0;
if(meshi->patchval!=NULL||meshi->cpatchval!=NULL)return 1;
break;
case PATCH_GEOMETRY_BOUNDARY:
if(patchi->geom_vals==NULL)return 0;
if(patchi->geom_vals!=NULL)return 1;
break;
case PATCH_GEOMETRY_SLICE:
break;
Expand All @@ -2205,7 +2205,7 @@ int HavePatchData(void){
break;
}
}
return 1;
return 0;
}

/* ------------------ patch callback: GLUIPatchBoundsCPP_CB ------------------------ */
Expand Down Expand Up @@ -2252,7 +2252,7 @@ extern "C" void GLUIPatchBoundsCPP_CB(int var){
break;
case BOUND_DONTUPDATE_COLORS:
case BOUND_UPDATE_COLORS:
if(HavePatchData()==1){
if(HaveAnyPatchData()==1){
SetLoadedPatchBounds(NULL, 0);
if(var==BOUND_DONTUPDATE_COLORS){
UpdateAllBoundaryColors(0);
Expand All @@ -2261,9 +2261,6 @@ extern "C" void GLUIPatchBoundsCPP_CB(int var){
UpdateAllBoundaryColors(1);
}
}
else{
GLUIPatchBoundsCPP_CB(BOUND_RELOAD_DATA);
}
break;
case BOUND_RELOAD_DATA:
SetLoadedPatchBounds(NULL, 0);
Expand Down
2 changes: 1 addition & 1 deletion Source/smokeview/smokeviewvars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ SVEXTERN int SVDECL(show_boundary_outline, 0);
SVEXTERN int SVDECL(show_boundary_points, 0);

SVEXTERN int SVDECL(show_iso_shaded,1);
SVEXTERN int SVDECL(show_iso_outline,1);
SVEXTERN int SVDECL(show_iso_outline,0);
SVEXTERN int SVDECL(show_iso_points,0);

SVEXTERN int SVDECL(show_faces_shaded, 1);
Expand Down