Shader rework #775

Merged

SakulFlee merged 48 commits from shader-rework into main 2026-09-07 00:03:33 +00:00

Conversation 0 Commits 48 Files changed 183 +3928 -1729

SakulFlee commented 2026-09-06 15:44:50 +00:00

Owner

Copy link

This changes the shader system by splitting it up into individual "nodes" which can be chained together. Think of it as a in-source/code node graph. Later, we can extend this with a visual "Node editor".

This changes the shader system by splitting it up into individual "nodes" which can be chained together. Think of it as a in-source/code node graph. Later, we can extend this with a visual "Node editor".

SakulFlee self-assigned this 2026-09-06 15:44:50 +00:00

SakulFlee added 21 commits 2026-09-06 15:44:50 +00:00

feat(shader-preprocessor): rewrite with node-based shader system ... 880b63752c

Replace the runtime filesystem-based shader loading with a code-defined
node system. Each WGSL function/struct/constant is a named ShaderNode
that can be assembled at build time via ShaderBuilder.

New modules:
- node.rs: ShaderNode with name, source, and dependency tracking
- library.rs: NodeLibrary for grouping related nodes
- registry.rs: NodeRegistry with global lazy-init and idempotent registration
- builder.rs: ShaderBuilder with dependency-cycle detection and debug flag
- prelude.rs: Engine's built-in node library (30 nodes: constants, structs, BRDF functions, sky math)

The prelude replaces the old #import preprocessor. Android-portability
goal: no filesystem-based shader loading at runtime.

feat(shader-core): create orbital_shader_core crate ... 5db60cfd3c

ShaderDescriptor trait for node-based shader assembly, VariableType/Variables
for bind-group building, ShaderError type. Replaces the old ShaderSource enum
and #import preprocessor with node-graph-based assembly.

feat(texture): create orbital_texture crate ... 9038b4ff60

Texture, TextureDescriptor, TextureSize, FilterMode, BufferDescriptor,
TextureError. Extracted from orbital_resources.

feat(math): create orbital_math crate ... ced0acc6ce

Transform, projection utilities (perspective_wgpu, ortho_wgpu), Mode<T>
generic (moved from orbital_camera). Extracted from orbital_resources.

feat(vertex): create orbital_vertex crate ... e426e7921b

Vertex type with position, normal, tangent, bitangent, uv and their
GPU buffer layout descriptors. Extracted from orbital_resources.

feat(shader-math): create orbital_shader_math crate ... 7c730ebec6

22 WGSL node files for math utilities: distribution_ggx, schlick_smith_ggx,
fresnel_schlick_roughness, radical_inverse, hammersley, importance sampling,
slope_scaled_bias, luminance, etc. Each function is its own node.

feat(shader-engine): create orbital_shader_engine crate ... e08d7e2546

16 WGSL node files for engine-wide structs and layouts: CameraUniform,
Light, VertexData, InstanceData, FragmentData, ShadowSlot, sky_params,
sky_color, etc. Shared across all material shaders.

feat(shader-pbr): create orbital_shader_pbr crate ... 692235b440

12 PBR-specific WGSL nodes (BRDF orchestration, material data gathering,
IBL, shadow sampling) plus PBRMaterialShaderDescriptor that assembles
the full PBR material shader from reusable node libraries.

feat(shader-debug): create orbital_shader_debug crate ... eca6e11b2c

Wireframe debug shader with node-based assembly. wireframe_descriptor()
returns a MaterialShaderDescriptor using reusable engine/math nodes.

feat(material-shader): create orbital_material_shader crate ... ae6058b4ca

MaterialShader, MaterialShaderDescriptor (node-based), MaterialShaderCache,
VertexStageLayout, make_world_bind_group_layout. The central material
shader system that assembles WGSL from named node libraries.

feat(camera): create orbital_camera crate ... 21a9af57b2

Camera, CameraDescriptor, CameraChange, Frustum. Re-exports Mode<T>
from orbital_math for backward compatibility. Extracted from orbital_resources.

feat(cull): create orbital_cull crate ... 8074003ad0

CullResources with inline GPU frustum-cull compute shader.
Extracted from orbital_resources.

feat(scene-crates): create ibl_brdf, instance, light, mesh, model, shadow crates ... 2cc058d357

Fine-grained crates extracted from orbital_resources:
- orbital_ibl_brdf: IBL BRDF LUT generation shader
- orbital_instance: Instance type and InstanceDescriptor
- orbital_light: LightType and LightDescriptor
- orbital_mesh: Mesh, MeshDescriptor, bounds, cache
- orbital_model: Model and ModelDescriptor
- orbital_shadow: ShadowRenderer and shadow depth shader

feat(world-environment): create orbital_world_environment crate ... 9856ebf907

WorldEnvironment, descriptors, error types, cache_file, sampling/skybox types,
9 WGSL shader files for sky generation, IBL, and material shaders.
Extracted from orbital_resources.

refactor(resources): dissolve orbital_resources into re-export shim ... d79b3c8f97

Delete all old source modules (camera, texture, light, mesh, etc.) and
convert lib.rs to a thin re-export layer: pub use <crate>::* for all
15 sub-crates. Provides backward compatibility for existing imports.

refactor(imports): update dependent crates to use new fine-grained imports ... b2e553e24a

Switch orbital_procgeo, orbital_app, orbital_renderer, orbital_ecs_bridge,
orbital_importer_gltf, and orbital_debug_render to import directly from
specific crates (orbital_camera, orbital_light, etc.) instead of
orbital_resources.

chore(cleanup): delete superseded .wgsl files from Assets/Shaders ... a055163661

Remove monolithic shader files that have been decomposed into node-based
equivalents in the new crate structure:
- pbr.wgsl (598 lines) → 14 node files in orbital_shader_pbr
- default.wgsl → orbital_material_shader/src/default_shader.wgsl
- wireframe.wgsl → orbital_shader_debug::wireframe_descriptor()
- test.wgsl, instance_cull.wgsl → unreferenced

Keep shadow_depth.wgsl (actively used by orbital_shadow via include_str!).

test(shaders): add naga validation for PBR nodes and assembled shaders ... 77a79c9227

Add 5 new validation tests (19 total, up from 16):
- every_pbr_node_is_valid_with_its_dependencies: validates self-contained
  PBR nodes individually with transitive dependency resolution
- node_assembled_pbr_shader_is_valid_wgsl: validates full PBR shader
  assembled from 34 named nodes + entrypoint raw source
- node_assembled_world_env_texture_is_valid_wgsl: validates assembled
  texture-based skybox material shader
- node_assembled_world_env_analytic_is_valid_wgsl: validates assembled
  analytic skybox material shader

Also fix fresnel_schlick signature in prelude (was incorrectly taking
PBRData, now correctly takes F0: vec3<f32>) and remove stale PBRData
mock from the prelude node validation test.

chore: remove sync conflict file from orbital_shader_pbr 1f3f642127

fix(registry): register all shader node libraries in global registry ... 8a2785d1c0

The PBR shader failed at runtime with UnknownNode { name: 'pbr_factors' }
because the PBR/math/engine/world-environment node libraries were never
registered in the global NodeRegistry. Only the prelude was loaded.

Changes:
- Replace OnceLock<NodeRegistry> with LazyLock<RwLock<NodeRegistry>> to
  allow late registration of additional libraries
- Add register_global_library() public function
- Register math, engine, PBR, and world-environment libraries at app
  startup before any shader assembly occurs

Updated Cargo.lock c6d2b2c071

SakulFlee added 2 commits 2026-09-06 16:14:40 +00:00

Merge origin/main into shader-rework ... 373e37f757

Resolve 5 conflicts:
- Assets/Shaders/pbr.wgsl: keep deleted (superseded by node-based PBR)
- cull.rs: keep fine-grained imports (orbital_cull, orbital_instance)
- orbital_cull/src/lib.rs: take main's CPU-only cleanup (remove stale GPU
  compute imports)
- wgsl_shaders.rs: keep expanded node-graph tests
- shader_preprocessor/lib.rs: keep node-based system (old ShaderPreprocessor
  superseded)

Also absorbs main's changes: CPU frustum culling rewrite, sky_common.wgsl
updates, CI migration, Android device handling fixes.

chore: update Cargo.lock after merge a3e1e240d6

forgejo-actions added 1 commit 2026-09-06 16:15:03 +00:00

style: auto-format code 3223cb87cd

SakulFlee added 11 commits 2026-09-06 17:06:16 +00:00

feat(cli): minimal-only init template with procgeo cube on plane 260411eeba

style: auto-format code 874aba4d2e

Attempting to fix portrait view format on mobile platforms c336bebb34

fix(android): sync camera aspect on resume after rotation ... fd810f4f92

On Android, device rotation triggers suspended→resumed (native window
destroyed/recreated), not WindowEvent::Resized.  The surface and
renderer were recreated with the new portrait dimensions, but the
camera's CameraDescriptorEcs.aspect stayed at the original 16/9 —
causing a projection mismatch that rendered everything black in portrait.

Sync the camera aspect ratio and WindowSize resource in resumed() to
match the freshly-created surface configuration.

revert(android): undo orientation fixes to restore rotation ... 5cc6fa55ae

Reverts 625468f3 and 37bd65a8 which broke rotation on Android.
The Resized handler and resumed() are back to their original state.
Rotation works again; portrait still shows black (known issue).

fix: handle WiFi ADB serials containing spaces in device list parsing ... 9ccf1fefdc

The list_devices() parser used split_whitespace().next() to extract the
device serial from 'adb devices' output. WiFi ADB serials like
'adb-d6260ff205bc-htaRwx (3)._adb-tls-connect._tcp' contain spaces,
causing the serial to be truncated and the device to be silently skipped.

Parse the line by scanning for the device state keyword instead, so the
full serial (including spaces) is captured correctly.

fix: recognize tab separator in adb devices output ... 8c24093923

The previous fix checked for a space character before the state keyword,
but adb devices uses a tab character to separate the serial from the
state column. This caused WiFi ADB serials (which contain spaces) to
still be silently skipped.

Use is_ascii_whitespace() instead of == b' ' to handle both tabs and
spaces. Also fix the 'no permissions' branch which had the same issue.

fix(android): change default screen orientation to unspecified ... f93c880f79

Previously defaulted to 'landscape' which locked the activity and
prevented Android from triggering rotation on device tilt.

fix(android): sync camera aspect and depth texture on rotation ... 50cd9f17ea

Three fixes for portrait rendering after Android rotation:

1. resumed(): Update CameraDescriptorEcs.aspect and WindowSize
   after the surface is recreated with new dimensions, so the
   projection matrix matches the portrait surface.

2. Resized handler: Call renderer.change_resolution() to recreate
   the depth texture at the new surface dimensions, preventing a
   depth-attachment size mismatch that causes the 3D scene to fail
   silently (black clear color remains while overlays still render).

3. Resized handler: Update camera aspect ratio and mark CameraDirty
   so realize_cameras propagates the new aspect to the GPU buffer.

style: auto-format code 141c361fc8

fix: auto-fix clippy warnings db3cc441c6

forgejo-actions added 1 commit 2026-09-06 17:06:37 +00:00

style: auto-format code 77bf3ee23d

SakulFlee added 10 commits 2026-09-06 21:08:13 +00:00

feat(cli): minimal-only init template with procgeo cube on plane eb46f95e8a

style: auto-format code a4aadc825a

Attempting to fix portrait view format on mobile platforms c12346f37a

fix(android): sync camera aspect on resume after rotation ... 1c0ed7b1b8

On Android, device rotation triggers suspended→resumed (native window
destroyed/recreated), not WindowEvent::Resized.  The surface and
renderer were recreated with the new portrait dimensions, but the
camera's CameraDescriptorEcs.aspect stayed at the original 16/9 —
causing a projection mismatch that rendered everything black in portrait.

Sync the camera aspect ratio and WindowSize resource in resumed() to
match the freshly-created surface configuration.

revert(android): undo orientation fixes to restore rotation ... 8f7e7f4c9d

Reverts 625468f3 and 37bd65a8 which broke rotation on Android.
The Resized handler and resumed() are back to their original state.
Rotation works again; portrait still shows black (known issue).

fix: handle WiFi ADB serials containing spaces in device list parsing ... f08c6161ec

The list_devices() parser used split_whitespace().next() to extract the
device serial from 'adb devices' output. WiFi ADB serials like
'adb-d6260ff205bc-htaRwx (3)._adb-tls-connect._tcp' contain spaces,
causing the serial to be truncated and the device to be silently skipped.

Parse the line by scanning for the device state keyword instead, so the
full serial (including spaces) is captured correctly.

fix: recognize tab separator in adb devices output ... 3a20a47c65

The previous fix checked for a space character before the state keyword,
but adb devices uses a tab character to separate the serial from the
state column. This caused WiFi ADB serials (which contain spaces) to
still be silently skipped.

Use is_ascii_whitespace() instead of == b' ' to handle both tabs and
spaces. Also fix the 'no permissions' branch which had the same issue.

fix(android): sync camera aspect and depth texture on rotation ... 0b40ce5cc6

Three fixes for portrait rendering after Android rotation:

1. resumed(): Update CameraDescriptorEcs.aspect and WindowSize
   after the surface is recreated with new dimensions, so the
   projection matrix matches the portrait surface.

2. Resized handler: Call renderer.change_resolution() to recreate
   the depth texture at the new surface dimensions, preventing a
   depth-attachment size mismatch that causes the 3D scene to fail
   silently (black clear color remains while overlays still render).

3. Resized handler: Update camera aspect ratio and mark CameraDirty
   so realize_cameras propagates the new aspect to the GPU buffer.

style: auto-format code a1d6d1f514

fix: auto-fix clippy warnings 252f6e8065

forgejo-actions added 1 commit 2026-09-06 21:08:36 +00:00

style: auto-format code af06e7e94a

SakulFlee force-pushed shader-rework from af06e7e94a to cb04b9bcef 2026-09-06 22:53:11 +00:00 Compare

forgejo-actions added 1 commit 2026-09-06 22:54:06 +00:00

style: auto-format code cafbadbd90

SakulFlee merged commit 7d24c079bf into main 2026-09-07 00:03:33 +00:00

SakulFlee referenced this pull request from a commit 2026-09-07 00:03:35 +00:00

Merge pull request 'Shader rework' (#775) from shader-rework into main

SakulFlee added the

Context: Enhancements

label 2026-09-25 02:39:03 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Context: Bug

Something isn't working as intended

  

Context: Enhancements

Enhancements of existing features

  

Platform: Android

ONLY if this is platform specific!

  

Platform: Linux

ONLY if this is platform specific!

  

Platform: Web

ONLY if this is platform specific!

  

Platform: Windows

ONLY if this is platform specific!

  

Platform: iOS

ONLY if this is platform specific!

  

Platform: macOS

ONLY if this is platform specific!

  

Target: CI

GitHub Actions / CI related tasks

  

Target: CLI

  

Target: Dependency

  

Target: Engine

No labels

Context: Bug

Context: Enhancements

Platform: Android

Platform: Linux

Platform: Web

Platform: Windows

Platform: iOS

Platform: macOS

Target: CI

Target: CLI

Target: Dependency

Target: Engine

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

SakulFlee

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

SakulFlee/Orbital!775

No description provided.