snappy 3.1.1__cp311-cp311-macosx_11_0_arm64.whl → 3.2__cp311-cp311-macosx_11_0_arm64.whl

snappy/raytracing/inside_viewer.py

@@ -9,7 +9,9 @@ from .view_scale_controller import ViewScaleController
 from .raytracing_view import *
 from .geodesics_window import GeodesicsWindow
 from .hyperboloid_utilities import unit_3_vector_and_distance_to_O13_hyperbolic_translation
+from .tooltip import ToolTip
 from .zoom_slider import Slider, ZoomSlider
+from .eyeball import eyeball_type_none, eyeball_type_paper_plane, eyeball_type_eyeball
 
 try:
     from math import gcd as _gcd
@@ -51,6 +53,9 @@ class InsideViewer(ttk.Frame):
             self.notebook.add(self.create_cohomology_class_frame(self),
                               text='Cohomology class')
 
+        self.notebook.add(self.create_eyeball_frame(self),
+                          text='Camera')
+
         self.notebook.add(self.create_cusps_frame(self),
                           text='Cusps/Geodesics')
 
@@ -85,10 +90,11 @@ class InsideViewer(ttk.Frame):
             self.view_scale_slider,
             self.view_scale_label,
             self.view_scale_value_label,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
 
-        self.widget.report_time_callback = FpsLabelUpdater(
+        self.widget.fps_label_updater = FpsLabelUpdater(
             self.fps_label)
+        self.widget.report_time_callback = self.widget.fps_label_updater
 
         self.update_volume_label()
 
@@ -182,17 +188,20 @@ class InsideViewer(ttk.Frame):
 
         cusp_area_maximum = 1.05 * _maximal_cusp_area(self.widget.manifold)
 
+        self.cusp_scales = []
+
         for i in range(self.widget.manifold.num_cusps()):
-            UniformDictController.create_horizontal_scale(
-                frame,
-                uniform_dict=self.widget.ui_parameter_dict,
-                key='cuspAreas',
-                title='Cusp %d' % i,
-                left_end=0.0,
-                right_end=cusp_area_maximum,
-                row=row,
-                update_function=self.widget.recompute_raytracing_data_and_redraw,
-                index=i)
+            self.cusp_scales.append(
+                UniformDictController.create_horizontal_scale(
+                    frame,
+                    uniform_dict=self.widget.ui_parameter_dict,
+                    key='cuspAreas',
+                    title='Cusp %d' % i,
+                    left_end=0.0,
+                    right_end=cusp_area_maximum,
+                    row=row,
+                    update_function=self.widget.recompute_raytracing_data_and_redraw,
+                    index=i))
             cusp_button = ttk.Button(
                 frame,
                 text='View',
@@ -200,39 +209,19 @@ class InsideViewer(ttk.Frame):
                 command=(
                     lambda which_cusp=i:
                         self.set_camera_cusp_view(which_cusp)))
+            ToolTip(cusp_button,
+                    msg="Move camera into cusp neighborhood and look out")
             cusp_button.grid(row=row, column=3)
             row += 1
 
         frame.rowconfigure(row, weight=1)
 
-        view_frame = ttk.Frame(frame)
-        view_frame.grid(row=row, column=1)
-
-        view_label = ttk.Label(view_frame, text="View:")
-        view_label.grid(row=0, column=0)
-
-        radio_buttons = []
-        for i, text in enumerate(["Material", "Ideal", "Hyperideal"]):
-            button = ttk.Radiobutton(view_frame,
-                                     value=i,
-                                     text=text,
-                                     takefocus=0)
-            button.grid(row=0, column=i + 1)
-            radio_buttons.append(button)
-
-        self.perspective_type_controller = UniformDictController(
-            self.widget.ui_uniform_dict,
-            key='perspectiveType',
-            radio_buttons=radio_buttons,
-            update_function=self.perspective_type_changed)
-
         self.geodesics_button = ttk.Button(
             frame,
             text="Geodesics ...",
             takefocus=0,
             command=self.show_geodesics_window)
         self.geodesics_button.grid(row=row, column=3)
-
         row += 1
 
         self.geodesics_status_label = ttk.Label(frame, text="")
@@ -242,24 +231,29 @@ class InsideViewer(ttk.Frame):
 
     def perspective_type_changed(self):
         self.view_scale_controller.update()
-        self.widget.redraw_if_initialized()
+        self.widget.draw()
+
+    def set_perspective_type_and_view_scale(self, perspective_type, view_scale):
+        self.widget.ui_uniform_dict['perspectiveType'][1] = perspective_type
+        self.widget.ui_uniform_dict['viewScale'][1] = float(view_scale)
+        self.perspective_type_controller.update()
+        self.perspective_type_changed()
 
     def set_camera_cusp_view(self, which_cusp):
+        if self.widget.ui_parameter_dict['cuspAreas'][1][which_cusp] < 0.05:
+            self.widget.ui_parameter_dict['cuspAreas'][1][which_cusp] = 0.05
+            self.widget.recompute_raytracing_data_and_redraw()
+            self.cusp_scales[which_cusp].update()
+
         self.widget.view_state, view_scale = (
             self.widget.raytracing_data.cusp_view_state_and_scale(
                 which_cusp))
 
         extra_scale = 1.1
-
-        self.widget.ui_uniform_dict['perspectiveType'][1] = 1
-        self.widget.ui_uniform_dict['viewScale'][1] = float(
-            extra_scale * view_scale)
-
-        self.perspective_type_controller.update()
-        self.perspective_type_changed()
+        self.set_perspective_type_and_view_scale(1, extra_scale * view_scale)
 
     def checkbox_update(self):
-        self.widget.redraw_if_initialized()
+        self.widget.draw()
         self.focus_viewer()
 
     def create_fillings_frame(self, parent):
@@ -320,15 +314,134 @@ class InsideViewer(ttk.Frame):
         orb_button = ttk.Button(
             subframe, text="Make orbifold", takefocus=0,
             command=self.make_orbifold)
+        ToolTip(orb_button,
+                msg="Make filling coefficients integers")
         orb_button.grid(row=0, column=2)
 
         mfd_button = ttk.Button(
             subframe, text="Make manifold", takefocus=0,
             command=self.make_manifold)
+        ToolTip(mfd_button,
+                msg="Make filling coefficients co-prime integers")
         mfd_button.grid(row=0, column=3)
 
         return frame
 
+    def create_eyeball_frame(self, parent):
+        frame = ttk.Frame(parent)
+
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(4, weight=1)
+
+        row = 0
+
+        view_label = ttk.Label(frame, text="View")
+        view_label.grid(row=row, column=0)
+
+        radio_buttons = []
+        for i, text, tooltip in [
+                (0,
+                 "Material",
+                 "Camera rays leave from the same point"),
+                (1,
+                 "Ideal",
+                 "Camera rays leave orthogonally from a horosphere"),
+                (2,
+                 "Hyperideal",
+                 "Camera rays leave orthogonally from a (hyperbolic) plane")]:
+            button = ttk.Radiobutton(frame,
+                                     value=i,
+                                     text=text,
+                                     takefocus=0)
+            button.grid(row=row, column=i + 1, padx=8, sticky=tkinter.NW)
+            ToolTip(button, msg=tooltip)
+            radio_buttons.append(button)
+
+        self.perspective_type_controller = UniformDictController(
+            self.widget.ui_uniform_dict,
+            key='perspectiveType',
+            radio_buttons=radio_buttons,
+            update_function=self.perspective_type_changed)
+
+        row += 1
+
+        self_type_label = ttk.Label(frame, text="Camera body")
+        self_type_label.grid(row=row, column=0)
+
+        ToolTip(self_type_label,
+                msg="Shows your position and orientation in the manifold")
+        
+        radio_buttons = []
+        for i, (eyeball_type, text, tooltip) in enumerate([
+                (eyeball_type_none,
+                 "None",
+                 ""),
+                (eyeball_type_paper_plane,
+                 "Paper plane",
+                 "Paper plane shows your position and orientation in the manifold"),
+                (eyeball_type_eyeball,
+                 "Eyeball",
+                 "Eyeball shows your position and orientation in the manifold")]):
+            button = ttk.Radiobutton(frame,
+                                     value=eyeball_type,
+                                     text=text,
+                                     takefocus=0)
+            button.grid(row=row, column=1 + i, padx=8, sticky=tkinter.NW)
+            if tooltip:
+                ToolTip(button, msg=tooltip)
+            radio_buttons.append(button)
+        self.self_type_controller = UniformDictController(
+            self.widget.ui_parameter_dict,
+            key='eyeballType',
+            radio_buttons=radio_buttons,
+            update_function=self.widget.update_shader_and_redraw)
+
+        row += 1
+
+        UniformDictController.create_horizontal_scale(
+            frame,
+            self.widget.ui_parameter_dict,
+            key='eyeballSize',
+            title='Camera body size',
+            row=row,
+            columnspan=4,
+            left_end=0.0,
+            right_end=1.5,
+            update_function=self.widget.update_shader_and_redraw,
+            format_string='%.3f')
+        row += 1
+
+        misc_frame = ttk.Frame(frame)
+        misc_frame.grid(row=row, column=1, columnspan=3)
+
+        freeze_checkbox = UniformDictController.create_checkbox(
+            misc_frame,
+            self.widget.ui_parameter_dict,
+            key='freezeEyeball',
+            text='Freeze camera body',
+            row=row,
+            column=0,
+            update_function=self.widget.draw,
+            gridargs = {'padx' : 8}).checkbox
+        ToolTip(freeze_checkbox,
+                msg=("Keep paper plane/eyeball at the same position "
+                     "and attitude even when you are moving through the "
+                     "manifold"))
+
+        UniformDictController.create_checkbox(
+            misc_frame,
+            self.widget.ui_uniform_dict,
+            key='crosshairs',
+            text='Crosshairs',
+            row=row,
+            column=1,
+            update_function=self.widget.draw,
+            gridargs = {'padx' : 8})
+
+        row += 1
+
+        return frame
+
     def create_skeleton_frame(self, parent):
         frame = ttk.Frame(parent)
 
@@ -338,16 +451,18 @@ class InsideViewer(ttk.Frame):
 
         row = 0
 
-        UniformDictController.create_horizontal_scale(
+        scale = UniformDictController.create_horizontal_scale(
             frame,
-            self.widget.ui_uniform_dict,
+            self.widget.ui_parameter_dict,
             key='edgeThickness',
             title='Face boundary thickness',
             row=row,
             left_end=0.0,
-            right_end=0.35,
-            update_function=self.widget.redraw_if_initialized,
-            format_string='%.3f')
+            right_end=0.65,
+            update_function=self.widget.draw,
+            format_string='%.3f').scale
+        ToolTip(scale,
+                msg=("Partially show faces of the tetrahedra."))
         row += 1
 
         self.insphereScaleController = (
@@ -360,7 +475,7 @@ class InsideViewer(ttk.Frame):
                 left_end=0.0,
                 right_end=1.25,
                 update_function=self.widget.recompute_raytracing_data_and_redraw,
-                format_string='%.2f'))
+                format_string='%.3f'))
         row += 1
 
         self.edgeTubeRadiusController = (
@@ -372,7 +487,8 @@ class InsideViewer(ttk.Frame):
                 row=row,
                 left_end=0.0,
                 right_end=0.2,
-                update_function=self.widget.redraw_if_initialized))
+                update_function=self.widget.draw,
+                format_string='%.3f'))
         row += 1
 
         label = ttk.Label(frame, text="Edge colors", padding=gui_utilities.label_pad)
@@ -384,7 +500,7 @@ class InsideViewer(ttk.Frame):
             text='desaturate',
             row=row,
             column=1,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
         row += 1
 
         return frame
@@ -404,8 +520,8 @@ class InsideViewer(ttk.Frame):
             title='Max Steps',
             row=row,
             left_end=1,
-            right_end=100,
-            update_function=self.widget.redraw_if_initialized)
+            right_end=150,
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
@@ -416,7 +532,7 @@ class InsideViewer(ttk.Frame):
             row=row,
             left_end=1.0,
             right_end=28.0,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
@@ -427,7 +543,20 @@ class InsideViewer(ttk.Frame):
             row=row,
             left_end=1.0,
             right_end=4.25,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
+        row += 1
+
+        misc_frame = ttk.Frame(frame)
+        misc_frame.grid(row=row, column=1, columnspan=3)
+
+        self.fps_box_var = tkinter.BooleanVar()
+        self.fps_box_var.set(False)
+        fps_box = ttk.Checkbutton(misc_frame, takefocus=0)
+        fps_box.grid(row=0, column=0)
+        fps_box.configure(
+            variable = self.fps_box_var,
+            text='Show fps',
+            command=self.show_fps)
 
         return frame
 
@@ -449,7 +578,7 @@ class InsideViewer(ttk.Frame):
                 row=row,
                 left_end=0.0,
                 right_end=0.25,
-                update_function=self.widget.redraw_if_initialized,
+                update_function=self.widget.draw,
                 format_string='%.3f')
             row += 1
 
@@ -461,7 +590,7 @@ class InsideViewer(ttk.Frame):
             row=row,
             left_end=0.3,
             right_end=4.0,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
@@ -472,7 +601,7 @@ class InsideViewer(ttk.Frame):
             row=row,
             left_end=0.1,
             right_end=2.0,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
@@ -483,7 +612,7 @@ class InsideViewer(ttk.Frame):
             row=row,
             left_end=0.3,
             right_end=3.0,
-            update_function=self.widget.redraw_if_initialized)
+            update_function=self.widget.draw)
 
         return frame
 
@@ -654,7 +783,7 @@ class InsideViewer(ttk.Frame):
         self.widget.manifold.dehn_fill(
             self.filling_dict['fillings'][1])
 
-        self.widget.recompute_raytracing_data_and_redraw()
+        self.widget.recompute_raytracing_data_update_shader_and_redraw()
         self.update_volume_label()
         self.reset_geodesics()
 
@@ -664,7 +793,7 @@ class InsideViewer(ttk.Frame):
     def recompute_hyperbolic_structure(self):
         self.widget.manifold.init_hyperbolic_structure(
             force_recompute=True)
-        self.widget.recompute_raytracing_data_and_redraw()
+        self.widget.recompute_raytracing_data_update_shader_and_redraw()
 
         # Should we reset the view state since it might
         # be corrupted?
@@ -715,6 +844,10 @@ class InsideViewer(ttk.Frame):
     def build_menus(self):
         pass
 
+    def show_fps(self):
+        self.widget.fps_label_updater.set_visible(
+            self.fps_box_var.get())
+
     def test(self):
         X = 100
         self.widget.event_generate('<Button-1>', x=X, y=300, warp=True)
@@ -778,7 +911,7 @@ def _maximal_cusp_area(mfd):
 
 def _mouse_gestures_text():
     if sys.platform == 'darwin':
-        return u"Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: \u2318-Click & Drag"
+        return "Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: \u2318-Click & Drag"
     else:
         return "Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: Alt-Click & Drag"
 
@@ -790,9 +923,9 @@ _translate_key_labels = {
 }
 
 _rotate_key_labels = {
-    'QWERTY': u"Keys: \u2190\u2191\u2192\u2193xz",
-    'AZERTY': u"Keys: \u2190\u2191\u2192\u2193xw",
-    'QWERTZ': u"Keys: \u2190\u2191\u2192\u2193xy"
+    'QWERTY': "Keys: \u2190\u2191\u2192\u2193xz",
+    'AZERTY': "Keys: \u2190\u2191\u2192\u2193xw",
+    'QWERTZ': "Keys: \u2190\u2191\u2192\u2193xy"
 }
 
 ###############################################################################
@@ -829,7 +962,7 @@ class PerfTest:
         self.widget.view_state = self.widget.raytracing_data.update_view_state(
             self.widget.view_state, self.m)
 
-        self.widget.redraw_if_initialized()
+        self.widget.draw()
         self.widget.after(250, self.redraw)
 
 

snappy/raytracing/pack.py

@@ -0,0 +1,22 @@
+def pack_tet_data(prefix, tets_to_data):
+    result = {}
+
+    offset = 0
+    offsets = [ offset ]
+
+    for data in tets_to_data:
+        for datum in data:
+            if result:
+                for k, (t, v) in datum.items():
+                    result[prefix + k][1].append(v)
+            else:
+                for k, (t, v) in datum.items():
+                    result[prefix + k] = (t + '[]', [ v ])
+        offset += len(data)
+        offsets.append(offset)
+
+    result[prefix + 'Offsets'] = ('int[]', offsets)
+
+    return result, offset
+
+                

snappy/raytracing/raytracing_data.py

@@ -1,13 +1,17 @@
 from snappy.snap import t3mlite as t3m
 from snappy.snap.mcomplex_base import *
-from snappy.SnapPy import matrix
 
 from .hyperboloid_utilities import *
 
+from ..matrix import make_matrix
+
 __all__ = ['RaytracingData']
 
 
 class RaytracingData(McomplexEngine):
+    def is_valid(self):
+        return True
+
     def add_weights(self, weights):
         for tet in self.mcomplex.Tetrahedra:
             tet.Weights = {
@@ -79,36 +83,44 @@ class RaytracingData(McomplexEngine):
         d[b'##num_edges##'] = len(self.mcomplex.Edges)
         return d
 
-    def update_view_state(self, boost_tet_num_and_weight,
-                          m=matrix([[1.0, 0.0, 0.0, 0.0],
-                                      [0.0, 1.0, 0.0, 0.0],
-                                      [0.0, 0.0, 1.0, 0.0],
-                                      [0.0, 0.0, 0.0, 1.0]])):
+    def update_view_state(self,
+                          boost_tet_num_and_weight,
+                          m=make_matrix([[1.0, 0.0, 0.0, 0.0],
+                                         [0.0, 1.0, 0.0, 0.0],
+                                         [0.0, 0.0, 1.0, 0.0],
+                                         [0.0, 0.0, 0.0, 1.0]])):
         boost, tet_num, weight = boost_tet_num_and_weight
 
-        boost = matrix(boost, ring=self.RF)
-        m = matrix(m, ring=self.RF)
+        boost = make_matrix(boost, ring=self.RF)
+        m     = make_matrix(m,     ring=self.RF)
+
+        boost, tet, weight = _graph_trace(
+            boost * m, self.mcomplex.Tetrahedra[tet_num], weight)
+
+        return boost, tet.Index, weight
+
+def _graph_trace(boost, tet, weight):
+
+    boost = O13_orthonormalise(boost)
 
-        boost = O13_orthonormalize(boost * m)
+    entry_face = 0
 
-        entry_F = -1
+    for i in range(100):
+        pos = boost.transpose()[0]
 
-        for i in range(100):
-            pos = boost.transpose()[0]
-            tet = self.mcomplex.Tetrahedra[tet_num]
+        signed_dist, face = max(
+            [ (r13_dot(pos, tet.R13_planes[face]), face)
+              for face in t3m.TwoSubsimplices ])
 
-            amount, F = max(
-                [ (r13_dot(pos, tet.R13_planes[F]), F)
-                  for F in t3m.TwoSubsimplices ])
+        if face == entry_face:
+            break
+        if signed_dist < 0.0000001:
+            break
 
-            if F == entry_F:
-                break
-            if amount < 0.0000001:
-                break
+        boost      = O13_orthonormalise(tet.O13_matrices[face] * boost)
+        weight    += tet.Weights[face]
+        entry_face = tet.Gluing[face].image(face)
+        tet        = tet.Neighbor[face]
 
-            boost = O13_orthonormalize(tet.O13_matrices[F] * boost)
-            tet_num = tet.Neighbor[F].Index
-            entry_F = tet.Gluing[F].image(F)
-            weight += tet.Weights[F]
+    return boost, tet, weight
 
-        return boost, tet_num, weight