TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'LinuxCompatabilityFixes' of https://github.com/Bloodknight/Torque3D into development

Browse source
This commit is contained in:
Areloch 2018-03-17 14:07:26 -05:00
commit 485f5bc942
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl
View file

@ -21,7 +21,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "./../../torque.hlsl" #include "./../../torque.hlsl"
#include "./../postFX.hlsl" #include "./../postFx.hlsl"
struct VertToPix struct VertToPix
{ {

2
Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl" #include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl" #include "./../postFx.hlsl"
TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0); TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0);

2
Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl" #include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl" #include "./../postFx.hlsl"
#define DOSMALL #define DOSMALL

6
Templates/Full/game/art/shapes/weapons/Grenade/materials.cs
View file

@ -49,11 +49,11 @@ singleton Material(debri_debris)
{ {
mapTo = "debris"; mapTo = "debris";
diffuseColor[0] = "0.7 0.7 0.7 1"; diffuseColor[0] = "0.7 0.7 0.7 1";
diffuseMap[0] = "rock_diffuse.dds"; diffuseMap[0] = "rock_d";
normalMap[0] = "rock_normals.dds"; normalMap[0] = "rock_n";
specularMap[0] = "rock_s";
specular[0] = "1 1 1 0"; specular[0] = "1 1 1 0";
specularPower[0] = "50"; specularPower[0] = "50";
specularMap[0] = "rock_specular.dds";
castShadows = "0"; castShadows = "0";
translucentBlendOp = "None"; translucentBlendOp = "None";
materialTag0 = "Weapon"; materialTag0 = "Weapon";

0
Templates/Full/game/art/shapes/weapons/Grenade/rock_diffuse.DDS → Templates/Full/game/art/shapes/weapons/Grenade/rock_d.dds
View file

0
Templates/Full/game/art/shapes/weapons/Grenade/rock_normals.DDS → Templates/Full/game/art/shapes/weapons/Grenade/rock_n.dds
View file

0
Templates/Full/game/art/shapes/weapons/Grenade/rock_specular.DDS → Templates/Full/game/art/shapes/weapons/Grenade/rock_s.dds
View file

2
Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl
View file

@ -21,7 +21,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "./../../torque.hlsl" #include "./../../torque.hlsl"
#include "./../postFX.hlsl" #include "./../postFx.hlsl"
struct VertToPix struct VertToPix
{ {

2
Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl" #include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl" #include "./../postFx.hlsl"
TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0); TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0);

2
Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl" #include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl" #include "./../postFx.hlsl"
#define DOSMALL #define DOSMALL