moved the sutil module into examples

Felix Igelbrink · Felix Igelbrink · commit 2682400257dd · 2022-01-18T11:52:15.000+01:00
diff --git a/examples/dynamic_geometry.py b/examples/dynamic_geometry.py
@@ -6,10 +6,10 @@
 
 import glfw, imgui
 
-from optix.sutil.gui import init_ui, display_stats
-from optix.sutil.gl_display import GLDisplay
-from optix.sutil.trackball import Trackball, TrackballViewMode
-from optix.sutil.cuda_output_buffer import CudaOutputBuffer, CudaOutputBufferType, BufferImageFormat
+from sutil.gui import init_ui, display_stats
+from sutil.gl_display import GLDisplay
+from sutil.trackball import Trackball, TrackballViewMode
+from sutil.cuda_output_buffer import CudaOutputBuffer, CudaOutputBufferType, BufferImageFormat
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/examples/dynamic_materials.py b/examples/dynamic_materials.py
@@ -6,10 +6,10 @@
 
 import glfw, imgui
 
-from optix.sutil.gui import init_ui, display_text
-from optix.sutil.camera import Camera
-from optix.sutil.gl_display import GLDisplay
-from optix.sutil.cuda_output_buffer import CudaOutputBuffer, CudaOutputBufferType, BufferImageFormat
+from sutil.gui import init_ui, display_text
+from sutil.camera import Camera
+from sutil.gl_display import GLDisplay
+from sutil.cuda_output_buffer import CudaOutputBuffer, CudaOutputBufferType, BufferImageFormat
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/examples/sutil/__init__.py b/examples/sutil/__init__.py
diff --git a/examples/sutil/camera.py b/examples/sutil/camera.py
@@ -1,7 +1,8 @@
 import numpy as np
 
-from optix.sutil.vecmath import length, normalize, cross
-from optix.sutil.properties import get_member, set_float, set_float3
+from .vecmath import length, normalize, cross
+from .properties import get_member, set_float, set_float3
+
 
 class Camera:
     """Implements a perspective camera."""
diff --git a/examples/sutil/cuda_output_buffer.py b/examples/sutil/cuda_output_buffer.py
@@ -1,11 +1,11 @@
-import enum, re
+import enum
 
 import numpy as np
 import cupy as cp
 
 import OpenGL.GL as gl
 
-from optix.sutil.vecmath import vtype_to_dtype
+from .vecmath import vtype_to_dtype
 
 
 class BufferImageFormat(enum.Enum):
diff --git a/examples/sutil/gl_display.py b/examples/sutil/gl_display.py
@@ -4,7 +4,7 @@
 import OpenGL.GL as gl
 import OpenGL.GL.shaders
 
-from optix.sutil.cuda_output_buffer import BufferImageFormat
+from .cuda_output_buffer import BufferImageFormat
 
 class GLDisplay:
     vert_source = \
@@ -49,6 +49,7 @@ class GLDisplay:
             '_quad_vertex_buffer', '_image_format']
 
     def __init__(self, image_format):
+        print(image_format, type(image_format), isinstance(BufferImageFormat.UCHAR4, BufferImageFormat))
         assert isinstance(image_format, BufferImageFormat)
 
         vertex_array = gl.glGenVertexArrays(1)
diff --git a/examples/sutil/gui.py b/examples/sutil/gui.py
@@ -5,6 +5,7 @@
 import imgui
 from imgui.integrations.glfw import GlfwRenderer
 
+
 def static_vars(**kwargs):
     """
     Attach a static variables local to decorated function.
diff --git a/examples/sutil/properties.py b/examples/sutil/properties.py
diff --git a/examples/sutil/trackball.py b/examples/sutil/trackball.py
@@ -2,9 +2,9 @@
 
 import numpy as np
 
-from optix.sutil.properties import get_member, set_bool, set_float, set_float3
-from optix.sutil.vecmath import dot, length, normalize
-from optix.sutil.camera import Camera
+from .properties import get_member, set_bool, set_float, set_float3
+from .vecmath import dot, length, normalize
+from .camera import Camera
 
 class TrackballViewMode(enum.Enum):
     EyeFixed = 0
diff --git a/examples/sutil/vecmath.py b/examples/sutil/vecmath.py
diff --git a/setup.py b/setup.py
@@ -3,6 +3,7 @@
 import re
 from pathlib import Path
 
+
 # standalone import of a module (https://stackoverflow.com/a/58423785)
 def import_module_from_path(path):
     """Import a module from the given path without executing any code above it
