Merge pull request #1661 from gforney/master

correct near and far cliping planes when x,y,z scalings are applied
firemodels · Aug 22, 2023 · a54ba96 · a54ba96
2 parents f8b89e0 + 9447b28
commit a54ba96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/smokeview/glui_bounds.cpp b/Source/smokeview/glui_bounds.cpp
@@ -6552,6 +6552,7 @@ extern "C" void SliceBoundCB(int var){
       else{
         CHECKBOX_transparentflag->set_int_val(1);
       }
+      GLUTPOSTREDISPLAY;
       break;
     case LINE_CONTOUR_VALUE:
       if(slice_line_contour_num<1){

diff --git a/Source/smokeview/viewports.c b/Source/smokeview/viewports.c
@@ -2173,9 +2173,9 @@ void GetZoneSmokeDir(float *mm){
 float DistPtXYZ(float *pt, float x, float y, float z){
   float dx, dy, dz;
 
-  dx = pt[0] - x;
-  dy = pt[1] - y;
-  dz = pt[2] - z;
+  dx = (pt[0] - x)*mscale[0];
+  dy = (pt[1] - y)*mscale[1];
+  dz = (pt[2] - z)*mscale[2];
   return sqrt(dx*dx + dy*dy + dz*dz);
 }