From 6a6981b956deb13fd59f3baee514900dfc306ce4 Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Sun, 11 Feb 2018 14:14:47 +0000 Subject: [PATCH 1/3] ShaderModelAutoGen --- .../BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl | 2 +- Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl | 2 +- Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl | 2 +- Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl index a47261397..5bdf9a77d 100644 --- a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl +++ b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../ShaderModelAutoGen.hlsl" +#include "../../shaderModelAutoGen.hlsl" #include "./../postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0); diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl index 67365e846..ff31a4b8b 100644 --- a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl +++ b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../ShaderModelAutoGen.hlsl" +#include "../../shaderModelAutoGen.hlsl" #include "./../postFx.hlsl" #define DOSMALL diff --git a/Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl b/Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl index a47261397..5bdf9a77d 100644 --- a/Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl +++ b/Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../ShaderModelAutoGen.hlsl" +#include "../../shaderModelAutoGen.hlsl" #include "./../postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0); diff --git a/Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl b/Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl index 67365e846..ff31a4b8b 100644 --- a/Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl +++ b/Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../ShaderModelAutoGen.hlsl" +#include "../../shaderModelAutoGen.hlsl" #include "./../postFx.hlsl" #define DOSMALL From c7d9b3386a047a373b1d1de816f9d10ad032de35 Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Sun, 11 Feb 2018 14:29:39 +0000 Subject: [PATCH 2/3] PostFX.hlsl --- Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl | 2 +- Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl index 3bef0a4d3..f2974c587 100644 --- a/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl +++ b/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- #include "./../../torque.hlsl" -#include "./../postFX.hlsl" +#include "./../postFx.hlsl" struct VertToPix { diff --git a/Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl b/Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl index 3bef0a4d3..f2974c587 100644 --- a/Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl +++ b/Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- #include "./../../torque.hlsl" -#include "./../postFX.hlsl" +#include "./../postFx.hlsl" struct VertToPix { From 24ac1b48e80b5c217ad7f4e256b3d5bf43756f16 Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Sun, 11 Feb 2018 17:27:04 +0000 Subject: [PATCH 3/3] rock_* fixes --- .../game/art/shapes/weapons/Grenade/materials.cs | 8 ++++---- .../Grenade/{rock_diffuse.DDS => rock_d.dds} | Bin .../Grenade/{rock_normals.DDS => rock_n.dds} | Bin .../Grenade/{rock_specular.DDS => rock_s.dds} | Bin .../art/shapes/weapons/Grenade/materials.cs | 8 ++++---- .../Grenade/{rock_diffuse.DDS => rock_d.dds} | Bin .../Grenade/{rock_normals.DDS => rock_n.dds} | Bin .../Grenade/{rock_specular.DDS => rock_s.dds} | Bin 8 files changed, 8 insertions(+), 8 deletions(-) rename Templates/Full/game/art/shapes/weapons/Grenade/{rock_diffuse.DDS => rock_d.dds} (100%) rename Templates/Full/game/art/shapes/weapons/Grenade/{rock_normals.DDS => rock_n.dds} (100%) rename Templates/Full/game/art/shapes/weapons/Grenade/{rock_specular.DDS => rock_s.dds} (100%) rename Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/{rock_diffuse.DDS => rock_d.dds} (100%) rename Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/{rock_normals.DDS => rock_n.dds} (100%) rename Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/{rock_specular.DDS => rock_s.dds} (100%) diff --git a/Templates/Full/game/art/shapes/weapons/Grenade/materials.cs b/Templates/Full/game/art/shapes/weapons/Grenade/materials.cs index 569f28ed0..ba26267da 100644 --- a/Templates/Full/game/art/shapes/weapons/Grenade/materials.cs +++ b/Templates/Full/game/art/shapes/weapons/Grenade/materials.cs @@ -49,11 +49,11 @@ singleton Material(debri_debris) { mapTo = "debris"; diffuseColor[0] = "0.7 0.7 0.7 1"; - diffuseMap[0] = "rock_diffuse.dds"; - normalMap[0] = "rock_normals.dds"; + diffuseMap[0] = "rock_d"; + normalMap[0] = "rock_n"; + specularMap[0] = "rock_s"; specular[0] = "1 1 1 0"; - specularPower[0] = "50"; - specularMap[0] = "rock_specular.dds"; + specularPower[0] = "50"; castShadows = "0"; translucentBlendOp = "None"; materialTag0 = "Weapon"; diff --git a/Templates/Full/game/art/shapes/weapons/Grenade/rock_diffuse.DDS b/Templates/Full/game/art/shapes/weapons/Grenade/rock_d.dds similarity index 100% rename from Templates/Full/game/art/shapes/weapons/Grenade/rock_diffuse.DDS rename to Templates/Full/game/art/shapes/weapons/Grenade/rock_d.dds diff --git a/Templates/Full/game/art/shapes/weapons/Grenade/rock_normals.DDS b/Templates/Full/game/art/shapes/weapons/Grenade/rock_n.dds similarity index 100% rename from Templates/Full/game/art/shapes/weapons/Grenade/rock_normals.DDS rename to Templates/Full/game/art/shapes/weapons/Grenade/rock_n.dds diff --git a/Templates/Full/game/art/shapes/weapons/Grenade/rock_specular.DDS b/Templates/Full/game/art/shapes/weapons/Grenade/rock_s.dds similarity index 100% rename from Templates/Full/game/art/shapes/weapons/Grenade/rock_specular.DDS rename to Templates/Full/game/art/shapes/weapons/Grenade/rock_s.dds diff --git a/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/materials.cs b/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/materials.cs index 569f28ed0..ba26267da 100644 --- a/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/materials.cs +++ b/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/materials.cs @@ -49,11 +49,11 @@ singleton Material(debri_debris) { mapTo = "debris"; diffuseColor[0] = "0.7 0.7 0.7 1"; - diffuseMap[0] = "rock_diffuse.dds"; - normalMap[0] = "rock_normals.dds"; + diffuseMap[0] = "rock_d"; + normalMap[0] = "rock_n"; + specularMap[0] = "rock_s"; specular[0] = "1 1 1 0"; - specularPower[0] = "50"; - specularMap[0] = "rock_specular.dds"; + specularPower[0] = "50"; castShadows = "0"; translucentBlendOp = "None"; materialTag0 = "Weapon"; diff --git a/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_diffuse.DDS b/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_d.dds similarity index 100% rename from Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_diffuse.DDS rename to Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_d.dds diff --git a/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_normals.DDS b/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_n.dds similarity index 100% rename from Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_normals.DDS rename to Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_n.dds diff --git a/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_specular.DDS b/Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_s.dds similarity index 100% rename from Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_specular.DDS rename to Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/rock_s.dds