Skip to content

revert commit b59528c, add some initializations #2218

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 3 commits into from
Mar 11, 2025
Merged

revert commit b59528c, add some initializations #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f1513e
smokeview source: add some face initializations, add some debug asserts
gforney Mar 10, 2025
508aa0c
smokeview source: revert b59528c - now call UpdateTimes() in read bou…
gforney Mar 11, 2025
8cbf5b3
smokeview source: comment pp_DEBUG_OSX_CRASH directive
gforney Mar 11, 2025
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 Source/smokeview/IOboundary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,8 +1460,8 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int load_flag, int *errorcode){
}
UpdateBoundaryType();
UpdateUnitDefs();
update_times = 1;
patchi->npatches=0;
UpdateTimes();
patchi->ntimes_old=0;
patchi->ntimes=0;
updatemenu=1;
Expand Down
21 changes: 15 additions & 6 deletions Source/smokeview/drawGeometry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,14 +2865,21 @@ void UpdateFaceListsWorker(void){
nface_transparent_double += n_transparent_double;
nface_outlines += n_outlines;

meshi->nface_normals_single_DOWN_X = 0;
meshi->nface_normals_single_UP_X = 0;
meshi->nface_normals_single_DOWN_Y = 0;
meshi->nface_normals_single_UP_Y = 0;
meshi->nface_normals_single_DOWN_Z = 0;
meshi->nface_normals_single_UP_Z = 0;
meshi->face_normals_single_DOWN_X = NULL;
meshi->face_normals_single_UP_X = NULL;
meshi->face_normals_single_DOWN_Y = NULL;
meshi->face_normals_single_UP_Y = NULL;
meshi->face_normals_single_DOWN_Z = NULL;
meshi->face_normals_single_UP_Z = NULL;

if(blockage_draw_option != 1)continue;

meshi->nface_normals_single_DOWN_X=0;
meshi->nface_normals_single_UP_X=0;
meshi->nface_normals_single_DOWN_Y=0;
meshi->nface_normals_single_UP_Y=0;
meshi->nface_normals_single_DOWN_Z=0;
meshi->nface_normals_single_UP_Z=0;
if(n_normals_single>0){
int iface;
int istartD=-1,istartU=-1;
Expand Down Expand Up @@ -3041,6 +3048,8 @@ void DrawSelectFaces(){
culldata *cullport;\
facedata *facei;\
float *vertices;\
assert(i>=0&&i<meshi->nface_normals_single);\
assert(face_START!=NULL);\
facei = face_START[i];\
cullport=facei->cullport;\
if(cullport!=NULL&&cullport->vis==0)continue;\
Expand Down
2 changes: 1 addition & 1 deletion Source/smokeview/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define pp_THREAD // turn on multi-threading
//#define pp_SMOKE_THREAD // use multi-threading for merging smoke
//#define pp_BOUNDING_BOX // draw bounding box when mouse is pressed and option selected
#define pp_DEBUG_OSX_CRASH // debug print to test crash on mac
//#define pp_DEBUG_OSX_CRASH // debug print to test crash on mac

#ifdef pp_FRAME // turn on each frame type if pp_FRAME is set
#define pp_BOUNDFRAME // turn on frame code for boundary files
Expand Down