Merge pull request petercorke#130 from petercorke/micah-dev

micah-huth · web-flow · commit e132a291ced7 · 2020-09-04T10:23:27.000+10:00
Quick temporary fixes for 2D/3D grid updating/scaling
diff --git a/graphics/graphics_canvas.py b/graphics/graphics_canvas.py
@@ -740,7 +740,7 @@ def __init__(self, height=360, width=640, title='', caption='', grid=True):
         # Create the grid, and display if wanted
         self.__graphics_grid = GraphicsGrid(self.scene)
         # Toggle grid to 2D
-        self.__graphics_grid.toggle_2d_3d()
+        # self.__graphics_grid.toggle_2d_3d()
         # Lock the grid
         # self.__graphics_grid.set_relative(False)
         # Turn off grid if applicable
@@ -750,6 +750,7 @@ def __init__(self, height=360, width=640, title='', caption='', grid=True):
         # Reset the camera to known spot
         self.__reset_camera()
         self.__graphics_grid.update_grid()
+        self.__graphics_grid.toggle_2d_3d()
 
     #######################################
     #  Canvas Management
diff --git a/graphics/graphics_grid.py b/graphics/graphics_grid.py
@@ -303,9 +303,15 @@ def update_grid(self):
         self.camera_axes = new_camera_axes
 
         distance_from_center = mag(self.__scene.center - self.__scene.camera.pos)
-        new_scale = round(distance_from_center / 30.0, 1)
+        if self.__is_3d:
+            new_scale = round(distance_from_center / 30.0, 1)
+        else:
+            new_scale = round(distance_from_center / 15.0, 1)
         if not new_scale == self.__scale:
             self.set_scale(new_scale)
+            if not self.__is_3d:
+                self.__is_3d = True
+                self.toggle_2d_3d()
 
         # If camera is different to previous: update
         if (not new_camera_axes.equals(old_camera_axes)) or (not new_camera_pos.equals(old_camera_pos)):
diff --git a/graphics/graphics_text.py b/graphics/graphics_text.py
@@ -143,14 +143,20 @@ def update_grid_numbers(focal_point, numbers_list, num_squares, scale, is_3d, sc
     # min = -num_squares or 0, around the default position
     # max = +num_squares or 0, around the default position
     # e.g. at the origin, for negative axes: -10 -> 0, positive axes: 0 -> 10
-    min_x_coord = x_origin + int(-(num_squares / 2) + (sign(camera_axes.x) * -1) * (num_squares / 2)) * scale
-    max_x_coord = x_origin + int((num_squares / 2) + (sign(camera_axes.x) * -1) * (num_squares / 2)) * scale
+    min_x_coord = round(x_origin + (-(num_squares / 2) +
+                                    (sign(camera_axes.x) * -1) * (num_squares / 2)) * scale, 2)
+    max_x_coord = round(x_origin + ((num_squares / 2) +
+                                    (sign(camera_axes.x) * -1) * (num_squares / 2)) * scale, 2)
 
-    min_y_coord = y_origin + int(-(num_squares / 2) + (sign(camera_axes.y) * -1) * (num_squares / 2)) * scale
-    max_y_coord = y_origin + int((num_squares / 2) + (sign(camera_axes.y) * -1) * (num_squares / 2)) * scale
+    min_y_coord = round(y_origin + (-(num_squares / 2) +
+                                    (sign(camera_axes.y) * -1) * (num_squares / 2)) * scale, 2)
+    max_y_coord = round(y_origin + ((num_squares / 2) +
+                                    (sign(camera_axes.y) * -1) * (num_squares / 2)) * scale, 2)
 
-    min_z_coord = z_origin + int(-(num_squares / 2) + (sign(camera_axes.z) * -1) * (num_squares / 2)) * scale
-    max_z_coord = z_origin + int((num_squares / 2) + (sign(camera_axes.z) * -1) * (num_squares / 2)) * scale
+    min_z_coord = round(z_origin + (-(num_squares / 2) +
+                                    (sign(camera_axes.z) * -1) * (num_squares / 2)) * scale, 2)
+    max_z_coord = round(z_origin + ((num_squares / 2) +
+                                    (sign(camera_axes.z) * -1) * (num_squares / 2)) * scale, 2)
 
     x_coords = arange(min_x_coord, max_x_coord + scale, scale)
     y_coords = arange(min_y_coord, max_y_coord + scale, scale)
@@ -238,6 +244,9 @@ def update_grid_numbers(focal_point, numbers_list, num_squares, scale, is_3d, sc
         numbers_list[index].height = get_text_size(scene)
         index += 1
 
+    if not is_3d:
+        return
+
     # Z plane
     for z_pos in z_coords:
         # Draw the corresponding unit number at each x coordinate
