fractex 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

fractex/3d.py

@@ -155,6 +155,9 @@ def sample_volume_trilinear(volume: np.ndarray,
         Интерполированное значение (C,)
     """
     depth, height, width, channels = volume.shape
+    x = np.float32(x)
+    y = np.float32(y)
+    z = np.float32(z)
     
     # Обрабатываем режим заворачивания
     if wrap_mode == "repeat":
@@ -162,17 +165,35 @@ def sample_volume_trilinear(volume: np.ndarray,
         y = y - np.floor(y)
         z = z - np.floor(z)
     elif wrap_mode == "clamp":
-        x = np.clip(x, 0.0, 1.0)
-        y = np.clip(y, 0.0, 1.0)
-        z = np.clip(z, 0.0, 1.0)
+        if x < 0.0:
+            x = 0.0
+        elif x > 1.0:
+            x = 1.0
+        if y < 0.0:
+            y = 0.0
+        elif y > 1.0:
+            y = 1.0
+        if z < 0.0:
+            z = 0.0
+        elif z > 1.0:
+            z = 1.0
     elif wrap_mode == "mirror":
         x = np.abs(1.0 - np.abs(1.0 - x * 2.0)) / 2.0
         y = np.abs(1.0 - np.abs(1.0 - y * 2.0)) / 2.0
         z = np.abs(1.0 - np.abs(1.0 - z * 2.0)) / 2.0
     else:
-        x = np.clip(x, 0.0, 1.0)
-        y = np.clip(y, 0.0, 1.0)
-        z = np.clip(z, 0.0, 1.0)
+        if x < 0.0:
+            x = 0.0
+        elif x > 1.0:
+            x = 1.0
+        if y < 0.0:
+            y = 0.0
+        elif y > 1.0:
+            y = 1.0
+        if z < 0.0:
+            z = 0.0
+        elif z > 1.0:
+            z = 1.0
     
     # Переводим в координаты текстуры
     fx = x * (width - 1)
@@ -221,7 +242,7 @@ def sample_volume_trilinear(volume: np.ndarray,
     # Линейная интерполяция по Z
     result = c0 * (1 - dz) + c1 * dz
     
-    return result
+    return result.astype(volume.dtype)
 
 @jit(nopython=True, parallel=True, cache=True)
 def sample_volume_trilinear_batch(volume: np.ndarray,

fractex/examples/3d.py

@@ -34,7 +34,7 @@ def main():
     args = parser.parse_args()
     game_time = 0.0
     player = Player(
-        position=np.array([0.5, 0.5, 2.0]),
+        position=np.array([0.5, 0.5, 0.9]),
         look_at=np.array([0.5, 0.5, 0.5])
     )
     
@@ -73,7 +73,7 @@ def main():
     # Рендеринг
     renderer = VolumeTextureRenderer(cave_with_lava)
     frames = []
-    for z in [2.2, 2.0, 1.8, 1.6, 1.4, 1.2]:
+    for z in [0.95, 0.85, 0.75, 0.65, 0.55, 0.45]:
         camera_pos = np.array([0.5, 0.5, z])
         frame = renderer.render_raycast(
             camera_pos=camera_pos,

fractex/examples/composite_material.py

@@ -2,6 +2,7 @@
 import sys
 from pathlib import Path
 import argparse
+import numpy as np
 
 ROOT = Path(__file__).resolve().parents[2]
 if str(ROOT) not in sys.path:

fractex/examples/splash.py

@@ -80,6 +80,7 @@ def main():
     ema_ms = target_ms
     phases = {name: 0.0 for name in presets}
     last_t_base = 0.0
+    phase_wrap = 90.0
     
     def _upscale_nearest(image: np.ndarray, out_w: int, out_h: int) -> np.ndarray:
         in_h, in_w, _ = image.shape
@@ -103,20 +104,47 @@ def main():
             base_name = presets[(frame // 240) % len(presets)]
             detail_name = presets[(frame // 240 + 1) % len(presets)]
         
-        phases[base_name] += delta_t
-        base_texture = textures[base_name]
-        detail_texture = textures[detail_name]
-        t = phases[base_name]
-        t2 = phases[detail_name]
-        
-        base_zoom = 1.0 + t * 0.02
-        detail_zoom = 2.5 + t * 0.05
-        
-        decay = np.exp(-0.01 * t)
-        x0 = np.sin(t * 0.12) * 5.0 * decay
-        y0 = np.cos(t * 0.10) * 5.0 * decay
-        x1 = np.sin(t2 * 0.22 + 1.2) * 2.0 * decay
-        y1 = np.cos(t2 * 0.18 + 0.7) * 2.0 * decay
+        phases[base_name] = (phases[base_name] + delta_t) % phase_wrap
+        phases[detail_name] = (phases[detail_name] + delta_t) % phase_wrap
+        def _render_layer(base_preset: str, detail_preset: str) -> np.ndarray:
+            base_texture = textures[base_preset]
+            detail_texture = textures[detail_preset]
+            t = phases[base_preset]
+            t2 = phases[detail_preset]
+            
+            base_zoom = 1.0 + 0.15 * np.sin(t * 0.25)
+            detail_zoom = 2.4 + 0.25 * np.sin(t2 * 0.35)
+            
+            x0 = np.sin(t * 0.12) * 5.0
+            y0 = np.cos(t * 0.10) * 5.0
+            x1 = np.sin(t2 * 0.22 + 1.2) * 2.0
+            y1 = np.cos(t2 * 0.18 + 0.7) * 2.0
+            
+            base_origin_x = -render_w / (2.0 * base_zoom)
+            base_origin_y = -render_h / (2.0 * base_zoom)
+            detail_origin_x = -render_w / (2.0 * detail_zoom)
+            detail_origin_y = -render_h / (2.0 * detail_zoom)
+            
+            base = base_texture.generate_tile(
+                base_origin_x + x0,
+                base_origin_y + y0,
+                render_w,
+                render_h,
+                zoom=base_zoom,
+            )[..., :3]
+            detail = detail_texture.generate_tile(
+                detail_origin_x + x1,
+                detail_origin_y + y1,
+                render_w,
+                render_h,
+                zoom=detail_zoom,
+            )[..., :3]
+            
+            depth = 0.35 + 0.15 * np.sin(t * 0.2)
+            rgb = np.clip(base * (1.0 - depth) + detail * depth, 0, 1)
+            tint = 0.6 + 0.4 * np.sin(t * 0.2)
+            rgb = np.clip(rgb * np.array([1.0, tint, 0.9]), 0, 1)
+            return rgb
         
         now = time.perf_counter()
         dt_ms = (now - last_time) * 1000.0
@@ -134,31 +162,20 @@ def main():
         render_w = max(64, int(width * render_scale))
         render_h = max(64, int(height * render_scale))
         
-        base_origin_x = -render_w / (2.0 * base_zoom)
-        base_origin_y = -render_h / (2.0 * base_zoom)
-        detail_origin_x = -render_w / (2.0 * detail_zoom)
-        detail_origin_y = -render_h / (2.0 * detail_zoom)
-
-        base = base_texture.generate_tile(
-            base_origin_x + x0,
-            base_origin_y + y0,
-            render_w,
-            render_h,
-            zoom=base_zoom,
-        )[..., :3]
-        detail = detail_texture.generate_tile(
-            detail_origin_x + x1,
-            detail_origin_y + y1,
-            render_w,
-            render_h,
-            zoom=detail_zoom,
-        )[..., :3]
-        
-        depth = 0.35 + 0.15 * np.sin(t * 0.2)
-        rgb_frame = np.clip(base * (1.0 - depth) + detail * depth, 0, 1)
-        
-        tint = 0.6 + 0.4 * np.sin(t * 0.2)
-        rgb_frame = np.clip(rgb_frame * np.array([1.0, tint, 0.9]), 0, 1)
+        rgb_frame = _render_layer(base_name, detail_name)
+        if not selected:
+            cycle_len = 240
+            transition_len = 60
+            cycle_pos = frame % cycle_len
+            if cycle_pos >= cycle_len - transition_len:
+                next_base = presets[(frame // cycle_len + 1) % len(presets)]
+                next_detail = presets[(frame // cycle_len + 2) % len(presets)]
+                phases[next_base] = (phases[next_base] + delta_t) % phase_wrap
+                phases[next_detail] = (phases[next_detail] + delta_t) % phase_wrap
+                next_rgb = _render_layer(next_base, next_detail)
+                w = (cycle_pos - (cycle_len - transition_len)) / transition_len
+                w = w * w * (3.0 - 2.0 * w)
+                rgb_frame = np.clip(rgb_frame * (1.0 - w) + next_rgb * w, 0, 1)
         rgb_frame = _upscale_nearest(rgb_frame, width, height)
         im.set_array(rgb_frame)
         return (im,)

{fractex-0.2.0.dist-info → fractex-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractex
-Version: 0.2.0
+Version: 0.2.1
 Summary: Fractal texture engine for procedural and infinite-detail textures.
 Author-email: Timur Isanov <tisanov@yahoo.com>
 License: MIT License
@@ -43,6 +43,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: numba
+Requires-Dist: matplotlib
 Dynamic: license-file
 
 ## Fractex

{fractex-0.2.0.dist-info → fractex-0.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractex/3d.py,sha256=m7FmIgtouncb8LVpev3MjhOUNMaKEa6MmE3B8N2lj78,65079
+fractex/3d.py,sha256=t6-c7oCXdp3408v4qtba6kZsvD4W8lapmbclxe0gd0o,65460
 fractex/__init__.py,sha256=QheT5gsEbyQjvBo_HKy7rgWuhDepJ_UT1io7n_TcpG8,737
 fractex/advanced.py,sha256=UnyLEtH9rZGYSMhL6W4iZzKjTncx1-ToVGtaXbjujrA,5834
 fractex/cli.py,sha256=_54z7rFeJY4sfZm_XwHuOEkF_g-kJtNmGBPNjyjwXY0,2490
@@ -10,14 +10,14 @@ fractex/simplex_noise.py,sha256=JuMl0tqo4Qq1XC8fmaxLSiH9GppYVvBhmBI5Zc2ZYpc,4157
 fractex/texture_blending.py,sha256=2bgmqqsw6v6M2qDp5cEhC-SjdbnvPGxmZLJf7Iaa7Ds,58506
 fractex/volume_scattering.py,sha256=T04rrW1N4VwimNskVww7K6XB1rEqo0foBXii6wAvhkk,54040
 fractex/volume_textures.py,sha256=o-89qqZ1sk7No8w7UHiCTkdFe_m3NmFwyvBEJooL3is,277
-fractex/examples/3d.py,sha256=ULpDhMBap5V_CUo2DNPOtsTEF9U7-W2ZWhSVVGsa9P8,3469
+fractex/examples/3d.py,sha256=F7cmL4LMKZWN-reYi20souwPs9fXp0S-BXA9_TSSCrA,3475
 fractex/examples/3d_integration.py,sha256=jiGv_fkirWLSbADmztVOzfO6EfFNs53C6YyesT3RhPk,3781
 fractex/examples/3d_integration_2d.py,sha256=On2LRHV4IZdF1LcUtlJa6poEqD-RNxkrOFix92lCcfo,2193
 fractex/examples/__init__.py,sha256=w2TZrQjob4nE9eRaWLYEKkaETerHPbdRNCnNgBilCng,857
 fractex/examples/_output.py,sha256=2i8UO6IWYMeUZ2I4f5JW0UJii2nTJbqnKQ8Pqo0MB3U,3367
 fractex/examples/architecture_pattern.py,sha256=gREGvvfahNPpoMzHTW1J_oUi8Szquk5v9P7ClaxP8cU,1936
 fractex/examples/atmosphere.py,sha256=9eLAX3aRO6pMz-GrMaZ7QgocG8NBMznO8vuy6OzNkTA,1824
-fractex/examples/composite_material.py,sha256=6Ba7yCcx82MvaEKM2cVYEao6MOQW3pDZrSf1nvlaCow,2048
+fractex/examples/composite_material.py,sha256=uEK6oNonIyrpOhEOxhiqZkNKW5pupOVrY0tp2w9gif4,2067
 fractex/examples/crystal_cave.py,sha256=pXmFTi3FCVSULoTEh11JC_w_0PzEVtbLSExnUw0DQRM,1908
 fractex/examples/custom_pattern.py,sha256=ZqX81-lxUI4e5aQwThNqQPKaJrJ5HldTJgn5fZoV-dc,4310
 fractex/examples/fire_flame.py,sha256=X9T5Mm8PMgTiSQMGsSQG9NfbRwVw8Kmk-e-IMieD6TI,8046
@@ -25,13 +25,13 @@ fractex/examples/game_integration.py,sha256=k85yfez6N46oyR5gXpenbOoxDNMQgRLIDRay
 fractex/examples/game_texture.py,sha256=4hwtTOpspIQanQODD2g6opke0Zp5XwTriw8kqdtKLak,6841
 fractex/examples/integration.py,sha256=jJwa3ChUmxikGmqJk_tchDnV3rhuYKlNdEATxdbvf_8,3494
 fractex/examples/physic_integration.py,sha256=uh_ik_j-iiEOowPIvd37jwUDi5v9PZtCYUyHgyJBCC4,2551
-fractex/examples/splash.py,sha256=n01HxC0Zhry9NqJf-NmczLKB_OG1WiFaUB-9y-bJa7c,5969
+fractex/examples/splash.py,sha256=fBWlj9Bevv9P6reQlVqnumKpvaEOak9aQjoVVaZNABo,7141
 fractex/examples/terrain.py,sha256=rsduhHchbyI6T-RDIzI-S6D07g2_rCSg6JtA4eXGve0,2611
 fractex/examples/underwater.py,sha256=1_SlTVhd-ONEYqyV_B4sCFhSqScmCHQ7f6eRVI7v5X8,3313
 fractex/examples/underwater_volkano.py,sha256=HobJi3ztK-R_VeHfI8oVRZupONbegWnOL40llj_LnaE,4161
-fractex-0.2.0.dist-info/licenses/LICENSE,sha256=CRrETm3c-JFoqpolJMrRIfFXOxOy5uhnvdSVKFP6sVE,1069
-fractex-0.2.0.dist-info/METADATA,sha256=xNmFDqTLXAzMdz1gzvRbT4oLVx0ssF7t-42JikMoxuY,3603
-fractex-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-fractex-0.2.0.dist-info/entry_points.txt,sha256=xgzT1MTUmB69bstzCyxybxJDI7D8nYqsJpBN2UMazL4,45
-fractex-0.2.0.dist-info/top_level.txt,sha256=LFl1_h1YNgANgBDo6d-tPTJzlrO3ny_l5OTItasV9rw,8
-fractex-0.2.0.dist-info/RECORD,,
+fractex-0.2.1.dist-info/licenses/LICENSE,sha256=CRrETm3c-JFoqpolJMrRIfFXOxOy5uhnvdSVKFP6sVE,1069
+fractex-0.2.1.dist-info/METADATA,sha256=cu1N-Xy7m9hl6KAxbRkGZxNOGcCLZAOJ8uhC8A5rVxE,3629
+fractex-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fractex-0.2.1.dist-info/entry_points.txt,sha256=xgzT1MTUmB69bstzCyxybxJDI7D8nYqsJpBN2UMazL4,45
+fractex-0.2.1.dist-info/top_level.txt,sha256=LFl1_h1YNgANgBDo6d-tPTJzlrO3ny_l5OTItasV9rw,8
+fractex-0.2.1.dist-info/RECORD,,