Merge pull request firemodels#1903 from gforney/master

fixes when open dialog box was used to select case - fix initial scene freezing, make startup files content consistent
drjfloyd · May 9, 2024 · 0b064fd · 0b064fd
2 parents a0fd700 + 915831c
commit 0b064fd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/Source/smokebot_trigger.txt b/Source/smokebot_trigger.txt
@@ -1,4 +1,4 @@
-    master: dummy text to trigger smokebot 
+     master: dummy text to trigger smokebot 
  devel:  dummy text to trigger smokebot
   devel2:  dummy text to trigger smokebot
   test: dummy text to trigger smokebot
diff --git a/Source/smokeview/callbacks.c b/Source/smokeview/callbacks.c
@@ -986,13 +986,6 @@ void MouseCB(int button, int state, int xm, int ym){
   }
 #endif
 
-  {
-    float delta_time;
-
-    delta_time = glutGet(GLUT_ELAPSED_TIME)/1000.0 - timer_reshape;
-    if(delta_time<DELTA_TIME)return;
-  }
-
   if(autofreeze_volsmoke==ON&&nvolsmoke_loaded>0){
     if(state==GLUT_DOWN)GLUIUpdateFreeze(ON);
     if(state==GLUT_UP)GLUIUpdateFreeze(OFF);
@@ -1455,12 +1448,6 @@ void MouseDragCB(int xm, int ym){
     ym *= 2;
   }
 #endif
-  {
-    float delta_time;
-
-    delta_time = glutGet(GLUT_ELAPSED_TIME)/1000.0 - timer_reshape;
-    if(delta_time<DELTA_TIME)return;
-  }
 
   in_external=0;
 #ifdef pp_GPUTHROTTLE
@@ -3643,7 +3630,6 @@ void SetScreenSize(int *width, int *height){
 /* ------------------ ReshapeCB ------------------------ */
 
 void ReshapeCB(int width, int height){
-  START_TIMER(timer_reshape);
   if(disable_reshape==1)return;
   updatemenu=1;
   if(update_reshape==0){

diff --git a/Source/smokeview/main.c b/Source/smokeview/main.c
@@ -269,6 +269,23 @@ char *ProcessCommandLine(CommandlineArgs *args) {
       NewMemory((void **)&filename_local, (unsigned int)filelength);
       OpenSMVFile(filename_local, filelength, &openfile);
       if(openfile == 1 && ResizeMemory((void **)&filename_local, strlen(filename_local) + 1) != 0){
+        char *dirlast = NULL, *caselast = NULL;
+
+        FREEMEMORY(smokeview_casedir);
+        FREEMEMORY(fdsprefix);
+        NewMemory((void **)&smokeview_casedir, strlen(filename_local) + 1);
+        NewMemory((void **)&fdsprefix, strlen(filename_local) + 1);
+        strcpy(smokeview_casedir, filename_local);
+        dirlast = strrchr(smokeview_casedir, '\\');
+        if(dirlast != NULL){
+          strcpy(filename_local, dirlast + 1);
+          strcpy(fdsprefix, filename_local);
+          caselast = strrchr(fdsprefix, '.');
+          if(caselast != NULL)caselast[0] = 0;
+          dirlast[1] = 0;
+          len_casename = strlen(filename_local);
+        }
+        CHDIR(smokeview_casedir);
       }
       else{
         FREEMEMORY(filename_local);

diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h
@@ -431,7 +431,6 @@ SVEXTERN int SVDECL(update_times,0);
 SVEXTERN int SVDECL(show_geom_bndf, 0),SVDECL(glui_show_geom_bndf, 0);
 SVEXTERN int SVDECL(update_windrose, 0);
 SVEXTERN int SVDECL(update_use_lighting, 0), SVDECL(use_lighting, 1);
-SVEXTERN float SVDECL(timer_reshape, 0.0);
 SVEXTERN int SVDECL(update_device, 0);
 
 SVEXTERN cellmeshdata SVDECL(*cellmeshinfo, NULL);