fix: wrong preprocessing of technique templates

This commit is contained in:
Jan 2024-04-03 00:02:45 +02:00
parent 976fbf94f8
commit 5474cc6655
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 8 additions and 8 deletions

View File

@ -22,13 +22,13 @@
#filename "distortion_scale" + UV_ANIM_SUFFIX + ZFEATHER_SUFFIX + DTEX_SUFFIX + ".tech" #filename "distortion_scale" + UV_ANIM_SUFFIX + ZFEATHER_SUFFIX + DTEX_SUFFIX + ".tech"
#set VERTEX_SHADER "distortion_scale" + UV_ANIM_SUFFIX + ZFEATHER_SUFFIX + DTEX_SUFFIX + ".hlsl" #set VERTEX_SHADER "\"" + "distortion_scale" + UV_ANIM_SUFFIX + ZFEATHER_SUFFIX + DTEX_SUFFIX + ".hlsl" + "\""
#set PIXEL_SHADER "distortion" + ZFEATHER_SUFFIX + ".hlsl" #set PIXEL_SHADER "\"" + "distortion" + ZFEATHER_SUFFIX + ".hlsl" + "\""
{ {
stateMap "default"; stateMap "default";
vertexShader 3.0 "VERTEX_SHADER" vertexShader 3.0 VERTEX_SHADER
{ {
worldViewProjectionMatrix = constant.transposeWorldViewProjectionMatrix; worldViewProjectionMatrix = constant.transposeWorldViewProjectionMatrix;
#ifdef UV_ANIM #ifdef UV_ANIM
@ -37,7 +37,7 @@
distortionScale = material.distortionScale; distortionScale = material.distortionScale;
} }
pixelShader 3.0 "PIXEL_SHADER" pixelShader 3.0 PIXEL_SHADER
{ {
normalMapSampler = material.colorMap; normalMapSampler = material.colorMap;
colorMapSampler = sampler.resolvedPostSun; colorMapSampler = sampler.resolvedPostSun;

View File

@ -40,13 +40,13 @@
#filename "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + PREMUL_SUFFIX + SPOT_SUFFIX + SHADOW_SUFFIX + ".tech" #filename "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + PREMUL_SUFFIX + SPOT_SUFFIX + SHADOW_SUFFIX + ".tech"
#set VERTEX_SHADER "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + SPOT_SUFFIX + ".hlsl" #set VERTEX_SHADER "\"" + "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + SPOT_SUFFIX + ".hlsl" + "\""
#set PIXEL_SHADER "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + SPOT_SUFFIX + SHADOW_SUFFIX + PREMUL_SUFFIX + ".hlsl" #set PIXEL_SHADER "\"" + "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + SPOT_SUFFIX + SHADOW_SUFFIX + PREMUL_SUFFIX + ".hlsl" + "\""
{ {
stateMap "default"; stateMap "default";
vertexShader 3.0 "VERTEX_SHADER" vertexShader 3.0 VERTEX_SHADER
{ {
worldViewMatrix = constant.transposeWorldViewMatrix; worldViewMatrix = constant.transposeWorldViewMatrix;
#if MODE == "spark" #if MODE == "spark"
@ -62,7 +62,7 @@
#endif #endif
} }
pixelShader 3.0 "PIXEL_SHADER" pixelShader 3.0 PIXEL_SHADER
{ {
colorMapSampler = material.colorMap; colorMapSampler = material.colorMap;
#ifdef OUTDOOR #ifdef OUTDOOR