From 5474cc66552628ae9f0089c1f780df40503e71d4 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 3 Apr 2024 00:02:45 +0200 Subject: [PATCH] fix: wrong preprocessing of technique templates --- raw/iw4/techniques/distortion_scale.tech.template | 8 ++++---- raw/iw4/techniques/particle_cloud.tech.template | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/raw/iw4/techniques/distortion_scale.tech.template b/raw/iw4/techniques/distortion_scale.tech.template index 0589dc76..9797b66c 100644 --- a/raw/iw4/techniques/distortion_scale.tech.template +++ b/raw/iw4/techniques/distortion_scale.tech.template @@ -22,13 +22,13 @@ #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 PIXEL_SHADER "distortion" + ZFEATHER_SUFFIX + ".hlsl" +#set VERTEX_SHADER "\"" + "distortion_scale" + UV_ANIM_SUFFIX + ZFEATHER_SUFFIX + DTEX_SUFFIX + ".hlsl" + "\"" +#set PIXEL_SHADER "\"" + "distortion" + ZFEATHER_SUFFIX + ".hlsl" + "\"" { stateMap "default"; - vertexShader 3.0 "VERTEX_SHADER" + vertexShader 3.0 VERTEX_SHADER { worldViewProjectionMatrix = constant.transposeWorldViewProjectionMatrix; #ifdef UV_ANIM @@ -37,7 +37,7 @@ distortionScale = material.distortionScale; } - pixelShader 3.0 "PIXEL_SHADER" + pixelShader 3.0 PIXEL_SHADER { normalMapSampler = material.colorMap; colorMapSampler = sampler.resolvedPostSun; diff --git a/raw/iw4/techniques/particle_cloud.tech.template b/raw/iw4/techniques/particle_cloud.tech.template index 41e22e6e..0b27dab1 100644 --- a/raw/iw4/techniques/particle_cloud.tech.template +++ b/raw/iw4/techniques/particle_cloud.tech.template @@ -40,13 +40,13 @@ #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 PIXEL_SHADER "particle_cloud" + SPARK_SUFFIX + OUTDOOR_SUFFIX + SPOT_SUFFIX + SHADOW_SUFFIX + PREMUL_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" + "\"" { stateMap "default"; - vertexShader 3.0 "VERTEX_SHADER" + vertexShader 3.0 VERTEX_SHADER { worldViewMatrix = constant.transposeWorldViewMatrix; #if MODE == "spark" @@ -62,7 +62,7 @@ #endif } - pixelShader 3.0 "PIXEL_SHADER" + pixelShader 3.0 PIXEL_SHADER { colorMapSampler = material.colorMap; #ifdef OUTDOOR