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

Renamed default ribbon datablocks.

Browse source
This commit is contained in:
Daniel Buckmaster 2014-09-24 08:27:03 +10:00
parent 4e0d5c5333
commit 2a9e6ef5e6
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///////////////////////////////////////////// //Basic ribbon shader/////////////////////////////////////////////
new ShaderData( basicRibbonShader ) new ShaderData( BasicRibbonShader )
{ {
DXVertexShaderFile = "shaders/common/ribbons/basicRibbonShaderV.hlsl"; DXVertexShaderFile = "shaders/common/ribbons/basicRibbonShaderV.hlsl";
DXPixelShaderFile = "shaders/common/ribbons/basicRibbonShaderP.hlsl"; DXPixelShaderFile = "shaders/common/ribbons/basicRibbonShaderP.hlsl";
@ -32,9 +32,9 @@ new ShaderData( basicRibbonShader )
pixVersion = 2.0; pixVersion = 2.0;
}; };
singleton CustomMaterial( basicRibbonMat ) singleton CustomMaterial( BasicRibbonMat )
{ {
shader = basicRibbonShader; shader = BasicRibbonShader;
version = 2.0; version = 2.0;
emissive[0] = true; emissive[0] = true;

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

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

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

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

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

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