aether-engine 1.3.1__tar.gz → 1.7.0__tar.gz

{aether_engine-1.3.1 → aether_engine-1.7.0}/MANIFEST.in

@@ -7,6 +7,7 @@ recursive-include aether *.glsl
 recursive-include aether *.vert
 recursive-include aether *.frag
 recursive-include aether *.json
+recursive-include aether/assets *
 
 recursive-include examples *.py
 

{aether_engine-1.3.1/aether_engine.egg-info → aether_engine-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aether-engine
-Version: 1.3.1
+Version: 1.7.0
 Summary: 3D/2D game engine by entiti937 — OpenGL, physics, FPS, mandatory branding splash
 Home-page: https://pypi.org/project/aether-engine/
 Author: entiti937
@@ -28,13 +28,16 @@ Provides-Extra: physics
 Requires-Dist: pymunk>=6.0; extra == "physics"
 Provides-Extra: models
 Requires-Dist: trimesh>=3.21; extra == "models"
+Provides-Extra: build
+Requires-Dist: pyinstaller>=6.0; extra == "build"
 Provides-Extra: full
-Requires-Dist: pygame-ce>=2.5; extra == "full"
+Requires-Dist: freetype-py>=2.4; extra == "full"
 Requires-Dist: imageio>=2.31; extra == "full"
+Requires-Dist: pygame-ce>=2.5; extra == "full"
 Requires-Dist: pyyaml>=6.0; extra == "full"
 Requires-Dist: trimesh>=3.21; extra == "full"
 Requires-Dist: pymunk>=6.0; extra == "full"
-Requires-Dist: freetype-py>=2.4; extra == "full"
+Requires-Dist: pyinstaller>=6.0; extra == "full"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -49,7 +52,7 @@ Dynamic: summary
 # Aether Engine
 
 **3D / 2D игровой движок на Python + OpenGL**  
-**Разработчик:** entiti937 · **Версия:** 1.3.0 · **Лицензия:** MIT  
+**Разработчик:** entiti937 · **Версия:** 1.7.0 · **Лицензия:** MIT  
 **PyPI:** https://pypi.org/project/aether-engine/
 
 > Полное руководство: [`docs/GUIDE.md`](docs/GUIDE.md)
@@ -62,18 +65,19 @@ Dynamic: summary
 pip install -U "aether-engine[full]"
 ```
 
-## Что нового в 1.3.0
+## Что нового в 1.7.0
 
-- **Обязательный splash** при старте любой игры (чёрный экран, белый текст, entiti937)
-- **Водяной знак** в каждом кадре + защита от удаления брендинга
-- **Кириллица** — системные шрифты, UTF-8 консоль, полный Unicode в UI
-- Компиляция защищённых модулей при сборке пакета
+- **AssetLoader** — загрузка любых моделей, спрайтов и текстур (OBJ/GLB/FBX/PNG/WebP/…)
+- `Sprite.from_image(path)` — быстрый импорт 2D-графики
+- Встроенный редактор **убран** (может вернуться в будущих версиях)
 
 ## Showcase-игра
 
 Minecraft-like sandbox **на этом же движке**:
 
 ```bash
+aether help
+aether build games/aether_craft.py --name AetherCraft
 python games/aether_craft.py
 ```
 
@@ -82,10 +86,10 @@ python games/aether_craft.py
 ## Другие запуски
 
 ```bash
-python -m aether.editor
 python games/orb_rush.py
 python examples/03_first_person.py
 python examples/04_physics2d.py
+aether website
 ```
 
 ## Минимальный код
@@ -110,15 +114,16 @@ engine.enable_first_person(camera)
 engine.run()
 ```
 
-## Возможности 1.2
+## Возможности
 
 - PBR 3D + sprites 2D + HUD overlay
 - FPS (`enable_first_person`) и free-look камера
 - Физика 3D/2D + raycast
-- `ModelLoader` (OBJ/GLB/glTF/STL/FBX/…)
-- Встроенный voxel model editor
+- `AssetLoader` / `ModelLoader` — OBJ/GLB/glTF/STL/FBX/STEP/… + PNG/WebP спрайты
 - Procedural SFX, JSON save/load
-- Примеры и две игры в репозитории
+- Примеры и игры в репозитории
+
+> Встроенный редактор моделей/пиксель-арт **временно убран** — планируется вернуть позже. Сейчас используйте Blender, Aseprite и т.д., файлы подгружайте через `AssetLoader`.
 
 ## Документация
 

{aether_engine-1.3.1 → aether_engine-1.7.0}/README.md

@@ -1,7 +1,7 @@
 # Aether Engine
 
 **3D / 2D игровой движок на Python + OpenGL**  
-**Разработчик:** entiti937 · **Версия:** 1.3.0 · **Лицензия:** MIT  
+**Разработчик:** entiti937 · **Версия:** 1.7.0 · **Лицензия:** MIT  
 **PyPI:** https://pypi.org/project/aether-engine/
 
 > Полное руководство: [`docs/GUIDE.md`](docs/GUIDE.md)
@@ -14,18 +14,19 @@
 pip install -U "aether-engine[full]"
 ```
 
-## Что нового в 1.3.0
+## Что нового в 1.7.0
 
-- **Обязательный splash** при старте любой игры (чёрный экран, белый текст, entiti937)
-- **Водяной знак** в каждом кадре + защита от удаления брендинга
-- **Кириллица** — системные шрифты, UTF-8 консоль, полный Unicode в UI
-- Компиляция защищённых модулей при сборке пакета
+- **AssetLoader** — загрузка любых моделей, спрайтов и текстур (OBJ/GLB/FBX/PNG/WebP/…)
+- `Sprite.from_image(path)` — быстрый импорт 2D-графики
+- Встроенный редактор **убран** (может вернуться в будущих версиях)
 
 ## Showcase-игра
 
 Minecraft-like sandbox **на этом же движке**:
 
 ```bash
+aether help
+aether build games/aether_craft.py --name AetherCraft
 python games/aether_craft.py
 ```
 
@@ -34,10 +35,10 @@ python games/aether_craft.py
 ## Другие запуски
 
 ```bash
-python -m aether.editor
 python games/orb_rush.py
 python examples/03_first_person.py
 python examples/04_physics2d.py
+aether website
 ```
 
 ## Минимальный код
@@ -62,15 +63,16 @@ engine.enable_first_person(camera)
 engine.run()
 ```
 
-## Возможности 1.2
+## Возможности
 
 - PBR 3D + sprites 2D + HUD overlay
 - FPS (`enable_first_person`) и free-look камера
 - Физика 3D/2D + raycast
-- `ModelLoader` (OBJ/GLB/glTF/STL/FBX/…)
-- Встроенный voxel model editor
+- `AssetLoader` / `ModelLoader` — OBJ/GLB/glTF/STL/FBX/STEP/… + PNG/WebP спрайты
 - Procedural SFX, JSON save/load
-- Примеры и две игры в репозитории
+- Примеры и игры в репозитории
+
+> Встроенный редактор моделей/пиксель-арт **временно убран** — планируется вернуть позже. Сейчас используйте Blender, Aseprite и т.д., файлы подгружайте через `AssetLoader`.
 
 ## Документация
 

{aether_engine-1.3.1 → aether_engine-1.7.0}/aether/__init__.py

@@ -23,15 +23,19 @@ from aether.graphics.material import Material
 from aether.graphics.camera import Camera
 from aether.graphics.first_person import FirstPersonController
 from aether.resources.loaders.model_loader import ModelLoader
+from aether.resources.asset_loader import AssetLoader
 from aether.physics import PhysicsWorld2D, PhysicsWorld3D, BoxCollider, SphereCollider
 from aether.graphics2d import Renderer2D, Sprite, Camera2D
-from aether.editor import ModelEditor
 from aether.ui.hud import Hud, HudBar
 from aether.audio.sfx import SfxBank
 from aether.resources.save_load import save_json, load_json
 from aether.physics.raycast import Raycaster
 
-__version__ = "1.3.1"
+__version__ = "1.7.0"
+
+from aether.graphics.voxel_mesh import ChunkedVoxelMesher
+from aether.accelerators import is_native_available, backend_name
+from aether.accelerators.gameplay import npc_move_toward, roll_loot
 
 __all__ = [
     "Engine",
@@ -48,6 +52,7 @@ __all__ = [
     "Camera",
     "FirstPersonController",
     "ModelLoader",
+    "AssetLoader",
     "PhysicsWorld2D",
     "PhysicsWorld3D",
     "BoxCollider",
@@ -55,12 +60,16 @@ __all__ = [
     "Renderer2D",
     "Sprite",
     "Camera2D",
-    "ModelEditor",
     "Hud",
     "HudBar",
     "SfxBank",
     "save_json",
     "load_json",
     "Raycaster",
+    "ChunkedVoxelMesher",
+    "is_native_available",
+    "backend_name",
+    "npc_move_toward",
+    "roll_loot",
     "__version__",
 ]

aether_engine-1.7.0/aether/__main__.py

@@ -0,0 +1,6 @@
+"""python -m aether"""
+
+from aether.cli import main
+
+if __name__ == "__main__":
+    raise SystemExit(main())

aether_engine-1.7.0/aether/accelerators/__init__.py

@@ -0,0 +1,30 @@
+"""Rust/C++ accelerators — prebuilt binaries, no user toolchain required."""
+from __future__ import annotations
+
+from typing import Optional
+
+_NATIVE = None
+_NATIVE_TRIED = False
+
+
+def is_native_available() -> bool:
+    """True when the precompiled Rust extension is loaded."""
+    global _NATIVE, _NATIVE_TRIED
+    if _NATIVE_TRIED:
+        return _NATIVE is not None
+    _NATIVE_TRIED = True
+    try:
+        import aether_native as mod  # type: ignore
+
+        _NATIVE = mod
+    except ImportError:
+        _NATIVE = None
+    return _NATIVE is not None
+
+
+def native_module():
+    return _NATIVE
+
+
+def backend_name() -> str:
+    return "rust" if is_native_available() else "python"

aether_engine-1.7.0/aether/accelerators/gameplay.py

@@ -0,0 +1,54 @@
+"""Game systems accelerated by Rust when the prebuilt extension is present."""
+from __future__ import annotations
+
+from typing import List, Tuple
+
+from aether.accelerators import is_native_available, native_module
+
+
+def npc_move_toward(
+    pos: Tuple[float, float],
+    target: Tuple[float, float],
+    speed: float,
+    attack_range: float = 1.5,
+) -> Tuple[float, float, int]:
+    """
+    Move NPC toward target. Returns (x, z, action).
+    action: 0=idle, 1=chase, 2=attack
+    """
+    px, pz = pos
+    tx, tz = target
+    if is_native_available():
+        nx, nz, act = native_module().npc_tick(px, pz, tx, tz, speed, attack_range)
+        return nx, nz, int(act)
+
+    dx, dz = tx - px, tz - pz
+    dist = (dx * dx + dz * dz) ** 0.5
+    if dist < 0.05:
+        return px, pz, 0
+    if dist <= attack_range:
+        return px, pz, 2
+    step = min(speed, dist)
+    return px + dx / dist * step, pz + dz / dist * step, 1
+
+
+def roll_loot(weights: List[float], seed: int = 0) -> int:
+    """Weighted random loot index, or -1."""
+    if not weights:
+        return -1
+    if is_native_available():
+        return int(native_module().loot_roll(weights, seed & 0xFFFFFFFFFFFFFFFF))
+
+    import random
+
+    rng = random.Random(seed)
+    total = sum(weights)
+    if total <= 0:
+        return -1
+    pick = rng.uniform(0, total)
+    acc = 0.0
+    for i, w in enumerate(weights):
+        acc += w
+        if pick <= acc:
+            return i
+    return len(weights) - 1

aether_engine-1.7.0/aether/accelerators/voxel.py

@@ -0,0 +1,227 @@
+"""Voxel mesh acceleration — Rust when available, pure Python fallback."""
+from __future__ import annotations
+
+from typing import Dict, List, Tuple
+
+import numpy as np
+
+from aether.accelerators import is_native_available, native_module
+from aether.graphics.mesh import Mesh
+
+Vec3i = Tuple[int, int, int]
+
+DEFAULT_FACES = [
+    ((0, 0, 1), [(0, 0, 1), (1, 0, 1), (1, 1, 1), (0, 1, 1)]),
+    ((0, 0, -1), [(1, 0, 0), (0, 0, 0), (0, 1, 0), (1, 1, 0)]),
+    ((-1, 0, 0), [(0, 0, 0), (0, 0, 1), (0, 1, 1), (0, 1, 0)]),
+    ((1, 0, 0), [(1, 0, 1), (1, 0, 0), (1, 1, 0), (1, 1, 1)]),
+    ((0, 1, 0), [(0, 1, 1), (1, 1, 1), (1, 1, 0), (0, 1, 0)]),
+    ((0, -1, 0), [(0, 0, 0), (1, 0, 0), (1, 0, 1), (0, 0, 1)]),
+]
+
+
+def _python_build_chunk(
+    get_block,
+    x0: int,
+    y0: int,
+    z0: int,
+    x1: int,
+    y1: int,
+    z1: int,
+    block_types: set | None,
+    faces,
+) -> Dict[int, Mesh]:
+    buckets: Dict[int, list] = {}
+    for x in range(x0, x1):
+        for y in range(y0, y1):
+            for z in range(z0, z1):
+                bid = get_block(x, y, z)
+                if bid == 0:
+                    continue
+                if block_types and bid not in block_types:
+                    continue
+                if bid not in buckets:
+                    buckets[bid] = [[], []]
+                verts, inds = buckets[bid]
+                index = len(verts) // 8
+                for normal, corners in faces:
+                    nx, ny, nz = normal
+                    if get_block(x + nx, y + ny, z + nz) != 0:
+                        continue
+                    face = []
+                    for px, py, pz in corners:
+                        verts.extend([x + px, y + py, z + pz, float(nx), float(ny), float(nz), 0.0, 0.0])
+                        face.append(index)
+                        index += 1
+                    inds.extend([face[0], face[1], face[2], face[0], face[2], face[3]])
+
+    meshes = {}
+    for bid, (verts, inds) in buckets.items():
+        if inds:
+            meshes[bid] = Mesh(
+                np.array(verts, dtype=np.float32),
+                np.array(inds, dtype=np.uint32),
+            )
+    return meshes
+
+
+def _rust_build_chunk(
+    get_block,
+    x0: int,
+    y0: int,
+    z0: int,
+    x1: int,
+    y1: int,
+    z1: int,
+    block_types: set | None,
+) -> Dict[int, Mesh]:
+    mod = native_module()
+    blocks: List[Tuple[int, int, int, int]] = []
+    for x in range(x0, x1):
+        for y in range(y0, y1):
+            for z in range(z0, z1):
+                bid = get_block(x, y, z)
+                if bid == 0:
+                    continue
+                if block_types and bid not in block_types:
+                    continue
+                blocks.append((x, y, z, int(bid)))
+
+    raw = mod.build_chunk_mesh(blocks, x0, y0, z0, x1, y1, z1)
+    meshes = {}
+    for bid, (verts, inds) in raw.items():
+        if inds:
+            meshes[int(bid)] = Mesh(
+                np.array(verts, dtype=np.float32),
+                np.array(inds, dtype=np.uint32),
+            )
+    return meshes
+
+
+class VoxelChunk:
+    __slots__ = ("cx", "cy", "cz", "meshes", "dirty")
+
+    def __init__(self, cx, cy, cz):
+        self.cx, self.cy, self.cz = cx, cy, cz
+        self.meshes: Dict[int, Mesh] = {}
+        self.dirty = True
+
+
+class ChunkedVoxelMesher:
+    """
+    Incrementally rebuilds only dirty 16³ chunks instead of the whole world.
+    Uses Rust mesh builder when the prebuilt extension is installed.
+    """
+
+    CHUNK_SIZE = 16
+
+    def __init__(
+        self,
+        get_block,
+        block_types=None,
+        chunk_size: int = 16,
+    ):
+        self.get_block = get_block
+        self.block_types = block_types or set()
+        self.chunk_size = chunk_size
+        self.chunks: Dict[Vec3i, VoxelChunk] = {}
+        self._dirty: set[Vec3i] = set()
+        self.faces = DEFAULT_FACES
+        self._use_rust = is_native_available()
+
+    def _chunk_of(self, x: int, y: int, z: int) -> Vec3i:
+        s = self.chunk_size
+        return (x // s, y // s, z // s)
+
+    def mark_dirty_at(self, x: int, y: int, z: int):
+        cx, cy, cz = self._chunk_of(x, y, z)
+        for dx in (-1, 0, 1):
+            for dy in (-1, 0, 1):
+                for dz in (-1, 0, 1):
+                    key = (cx + dx, cy + dy, cz + dz)
+                    self._dirty.add(key)
+                    if key in self.chunks:
+                        self.chunks[key].dirty = True
+
+    def rebuild_all(self):
+        self._dirty.clear()
+        for key in list(self.chunks.keys()):
+            self._dirty.add(key)
+
+    def mark_all_dirty(self):
+        for ch in self.chunks.values():
+            ch.dirty = True
+        self._dirty = set(self.chunks.keys())
+
+    def notify_block_change(self, x: int, y: int, z: int):
+        self.mark_dirty_at(x, y, z)
+
+    def _build_chunk_mesh(self, cx: int, cy: int, cz: int) -> Dict[int, Mesh]:
+        s = self.chunk_size
+        x0, y0, z0 = cx * s, cy * s, cz * s
+        x1, y1, z1 = x0 + s, y0 + s, z0 + s
+
+        if self._use_rust:
+            fresh = _rust_build_chunk(
+                self.get_block, x0, y0, z0, x1, y1, z1, self.block_types or None
+            )
+        else:
+            fresh = _python_build_chunk(
+                self.get_block, x0, y0, z0, x1, y1, z1, self.block_types or None, self.faces
+            )
+
+        chunk = self.chunks.get((cx, cy, cz))
+        meshes = {}
+        for bid, mesh in fresh.items():
+            old = chunk.meshes.get(bid) if chunk else None
+            if old is not None:
+                old.update_data(mesh.vertices, mesh.indices)
+                meshes[bid] = old
+            else:
+                meshes[bid] = mesh
+        return meshes
+
+    def flush_dirty(self):
+        out = {}
+        removed = []
+        for key in list(self._dirty):
+            cx, cy, cz = key
+            if key not in self.chunks:
+                self.chunks[key] = VoxelChunk(cx, cy, cz)
+            ch = self.chunks[key]
+            old_bids = set(ch.meshes.keys())
+            new_meshes = self._build_chunk_mesh(cx, cy, cz)
+            new_bids = set(new_meshes.keys())
+            for bid in old_bids - new_bids:
+                old = ch.meshes.get(bid)
+                if old:
+                    old.destroy()
+                removed.append((cx, cy, cz, bid))
+            for old in ch.meshes.values():
+                if old not in new_meshes.values():
+                    old.destroy()
+            ch.meshes = new_meshes
+            ch.dirty = False
+            for bid, mesh in new_meshes.items():
+                out[(cx, cy, cz, bid)] = mesh
+            self._dirty.discard(key)
+        return out, removed
+
+    def get_all_meshes(self) -> Dict[Tuple[int, int, int, int], Mesh]:
+        result = {}
+        for key, ch in self.chunks.items():
+            for bid, mesh in ch.meshes.items():
+                cx, cy, cz = key
+                result[(cx, cy, cz, bid)] = mesh
+        return result
+
+    def ensure_chunk(self, x: int, y: int, z: int):
+        key = self._chunk_of(x, y, z)
+        if key not in self.chunks:
+            self.chunks[key] = VoxelChunk(*key)
+            self._dirty.add(key)
+
+    def prime_chunks(self, blocks: Dict[Vec3i, int]):
+        for (x, y, z) in blocks.keys():
+            self.ensure_chunk(x, y, z)
+            self.mark_dirty_at(x, y, z)