GameCult/CultLib
Watch
9
0
Fork
You've already forked CultLib
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use compiler-portable geometry shader includes

Browse source
This commit is contained in:
Meta Vens 2026-07-22 04:07:20 +01:00
commit cdeea47454
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/GameCult.Geometry/Shaders/GameCult.Geometry.hlsl
View file

@ -1,11 +1,11 @@
#ifndef GAMECULT_GEOMETRY_HLSL
#define GAMECULT_GEOMETRY_HLSL
#ifndef GAMECULT_GEOMETRY_CULTMATH_INCLUDE
#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE "CultMath.hlsl"
#if defined(GAMECULT_GEOMETRY_UNITY_PACKAGE)
#include "Packages/org.gamecult.cultmath/shaders/CultMath.hlsl"
#else
#include "CultMath/CultMath.hlsl"
#endif
#include GAMECULT_GEOMETRY_CULTMATH_INCLUDE
#include "AdvancedErosionFilter.hlsl"
#include "Planetary.hlsl"
#include "SphericalErosion.hlsl"

6
tests/GameCult.Geometry.Tests/GeometryShaderOwnershipTests.cs
View file

@ -16,8 +16,8 @@ public sealed class GeometryShaderOwnershipTests
var spherical = File.ReadAllText(Path.Combine(shaders, "SphericalErosion.hlsl"));
var refinement = File.ReadAllText(Path.Combine(shaders, "PlanetaryRadialRefinement.hlsl"));
Assert.That(umbrella, Does.Contain("#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE \"CultMath.hlsl\"")
.And.Contain("#include GAMECULT_GEOMETRY_CULTMATH_INCLUDE")
Assert.That(umbrella, Does.Contain("#include \"CultMath/CultMath.hlsl\"")
.And.Contain("#include \"Packages/org.gamecult.cultmath/shaders/CultMath.hlsl\"")
.And.Contain("#include \"AdvancedErosionFilter.hlsl\"")
.And.Contain("#include \"Planetary.hlsl\"")
.And.Contain("#include \"SphericalErosion.hlsl\"")
@ -54,7 +54,7 @@ public sealed class GeometryShaderOwnershipTests
"GameCultGeometryPlanetaryViewer.shader"));
Assert.That(shader, Does.Contain(
"#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE \"Packages/org.gamecult.cultmath/shaders/CultMath.hlsl\"")
"#define GAMECULT_GEOMETRY_UNITY_PACKAGE 1")
.And.Contain("#include \"Packages/org.gamecult.geometry/Shaders/GameCult.Geometry.hlsl\"")
.And.Contain("gamecult_geometry_planetary_field_sample")
.And.Not.Contain("cultmath_planetary_")

2
unity/org.gamecult.geometry/Samples~/PlanetaryViewer/Runtime/GameCultGeometryPlanetaryViewer.shader
View file

@ -18,7 +18,7 @@ Shader "GameCult.Geometry/Planetary Field Viewer"
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
#define GAMECULT_GEOMETRY_CULTMATH_INCLUDE "Packages/org.gamecult.cultmath/shaders/CultMath.hlsl"
#define GAMECULT_GEOMETRY_UNITY_PACKAGE 1
#include "Packages/org.gamecult.geometry/Shaders/GameCult.Geometry.hlsl"
float _Radius;