shaderflow 0.4.0.dev2__py2.py3-none-any.whl → 0.5.0.dev0__py2.py3-none-any.whl

ShaderFlow/Modules/Audio.py

@@ -107,8 +107,8 @@ class BrokenAudio:
     def get_data_between_seconds(self, start: Seconds, end: Seconds) -> numpy.ndarray:
         return self.get_data_between_samples(start*self.samplerate, end*self.samplerate)
 
-    def get_last_n_samples(self, n: Samples) -> numpy.ndarray:
-        return self.data[:, -int(n):]
+    def get_last_n_samples(self, n: Samples, *, offset: Samples=0) -> numpy.ndarray:
+        return self.data[:, (-1)*(int(n+offset) + 1) : (-1)*(int(offset) + 1)]
 
     def get_last_n_seconds(self, n: Seconds) -> numpy.ndarray:
         return self.get_last_n_samples(n*self.samplerate)

ShaderFlow/Resources/Shaders/Include/Camera.glsl

@@ -77,17 +77,12 @@
     Camera CameraRay2D(Camera camera) {
 
         // Calculate the interstion with the plane define by a point and norm
+        // Note: (t < 0) the intersection is behind the camera
         // https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection
         float num = dot(camera.plane_point - camera.origin, camera.plane_normal);
         float den = dot(camera.ray, camera.plane_normal);
         float t = num/den;
 
-        // The ray intersects the plane behind the camera
-        if (t < 0) {
-            camera.out_of_bounds = true;
-            return camera;
-        }
-
         // Calculate the intersection point
         camera.gluv  = (camera.origin + (t*camera.ray)).xy;
         camera.stuv  = gluv2stuv(camera.gluv);
@@ -95,6 +90,7 @@
         camera.astuv = gluv2stuv(camera.agluv);
         camera.stxy  = (iResolution * camera.astuv);
         camera.glxy  = (camera.stxy - iResolution/2.0);
+        camera.out_of_bounds = (t < 0) || (abs(gluv.x) > iWantAspect);
         return camera;
     }
 

ShaderFlow/Scene.py

@@ -25,6 +25,7 @@ import imgui
 import moderngl
 import PIL
 import tqdm
+import turbopipe
 from attr import Factory, define, field
 from dotmap import DotMap
 from moderngl_window.context.base import BaseWindow as ModernglWindow
@@ -109,7 +110,7 @@ class ShaderScene(ShaderModule):
 
     def __post__(self):
         self.typer.description = (self.typer.description or self.__class__.__doc__)
-        self.typer._panel = "🔥 Scene Commands"
+        self.typer._panel = "🔥 Scene commands"
         self.typer.command(self.main, context=True)
         self.build()
 
@@ -118,13 +119,8 @@ class ShaderScene(ShaderModule):
         the `main` method. Must not start with `sys.executable`, so send `sys.argv[1:]` or direct"""
         self.typer(flatten(args))
 
-    __built__: OnceTracker = Factory(OnceTracker)
-
+    @OnceTracker.decorator
     def build(self):
-        if self.__built__():
-            return
-
-        # Init Imgui
         imgui.create_context()
         self.imguio = imgui.get_io()
         self.imguio.font_global_scale = 1
@@ -302,7 +298,7 @@ class ShaderScene(ShaderModule):
 
     # # Video modes and monitor
 
-    monitor: int = os.environ.get("MONITOR", 0)
+    monitor: int = os.getenv("MONITOR", 0)
 
     @property
     def glfw_monitor(self) -> Optional[glfw._GLFWmonitor]:
@@ -487,7 +483,7 @@ class ShaderScene(ShaderModule):
     # ---------------------------------------------------------------------------------------------|
     # Window, OpenGL, Backend
 
-    backend: WindowBackend = WindowBackend.get(os.environ.get("WINDOW_BACKEND", WindowBackend.GLFW))
+    backend: WindowBackend = WindowBackend.get(os.getenv("WINDOW_BACKEND", WindowBackend.GLFW))
     """The ModernGL Window Backend. **Cannot be changed after creation**. Can also be set with the
     environment variable `WINDOW_BACKEND=<backend>`, where `backend = {glfw, headless}`"""
 
@@ -510,8 +506,9 @@ class ShaderScene(ShaderModule):
             raise RuntimeError("Window backend cannot be changed after creation")
 
         # Use EGL for creating a OpenGL context, allows true headless with GPU acceleration
-        # https://forums.developer.nvidia.com/t/81412 - Comments 2 and 6
-        backend = "egl" if (os.environ.get("WINDOW_EGL", "1") == "1") else None
+        # Comments 2 and 6: (https://forums.developer.nvidia.com/t/81412)
+        # Note: For the cloud, see (https://brokensrc.dev/get/docker/)
+        backend = "egl" if (os.getenv("WINDOW_EGL", "1") == "1") else None
 
         # Dynamically import the ModernGL Window Backend and instantiate it. Vsync is on our side 😉
         module = f"moderngl_window.context.{denum(self.backend).lower()}"
@@ -549,7 +546,7 @@ class ShaderScene(ShaderModule):
             ShaderKeyboard.Keys.LEFT_CTRL  = glfw.KEY_LEFT_CONTROL
             ShaderKeyboard.Keys.LEFT_ALT   = glfw.KEY_LEFT_ALT
 
-        log.debug(f"{self.who} Finished Window creation")
+        log.info(f"OpenGL Renderer: {self.opengl.info['GL_RENDERER']}")
 
     def read_screen(self) -> bytes:
         """Take a screenshot of the screen and return raw bytes. Length `width*height*components`"""
@@ -706,10 +703,10 @@ class ShaderScene(ShaderModule):
             self.headless   = (self.rendering)
             self.fps        = (fps or self.monitor_framerate)
             self.title      = f"ShaderFlow | {self.__name__}"
-            self.fullscreen = fullscreen
             self.quality    = quality or self.quality
             self.repeat     = repeat or self.repeat
             self.ssaa       = ssaa or self.ssaa
+            self.fullscreen = fullscreen
             self.time       = 0
             self.tempo.set(tempo or self.tempo.value)
 
@@ -729,11 +726,9 @@ class ShaderScene(ShaderModule):
 
             # Configure FFmpeg and Popen it
             if (self.rendering):
-
-                # Get video output path - if not absolute, save to data directory
                 export = Path(output or f"({export_started}) {self.__name__}")
                 export = export if export.is_absolute() else (self.export_base/export)
-                export = export.with_suffix(export.suffix or f".{self.export_format}")
+                export = export.with_suffix("." + (self.export_format or export.suffix).replace(".", ""))
                 export = self.export_name(export)
 
                 self.ffmpeg = (BrokenFFmpeg(time=self.runtime).quiet()
@@ -753,7 +748,7 @@ class ShaderScene(ShaderModule):
 
                 if self.exporting:
                     buffer = self.opengl.buffer(reserve=self._final.texture.size_t)
-                    self.ffmpeg = self.ffmpeg.popen(stdin=PIPE, wrapper=True)
+                    self.ffmpeg = self.ffmpeg.popen(stdin=PIPE)
 
                 # Status tracker
                 status = DotMap(
@@ -798,17 +793,8 @@ class ShaderScene(ShaderModule):
 
                 # Write a new frame to FFmpeg
                 if self.exporting:
-                    if (_STANDARD_METHOD := False):
-                        frame = self._final.texture.fbo().read()
-                        self.ffmpeg.stdin.write(frame)
-                    elif (_BUFFER_PROXY := True):
-                        self._final.texture.fbo().read_into(buffer)
-                        self.ffmpeg.stdin.write(buffer.read())
-                    elif (_MGL_FORK_METHOD := False):
-                        self._final.texture.fbo().read_into(buffer)
-                        buffer.read_into(self.ffmpeg.stdin)
-                    else:
-                        raise RuntimeError("No read method selected")
+                    self._final.texture.fbo().read_into(buffer)
+                    turbopipe.pipe(buffer, self.ffmpeg.stdin.fileno())
 
                 # Finish exporting condition
                 if (status.bar.n < self.total_frames):
@@ -816,7 +802,8 @@ class ShaderScene(ShaderModule):
                 status.bar.close()
 
                 if self.exporting:
-                    log.info("Waiting for FFmpeg process to finish (Queue writes, codecs lookahead, etc)")
+                    log.info("Waiting for FFmpeg process to finish (Queued writes, codecs lookahead, buffers, etc)")
+                    turbopipe.close()
                     self.ffmpeg.stdin.close()
                     outputs.append(export)
 
@@ -897,6 +884,7 @@ class ShaderScene(ShaderModule):
         yield ShaderVariable("uniform", "float", "iDuration",    self.duration)
         yield ShaderVariable("uniform", "float", "iDeltaTime",   self.dt)
         yield ShaderVariable("uniform", "vec2",  "iResolution",  self.resolution)
+        yield ShaderVariable("uniform", "float", "iWantAspect",  self.aspect_ratio)
         yield ShaderVariable("uniform", "float", "iQuality",     self.quality/100)
         yield ShaderVariable("uniform", "float", "iSSAA",        self.ssaa)
         yield ShaderVariable("uniform", "float", "iFrameRate",   self.fps)
@@ -919,7 +907,6 @@ class ShaderScene(ShaderModule):
         self.imgui.resize(width, height)
         self._width, self._height = width, height
         self.relay(ShaderMessage.Shader.RecreateTextures)
-        self.relay(ShaderMessage.Shader.Render)
 
     def __window_close__(self) -> None:
         self.relay(ShaderMessage.Window.Close())

ShaderFlow/Shader.py

@@ -327,7 +327,7 @@ class ShaderObject(ShaderModule):
             self.compile()
         self.render()
 
-    SKIP_GPU: bool = (os.environ.get("SKIP_GPU", "0") == "1")
+    SKIP_GPU: bool = (os.getenv("SKIP_GPU", "0") == "1")
     """Do not render shaders, useful for benchmarking raw Python performance"""
 
     def render_fbo(self, fbo: moderngl.Framebuffer, clear: bool=True) -> None:

ShaderFlow/Texture.py

@@ -343,10 +343,11 @@ class ShaderTexture(ShaderModule):
             list.append(fill())
         return list
 
-    def _populate(self) -> Self:
+    def _populate(self) -> Iterable[Tuple[int, int, TextureBox]]:
         self._pop_fill(self.matrix, deque, self.temporal)
         for row in self.matrix:
             self._pop_fill(row, TextureBox, self.layers)
+        return self.boxes
 
     @property
     def boxes(self) -> Iterable[Tuple[int, int, TextureBox]]:
@@ -358,12 +359,13 @@ class ShaderTexture(ShaderModule):
         yield from self.matrix[n]
 
     def make(self) -> Self:
-        if (max(self.size) > 2**15):
-            raise Exception(f"Texture size likely too large {self.size}")
+        if (max(self.size) > (limit := self.scene.opengl.info['GL_MAX_VIEWPORT_DIMS'][0])):
+            raise Exception(f"Texture size too large for this OpenGL context: {self.size} > {limit}")
 
-        self._populate()
+        # Recreate texture boxes to match new length
         for (_, _, box) in self.boxes:
             box.release()
+        for (_, _, box) in self._populate():
             box.texture = self.scene.opengl.texture(
                 components=self.components,
                 dtype=self.dtype.name,
@@ -457,15 +459,15 @@ class ShaderTexture(ShaderModule):
     # ------------------------------------------|
 
     @property
-    def nbytes(self) -> int:
+    def bytes_per_pixel(self) -> int:
         return self.dtype.value().nbytes * self.components
 
     def sample_xy(self, x: float, y: float, temporal: int=0, layer: int=-1) -> numpy.ndarray:
         """Get the Pixel at a XY coordinate: Origin at Top Right (0, 0); Bottom Left (width, height)"""
         box   = self.box(temporal=temporal, layer=layer)
         data  = (box.data or box.texture.read())
-        start = int((y*self.width + x) * self.nbytes)
-        return numpy.frombuffer(data, dtype=self.dtype.value)[start:start + self.nbytes]
+        start = int((y*self.width + x) * self.bytes_per_pixel)
+        return numpy.frombuffer(data, dtype=self.dtype.value)[start:start + self.bytes_per_pixel]
 
     def sample_stxy(self, x: float, y: float, temporal: int=0, layer: int=-1) -> numpy.ndarray:
         """Get the Pixel at a XY coordinate: Origin at Bottom left (0, 0); Top right (width, height)"""

ShaderFlow/__main__.py

@@ -2,7 +2,7 @@ from Broken import BrokenApp
 from ShaderFlow import SHADERFLOW
 
 SHADERFLOW_ABOUT = """
-🌵 Imagine ShaderToy, on a Manim-like architecture. That's ShaderFlow.\n
+🔥 Imagine ShaderToy, on a Manim-like architecture. That's ShaderFlow.\n
 • Tip: run "shaderflow (scene) --help" for More Options ✨
 • Warn: Make sure you trust the file you are running
 

{shaderflow-0.4.0.dev2.dist-info → shaderflow-0.5.0.dev0.dist-info}/METADATA

@@ -1,19 +1,26 @@
 Metadata-Version: 2.3
 Name: shaderflow
-Version: 0.4.0.dev2
-Summary: Imagine ShaderToy, on a Manim-like architecture. That's ShaderFlow.
-Project-URL: issues, https://github.com/BrokenSource/ShaderFlow/issues
-Project-URL: repository, https://github.com/BrokenSource/ShaderFlow
-Project-URL: documentation, https://brokensrc.dev/shaderflow
-Project-URL: homepage, https://brokensrc.dev
+Version: 0.5.0.dev0
+Summary: 🔥 Imagine ShaderToy, on a Manim-like architecture. That's ShaderFlow.
+Project-URL: Changelog, https://brokensrc.dev/news/category/releases
+Project-URL: GitHub, https://github.com/BrokenSource/ShaderFlow
+Project-URL: Funding, https://brokensrc.dev/about/sponsors
+Project-URL: Contact, https://brokensrc.dev/about/contact
+Project-URL: Credits, https://brokensrc.dev/about/credits
+Project-URL: License, https://brokensrc.dev/about/license
+Project-URL: Download, https://brokensrc.dev/get/releases
+Project-URL: Docs, https://brokensrc.dev/shaderflow
+Project-URL: Homepage, https://brokensrc.dev
 Author-email: Tremeschin <29046864+Tremeschin@users.noreply.github.com>
 License-Expression: AGPL-3.0
-Requires-Dist: broken-source[shaderflow]==0.4.0.dev2
+Requires-Dist: broken-source[shaderflow]==0.5.0.dev0
 Description-Content-Type: text/markdown
 
-<sup>⚠️ **Warning**: This repository [**shouldn't be cloned alone**](https://brokensrc.dev/get/source), per [**monorepo**](https://github.com/BrokenSource/BrokenSource) structure</sup>
+> [!IMPORTANT]
+> <sub>This repository is part of a [**monorepo**](https://github.com/BrokenSource/BrokenSource) and [**shouldn't be cloned alone**](https://brokensrc.dev/get/source)</sub>
+
 <div align="center">
-  <a href="https://brokensrc.dev/shaderflow"><img src="https://raw.githubusercontent.com/BrokenSource/ShaderFlow/Master/ShaderFlow/Resources/Images/ShaderFlow.png" width="200"></a>
+  <a href="https://brokensrc.dev/shaderflow"><img src="https://raw.githubusercontent.com/BrokenSource/ShaderFlow/main/ShaderFlow/Resources/Images/ShaderFlow.png" width="200"></a>
   <h1>ShaderFlow</h1>
   <br>
   Imagine <a href="https://www.shadertoy.com"><b>ShaderToy</b></a>, on a <a href="https://github.com/3b1b/manim"><b>Manim</b></a>-like Architecture. That's <a href="https://brokensrc.dev/shaderflow/"><b>ShaderFlow</b></a>
@@ -27,22 +34,21 @@ Description-Content-Type: text/markdown
 
 A **Framework** for Creating, Exporting **Real Time** and **Audio Reactive** Shaders
 
-- **🛡️ Open Source**, Trust and Transparency, Cross Platform, Configurable
-- **🧸 80% ShaderToy** Compatible, Easily transfer your Knowledge
-- **📔 Video Codecs**: Easily export to H264, HEVC, AV1, (+NVENC)
-- **🚀 Physics-like** Animations with Control Systems Dynamics
-- **🔱 High Quality**, Any Resolution, Framerate, Bitrate, SSAA
-- **🎵 Audio Reactive**, Live Music, Professional Video
-- **🌊 Audio Waveforms** and Oscilloscope Support
-- **🎥 Video as Texture**: Real Time 4k Processing
-- **♻️ Live Reload** Shaders, Instant Feedback
-- **🎨 No Watermarks**, User First Experience
-- **⏳ Perfect Frametimes**, No Jitter, No Lag
-- **🌵 Fastest** Rendering times in the West
+- **🛡️ Open Source**, trust and transparency, cross platform, configurable
+- **🧸 80% ShaderToy** compatible, easily transfer your knowledge
+- **📔 Video Codecs**: easily export to H264, HEVC, AV1, (+NVENC)
+- **🚀 Physics-like** animations with control systems dynamics
+- **🔱 High Quality**, any resolution, framerate, bitrate, SSAA
+- **🎵 Audio Reactive**, live music, professional video
+- **🌊 Audio Waveforms** and oscilloscope support
+- **🎥 Video as Texture**: real time 4k processing
+- **♻️ Live Reload** shaders, instant feedback
+- **🎨 No Watermarks**, user first experience
+- **⏳ Perfect Frametimes**, no jitter, no lag
+- **🌵 Fastest** rendering times in the west
 - **👁 Built-in Camera** 2D, 3D, 360°, VR
 - **🎹 Piano Roll** scene, the smoothest
 
-<br>
 <br>
 
 # 📸 Showcase

{shaderflow-0.4.0.dev2.dist-info → shaderflow-0.5.0.dev0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 ShaderFlow/Message.py,sha256=AC1aJmEQ1fitlatsCFRabVBUbDU4kXlcXkNXCU5g7uc,2574
 ShaderFlow/Module.py,sha256=P14eJuSr5I4cCmczFS1k6HDE6nVKVw_RJO9ZNFrT7Qk,6200
-ShaderFlow/Scene.py,sha256=BDGgoQ1N-szPfWMinRPBJjO5PxXDuHit2CZNZxZdVxc,47515
-ShaderFlow/Shader.py,sha256=oUU9l2EiXJ6SGnrfCPyi7vcirGwM7GHPtCP9sS7E4YA,13873
-ShaderFlow/Texture.py,sha256=VBWNWNExwfzgb8rKlhDQvXZmnbykVgO-Ai9esQOnjS8,15921
+ShaderFlow/Scene.py,sha256=ZgvWRX0fQ7rJ09WcRiSDf_QvVyYeYpZEMmewnKwSDIc,47019
+ShaderFlow/Shader.py,sha256=_4Fnwlzy_fZwznEYVvvfP0atvuAjA_gDP9_HAc9uWj8,13868
+ShaderFlow/Texture.py,sha256=1W8y-sle6dIupwM7Z91AZHdXqMELfoYrHEKaO9LoFaI,16163
 ShaderFlow/Variable.py,sha256=7faHZYBxw2vyIVk9vpDu2SOfxniUiAdSZ1tGKED8In8,4167
 ShaderFlow/__init__.py,sha256=jd0CrCN355xoJqNuojUwNEvtPG5-En5Udk_lvAp_i18,304
-ShaderFlow/__main__.py,sha256=ipDlt-66J2HG5ZNxOKKJHnmbCaIOeacf7xBl6vh4dLU,586
+ShaderFlow/__main__.py,sha256=FC9TxumaTjq0A3mUJt2BmQUQWpsMg0JaLyFHNcTiecY,586
 ShaderFlow/Common/Imgui.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ShaderFlow/Common/Notes.py,sha256=wFm9qJbQDfnp_HwJo_-ntk9O4WeADCF6b36MTl7tNqQ,3855
 ShaderFlow/Common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ShaderFlow/Modules/Audio.py,sha256=Q8W7o0F2k2_Vt6HeEHNwco1BSWNX_UUb8LBxiRPa2hw,14777
+ShaderFlow/Modules/Audio.py,sha256=p9nDL7ErAFLCDnBFAOSt2T0dEA4OgAS2DnIVMyCs7sg,14840
 ShaderFlow/Modules/Bouncing.py,sha256=-2Zmq2xaGWuPtp8QaoYRWoLcrlkbnzqMLDTRenthuw0,3144
 ShaderFlow/Modules/Camera.py,sha256=zipKr9ZLIFv9edSxJSaJVqPY2ot5n1GekInihtxRK_4,17918
 ShaderFlow/Modules/Depth.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,11 +41,11 @@ ShaderFlow/Resources/Shaders/Fragment/Default.glsl,sha256=syBoZdAkdvRF2_3GkEb3iw
 ShaderFlow/Resources/Shaders/Fragment/Final.glsl,sha256=J37od3zzSmO6XbRZ-1ZUiyU8rcaA-6gdCMPp4C9Fk48,155
 ShaderFlow/Resources/Shaders/Fragment/Loading.frag,sha256=gIGMnh611vEJsOpB-DmjBI9EW6_4clkghbZVqB1czDA,895
 ShaderFlow/Resources/Shaders/Fragment/Missing.glsl,sha256=NEiuErlE1z0CE2r6WGS_rn6k7Wd4q9qnCoq7E1wBGfs,574
-ShaderFlow/Resources/Shaders/Include/Camera.glsl,sha256=ZR_DjaEErVc7lRfkKISzjeUM1p4GX7ghA776jnUYas0,5396
+ShaderFlow/Resources/Shaders/Include/Camera.glsl,sha256=8ne-rE9Gp4wwDlqAyjNpujyyNJxHts3Gy_FmCSPhLLE,5372
 ShaderFlow/Resources/Shaders/Include/Complex.glsl,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ShaderFlow/Resources/Shaders/Include/ShaderFlow.glsl,sha256=b5gb_cnF49lPJHBVFz2orJdaIO-eRInjgTViO45gKgU,13268
 ShaderFlow/Resources/Shaders/Vertex/Default.glsl,sha256=mptLPRKopeWq7ybJL5kV4xT_yL3hMeUAxe2LsJYX4gA,538
-shaderflow-0.4.0.dev2.dist-info/METADATA,sha256=fCFa9XJu6E5jiFDdsytBz6QV4IE59nPyIdC7dgmIc5E,4046
-shaderflow-0.4.0.dev2.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
-shaderflow-0.4.0.dev2.dist-info/entry_points.txt,sha256=Jft0cKd9FhDHp9byhoIlpXjxb_DFSa2W6vVAtl1-Kr4,56
-shaderflow-0.4.0.dev2.dist-info/RECORD,,
+shaderflow-0.5.0.dev0.dist-info/METADATA,sha256=eP3fXV8iR463U3QQY4ojQ0HVj4OkujdlXQDp2KWitb0,4320
+shaderflow-0.5.0.dev0.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+shaderflow-0.5.0.dev0.dist-info/entry_points.txt,sha256=Jft0cKd9FhDHp9byhoIlpXjxb_DFSa2W6vVAtl1-Kr4,56
+shaderflow-0.5.0.dev0.dist-info/RECORD,,