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

Merge pull request #2 from eightyeight/ribbons3

Browse source 
Renamed default ribbon datablocks
This commit is contained in:
Lukas Joergensen 2014-09-24 07:15:36 +02:00
commit 7df83cce4a
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/Empty/game/art/ribbons/materials.cs
View file

@ -24,7 +24,7 @@
//Basic ribbon shader/////////////////////////////////////////////
new ShaderData( basicRibbonShader )
new ShaderData( BasicRibbonShader )
{
DXVertexShaderFile = "shaders/common/ribbons/basicRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/basicRibbonShaderP.hlsl";
@ -32,9 +32,9 @@ new ShaderData( basicRibbonShader )
pixVersion = 2.0;
};
singleton CustomMaterial( basicRibbonMat )
singleton CustomMaterial( BasicRibbonMat )
{
shader = basicRibbonShader;
shader = BasicRibbonShader;
version = 2.0;
emissive[0] = true;

6
Templates/Empty/game/art/ribbons/ribbons.cs
View file

@ -27,7 +27,7 @@ datablock RibbonNodeData(DefaultRibbonNodeData)
//ribbon data////////////////////////////////////////
datablock RibbonData(basicRibbon)
datablock RibbonData(BasicRibbon)
{
size[0] = 0.5;
color[0] = "1.0 0.0 0.0 1.0";
@ -40,5 +40,5 @@ datablock RibbonData(basicRibbon)
RibbonLength = 40;
fadeAwayStep = 0.1;
UseFadeOut = true;
RibbonMaterial = basicRibbonMat;
};
RibbonMaterial = BasicRibbonMat;
};

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

@ -24,7 +24,7 @@
//Basic ribbon shader/////////////////////////////////////////////
new ShaderData( basicRibbonShader )
new ShaderData( BasicRibbonShader )
{
DXVertexShaderFile = "shaders/common/ribbons/basicRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/basicRibbonShaderP.hlsl";
@ -32,9 +32,9 @@ new ShaderData( basicRibbonShader )
pixVersion = 2.0;
};
singleton CustomMaterial( basicRibbonMat )
singleton CustomMaterial( BasicRibbonMat )
{
shader = basicRibbonShader;
shader = BasicRibbonShader;
version = 2.0;
emissive[0] = true;
@ -51,17 +51,17 @@ singleton CustomMaterial( basicRibbonMat )
//Texture ribbon shader/////////////////////////////////////////////
new ShaderData( texRibbonShader )
new ShaderData( TexturedRibbonShader )
{
DXVertexShaderFile = "shaders/common/ribbons/texRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/texRibbonShaderP.hlsl";
DXVertexShaderFile = "shaders/common/ribbons/TexturedRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/TexturedRibbonShaderP.hlsl";
pixVersion = 2.0;
};
singleton CustomMaterial( texRibbonMat )
singleton CustomMaterial( TexturedRibbonMat )
{
shader = texRibbonShader;
shader = TexturedRibbonShader;
version = 2.0;
emissive[0] = true;

8
Templates/Full/game/art/ribbons/ribbons.cs
View file

@ -27,7 +27,7 @@ datablock RibbonNodeData(DefaultRibbonNodeData)
//ribbon data////////////////////////////////////////
datablock RibbonData(basicRibbon)
datablock RibbonData(BasicRibbon)
{
size[0] = 0.5;
color[0] = "1.0 0.0 0.0 1.0";
@ -40,12 +40,12 @@ datablock RibbonData(basicRibbon)
RibbonLength = 40;
fadeAwayStep = 0.1;
UseFadeOut = true;
RibbonMaterial = basicRibbonMat;
RibbonMaterial = BasicRibbonMat;
};
datablock RibbonData(texRibbon)
datablock RibbonData(TexturedRibbon)
{
RibbonMaterial = texRibbonMat;
RibbonMaterial = TexturedRibbonMat;
size[0] = 0.5;
color[0] = "1.0 1.0 1.0 1.0";
position[0] = 0.0;