From ef7ba24eccddc16068fe5dafaa9ccafa7248e6cd Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 9 Jul 2025 10:46:37 +0800 Subject: [PATCH] don't fade grid axes depending on camera angle --- materials/grid.mat | 13 +- thermion_dart/native/include/material/grid.S | 2 +- .../native/include/material/grid.apple.S | 2 +- .../native/include/material/grid.bin | Bin 50913 -> 49793 bytes thermion_dart/native/include/material/grid.c | 4304 ++++++++--------- 5 files changed, 2134 insertions(+), 2187 deletions(-) diff --git a/materials/grid.mat b/materials/grid.mat index 928cabf9..47b2a062 100644 --- a/materials/grid.mat +++ b/materials/grid.mat @@ -108,10 +108,13 @@ fragment { 1.0 ); - color.rgb = (axes.x < 1e-8) ? color.rgb : AXIS_COLOR_X; - color.rgb = (axes.z < 1e-8) ? color.rgb : AXIS_COLOR_Z; - - material.baseColor = color * gridAlpha; - + if(axes.x > 1e-8) { + material.baseColor = vec4(AXIS_COLOR_X, 1.0); + } else if(axes.z > 1e-8) { + material.baseColor = vec4(AXIS_COLOR_Z, 1.0); + } else { + material.baseColor = color * gridAlpha; + } + } } \ No newline at end of file diff --git a/thermion_dart/native/include/material/grid.S b/thermion_dart/native/include/material/grid.S index 53926b92..9b8e9ba6 100644 --- a/thermion_dart/native/include/material/grid.S +++ b/thermion_dart/native/include/material/grid.S @@ -8,5 +8,5 @@ GRID_PACKAGE: GRID_GRID_OFFSET: .int 0 GRID_GRID_SIZE: - .int 50913 + .int 49793 diff --git a/thermion_dart/native/include/material/grid.apple.S b/thermion_dart/native/include/material/grid.apple.S index eda76fce..fc801994 100644 --- a/thermion_dart/native/include/material/grid.apple.S +++ b/thermion_dart/native/include/material/grid.apple.S @@ -8,5 +8,5 @@ _GRID_PACKAGE: _GRID_GRID_OFFSET: .int 0 _GRID_GRID_SIZE: - .int 50913 + .int 49793 diff --git a/thermion_dart/native/include/material/grid.bin b/thermion_dart/native/include/material/grid.bin index 7c108ae574c820e72a7c850689f13fb9dc6abeb1..9d248deb7c8a32cf7cb63fb35bd681c79a0db82f 100644 GIT binary patch delta 11189 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