fractex 0.1.2__tar.gz → 0.2.1__tar.gz

{fractex-0.1.2/fractex.egg-info → fractex-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractex
-Version: 0.1.2
+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.1.2 → fractex-0.2.1}/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-0.1.2 → fractex-0.2.1}/fractex/cli.py

@@ -11,6 +11,7 @@ from typing import List
 def _examples() -> List[str]:
     return [
         "splash",
+        "fire_flame",
         "custom_pattern",
         "architecture_pattern",
         "composite_material",

{fractex-0.1.2 → fractex-0.2.1}/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-0.1.2 → fractex-0.2.1}/fractex/examples/__init__.py

@@ -10,6 +10,7 @@ from typing import List, Optional
 def list_examples() -> List[str]:
     return [
         "splash",
+        "fire_flame",
         "custom_pattern",
         "architecture_pattern",
         "composite_material",

{fractex-0.1.2 → fractex-0.2.1}/fractex/examples/architecture_pattern.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-0.1.2 → fractex-0.2.1}/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-0.2.1/fractex/examples/fire_flame.py

@@ -0,0 +1,141 @@
+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:
+    sys.path.insert(0, str(ROOT))
+EXAMPLES_DIR = Path(__file__).resolve().parent
+if str(EXAMPLES_DIR) not in sys.path:
+    sys.path.insert(0, str(EXAMPLES_DIR))
+
+from fractex.simplex_noise import SimplexNoise
+from fractex.interactive import add_interactive_args, InteractiveConfig, run_interactive
+from _output import save_ppm
+
+
+def _render_flame(t: float, w: int, h: int, noise: SimplexNoise) -> np.ndarray:
+    x = np.linspace(-1.0, 1.0, w)
+    y = np.linspace(0.0, 2.0, h)
+    xx, yy = np.meshgrid(x, y)
+    taper = 1.0 - 0.5 * np.clip(yy / 2.0, 0, 1)
+    xx_t = xx * taper
+    zz = np.ones_like(xx) * (t * 0.15)
+    
+    base = noise.noise_3d(xx_t * 1.5, yy * 1.2, zz)
+    detail = noise.noise_3d(xx_t * 5.0, yy * 4.0, zz * 1.8)
+    micro = noise.noise_3d(xx_t * 14.0, yy * 10.0, zz * 5.0)
+    warp = noise.noise_3d(xx_t * 1.2, yy * 1.0, zz * 0.8)
+    turbulence = base * 0.45 + detail * 0.3 + micro * 0.2 + warp * 0.05
+    turbulence = (turbulence + 1) * 0.5
+    
+    # Центральное ядро + вытянутая форма вверх (с повышенным контрастом)
+    core = np.exp(-((xx_t * 1.8) ** 2)) * np.clip(2.6 - yy, 0, 1)
+    # Языки с резкими краями (степень для контраста)
+    tongues_raw = np.exp(-((xx_t * 5.0 + warp * 1.6) ** 2)) * np.clip(3.0 - yy, 0, 1)
+    tongues = np.clip(tongues_raw * 1.5 - 0.2, 0, 1) ** 0.7
+    lobe_raw = np.exp(-((xx_t * 6.0) ** 2)) * np.clip(3.2 - yy, 0, 1) * (0.6 + 0.4 * np.sin(t * 0.7 + yy * 4.0))
+    lobe = np.clip(lobe_raw * 1.4 - 0.15, 0, 1) ** 0.8
+    jets_raw = np.clip(turbulence - 0.15, 0, 1) * np.exp(-((xx_t * 7.0 + warp * 1.8) ** 2)) * np.clip(3.4 - yy, 0, 1)
+    jets = np.clip(jets_raw * 1.6 - 0.1, 0, 1) ** 0.6
+    rips = np.clip(turbulence * 1.4 - 0.35, 0, 1) * np.exp(-((xx_t * 4.2) ** 2)) * np.clip(2.2 - yy, 0, 1)
+    
+    # Усиленные языки у основания (резкие)
+    base_tongues_raw = np.exp(-((xx_t * 3.5 + warp * 2.0) ** 2)) * np.clip(1.0 - yy * 0.6, 0, 1)
+    base_tongues = np.clip(base_tongues_raw * 1.5 - 0.15, 0, 1) ** 0.7
+    base_flicker = (0.7 + 0.3 * np.sin(t * 2.5 + xx * 8.0)) * np.clip(0.8 - yy, 0, 1)
+    base_texture = np.clip(detail * 0.8 + micro * 0.4, 0, 1) * np.exp(-((xx_t * 2.0) ** 2)) * np.clip(0.6 - yy * 0.5, 0, 1)
+    
+    # Языки пламени веером от центра основания к краям
+    yy_safe = np.maximum(yy, 0.05)  # избегаем деления на 0
+    # Больше языков под меньшими углами (более вертикальные)
+    tongue_angles = [-0.2, -0.13, -0.07, 0.0, 0.07, 0.13, 0.2]  # 7 языков, узкий веер
+    tongues_radial = np.zeros_like(xx)
+    for i, ta in enumerate(tongue_angles):
+        # Ось языка с динамическим колебанием
+        wobble = noise.noise_3d(np.full_like(xx, i * 0.7), yy * 1.5 - t * 0.6, zz) * 0.08
+        tongue_axis = yy_safe * (ta + wobble)
+        dist_from_axis = np.abs(xx_t - tongue_axis)
+        # Ширина: больше у основания, сужается вверх
+        width = 0.10 * np.clip(1.0 - yy * 0.35, 0.25, 1.0)
+        tongue_shape = np.exp(-((dist_from_axis / width) ** 2))
+        # Контрастность: резкие края
+        tongue_shape = np.clip(tongue_shape * 1.5 - 0.2, 0, 1) ** 0.7
+        # Яркость: сильнее у основания, центральный язык ярче
+        center_boost = 1.0 + 0.4 * np.exp(-(ta * 8) ** 2)  # центр ярче
+        brightness = np.clip(2.0 - yy * 1.0, 0, 1) * (0.8 + 0.2 * np.sin(t * 2.0 + i * 1.0)) * center_boost
+        tongues_radial += tongue_shape * brightness
+    tongues_radial = np.clip(tongues_radial * 0.6, 0, 1)
+    
+    flame = np.clip(core * (0.2 + 1.0 * turbulence) + tongues * 1.0 + lobe * 0.7 + jets * 0.7 + rips * 0.4 + base_tongues * 0.8 + base_flicker * 0.4 + base_texture * 0.5 + tongues_radial * 0.7, 0, 1)
+    flame = np.clip((flame - 0.1) * 1.6, 0, 1)
+    
+    # Подсветка ядра
+    core_glow = np.exp(-((xx_t * 3.2) ** 2 + (yy * 1.6) ** 2)) * np.clip(1.6 - yy, 0, 1)
+    
+    # Дым: только в верхней части (выше yy=1.0) - полностью чистый низ
+    smoke_vertical = np.clip((yy - 1.0) * 2.0, 0, 1)  # маска: 0 внизу, 1 вверху
+    smoke = np.clip((yy - 1.5) * 0.7, 0, 1) * (0.2 + 0.5 * turbulence)
+    side_mask = np.clip((np.abs(xx) * 1.8 - 0.5), 0, 1)
+    smoke = smoke * np.exp(-((xx_t * 1.5 + warp * 0.6) ** 2)) * side_mask
+    trail = np.exp(-((xx_t * 0.8 + warp * 0.6) ** 2)) * np.clip(yy - 1.2, 0, 1)
+    trail = trail * (0.3 + 0.5 * turbulence) * (0.5 + 0.5 * np.sin(t * 0.3 + yy * 1.5))
+    smoke = np.clip((smoke + trail * 0.4) * smoke_vertical, 0, 1)
+    
+    # Искры: у основания без маски, выше - только по краям
+    spark_mask = np.clip(micro - 0.7, 0, 1)
+    edge = np.clip(np.abs(xx_t) * 2.0, 0, 1)
+    bottom_zone = np.clip(1.0 - yy, 0, 1)
+    sparks = spark_mask ** 2 * (bottom_zone * 1.2 + (1 - bottom_zone) * edge * 0.5)
+    
+    rgb = np.full((h, w, 3), np.array([0.55, 0.27, 0.20], dtype=np.float32), dtype=np.float32)
+    heat = np.clip(flame * 1.2, 0, 1)
+    
+    # Температурный градиент: краснее/оранжевее у основания, белее к ядру
+    vertical = np.clip(1.2 - yy, 0, 1)
+    temp = np.clip(vertical * 0.6 + heat * 0.7, 0, 1)
+    cold_color = np.array([1.0, 0.35, 0.02], dtype=np.float32)  # более насыщенный оранжево-красный
+    hot_color = np.array([1.0, 0.92, 0.8], dtype=np.float32)
+    temp_rgb = cold_color * (1 - temp)[..., None] + hot_color * temp[..., None]
+    base_boost = np.clip(1.0 - yy * 0.3, 0.75, 1.0)
+    base_heat = np.clip(1.0 - yy * 0.5, 0, 1) * np.exp(-((xx_t * 1.8) ** 2))
+    # Дополнительная оранжевая текстура у основания (усилена)
+    orange_base = np.clip(detail * 0.5 + 0.5, 0, 1) * np.clip(0.8 - yy * 0.45, 0, 1) * np.exp(-((xx_t * 1.5) ** 2))
+    # Красное свечение у самого основания
+    red_base = np.clip(0.5 - yy * 0.6, 0, 1) * np.exp(-((xx_t * 1.2) ** 2)) * (0.7 + 0.3 * turbulence)
+    
+    core_boost = 1.0 + 0.5 * core_glow
+    core_ripple = 0.85 + 0.15 * np.sin(t * 1.4 + (xx_t + yy) * 3.5) * core_glow
+    rgb[..., 0] = np.clip(temp_rgb[..., 0] * heat * core_boost * core_ripple * (1.15 * base_boost) + base_heat * 0.55 + orange_base * 0.7 + red_base * 0.5 + sparks * 1.6 + core_glow * 0.35, 0, 1)
+    rgb[..., 1] = np.clip(temp_rgb[..., 1] * heat * core_boost * core_ripple * (1.08 * base_boost) + base_heat * 0.35 + orange_base * 0.35 + red_base * 0.15 + sparks * 0.8 + core_glow * 0.2, 0, 1)
+    rgb[..., 2] = np.clip(temp_rgb[..., 2] * heat * (0.9 + 0.3 * core_glow) * core_ripple * (0.95 * base_boost) + base_heat * 0.03 + core_glow * 0.06, 0, 1)
+    
+    # Добавляем дым как серо-синий слой
+    rgb[..., 0] = np.clip(rgb[..., 0] * (1 - smoke) + smoke * 0.3, 0, 1)
+    rgb[..., 1] = np.clip(rgb[..., 1] * (1 - smoke) + smoke * 0.35, 0, 1)
+    rgb[..., 2] = np.clip(rgb[..., 2] * (1 - smoke) + smoke * 0.4, 0, 1)
+    return rgb
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Fire flame example")
+    add_interactive_args(parser)
+    args = parser.parse_args()
+    
+    noise = SimplexNoise(seed=42)
+    
+    if args.interactive:
+        config = InteractiveConfig.from_args(args, title="fractex")
+        
+        def render_frame(t, w, h):
+            return _render_flame(t, w, h, noise)
+        
+        run_interactive(render_frame, config)
+    else:
+        image = _render_flame(0.0, 512, 512, noise)
+        save_ppm(image, EXAMPLES_DIR / "output" / "fire_flame.ppm", stretch=True)
+
+
+if __name__ == "__main__":
+    main()

{fractex-0.1.2 → fractex-0.2.1}/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.1.2 → fractex-0.2.1/fractex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractex
-Version: 0.1.2
+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.1.2 → fractex-0.2.1}/fractex.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ fractex/examples/atmosphere.py
 fractex/examples/composite_material.py
 fractex/examples/crystal_cave.py
 fractex/examples/custom_pattern.py
+fractex/examples/fire_flame.py
 fractex/examples/game_integration.py
 fractex/examples/game_texture.py
 fractex/examples/integration.py

{fractex-0.1.2 → fractex-0.2.1}/fractex.egg-info/requires.txt

@@ -1,2 +1,3 @@
 numpy
 numba
+matplotlib

{fractex-0.1.2 → fractex-0.2.1}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fractex"
-version = "0.1.2"
+version = "0.2.1"
 description = "Fractal texture engine for procedural and infinite-detail textures."
 readme = "README.md"
 requires-python = ">=3.9"
 license = { file = "LICENSE" }
 authors = [{ name = "Timur Isanov", email = "tisanov@yahoo.com" }]
-dependencies = ["numpy", "numba"]
+dependencies = ["numpy", "numba", "matplotlib"]
 keywords = ["fractal", "texture", "procedural", "noise"]
 classifiers = [
     "Development Status :: 3 - Alpha",