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

materials.cs files are still being automatically executed reguardless of location twice. shifted the ribbonshader shaderdata defines from new to singleton to avoid attempts at duplicated creation.

Browse source
This commit is contained in:
AzaezelX 2019-10-21 19:22:13 -05:00
parent cba14c035f
commit 4f31dea023
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/gameObjects/materials/materials.cs
View file

@ -1,4 +1,4 @@
new ShaderData( BasicRibbonShader ) singleton ShaderData( BasicRibbonShader )
{ {
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl"; DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl";
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl";
@ -26,7 +26,7 @@ singleton CustomMaterial( BasicRibbonMat )
preload = true; preload = true;
}; };
new ShaderData( TexturedRibbonShader ) singleton ShaderData( TexturedRibbonShader )
{ {
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl"; DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl";
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl";