TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from alphaslime/Ribbon-Implementation-Smallpatch

Browse source 
Fixed a shader related crash and textured ribbon's material
This commit is contained in:
Lukas Joergensen 2014-10-21 07:03:31 +02:00
commit 40bdf19265
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
View file

@ -1,5 +1,5 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "../shdrConsts.h"
struct v2f
{

2
Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
View file

@ -1,5 +1,5 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "../shdrConsts.h"
struct a2v
{

4
Templates/Full/game/art/ribbons/materials.cs
View file

@ -53,8 +53,8 @@ singleton CustomMaterial( BasicRibbonMat )
new ShaderData( TexturedRibbonShader )
{
DXVertexShaderFile = "shaders/common/ribbons/TexturedRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/TexturedRibbonShaderP.hlsl";
DXVertexShaderFile = "shaders/common/ribbons/texRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/texRibbonShaderP.hlsl";
pixVersion = 2.0;
};

2
Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
View file

@ -1,5 +1,5 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "../shdrConsts.h"
struct v2f
{

2
Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
View file

@ -1,5 +1,5 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "../shdrConsts.h"
struct a2v
{

4
Templates/Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl
View file

@ -1,6 +1,6 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "shaders/common/torque.hlsl"
#include "../shdrConsts.h"
#include "../torque.hlsl"
uniform sampler2D ribTex : register(S0);

2
Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl
View file

@ -1,5 +1,5 @@
#define IN_HLSL
#include "../common/shdrConsts.h"
#include "../shdrConsts.h"
struct a2v
{