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

Merge pull request #563 from Bloodknight/Minor_Module_Fixes

Browse source 
replace new with singleton to fix cannot re-declare object log file …
This commit is contained in:
Brian Roberts 2021-09-08 12:48:44 -05:00 • committed by GitHub
commit ad5d0b6d1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.tscript
View file

@ -75,7 +75,7 @@ singleton shaderData( AL_VectorLightShader )
pixVersion = 3.0; pixVersion = 3.0;
}; };
new CustomMaterial( AL_VectorLightMaterial ) singleton CustomMaterial( AL_VectorLightMaterial )
{ {
shader = AL_VectorLightShader; shader = AL_VectorLightShader;
stateBlock = AL_VectorLightState; stateBlock = AL_VectorLightState;
@ -149,7 +149,7 @@ singleton shaderData( AL_PointLightShader )
pixVersion = 3.0; pixVersion = 3.0;
}; };
new CustomMaterial( AL_PointLightMaterial ) singleton CustomMaterial( AL_PointLightMaterial )
{ {
shader = AL_PointLightShader; shader = AL_PointLightShader;
stateBlock = AL_ConvexLightState; stateBlock = AL_ConvexLightState;
@ -186,7 +186,7 @@ singleton shaderData( AL_SpotLightShader )
pixVersion = 3.0; pixVersion = 3.0;
}; };
new CustomMaterial( AL_SpotLightMaterial ) singleton CustomMaterial( AL_SpotLightMaterial )
{ {
shader = AL_SpotLightShader; shader = AL_SpotLightShader;
stateBlock = AL_ConvexLightState; stateBlock = AL_ConvexLightState;
@ -205,7 +205,7 @@ new CustomMaterial( AL_SpotLightMaterial )
/// This material is used for generating deferred /// This material is used for generating deferred
/// materials for objects that do not have materials. /// materials for objects that do not have materials.
new Material( AL_DefaultDeferredMaterial ) singleton Material( AL_DefaultDeferredMaterial )
{ {
// We need something in the first pass else it // We need something in the first pass else it
// won't create a proper material instance. // won't create a proper material instance.
@ -219,7 +219,7 @@ new Material( AL_DefaultDeferredMaterial )
/// This material is used for generating shadow /// This material is used for generating shadow
/// materials for objects that do not have materials. /// materials for objects that do not have materials.
new Material( AL_DefaultShadowMaterial ) singleton Material( AL_DefaultShadowMaterial )
{ {
// We need something in the first pass else it // We need something in the first pass else it
// won't create a proper material instance. // won't create a proper material instance.
@ -255,7 +255,7 @@ singleton shaderData( AL_ParticlePointLightShader )
pixVersion = 3.0; pixVersion = 3.0;
}; };
new CustomMaterial( AL_ParticlePointLightMaterial ) singleton CustomMaterial( AL_ParticlePointLightMaterial )
{ {
shader = AL_ParticlePointLightShader; shader = AL_ParticlePointLightShader;
stateBlock = AL_ConvexLightState; stateBlock = AL_ConvexLightState;

2
Templates/BaseGame/game/core/rendering/scripts/gfxData/warningTerrainMat.tscript
View file

@ -1,4 +1,4 @@
new TerrainMaterial() singleton TerrainMaterial()
{ {
diffuseSize = "200"; diffuseSize = "200";
detailSize = "10"; detailSize = "10";

2
Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/terrainMaterial.tscript.template
View file

@ -11,7 +11,7 @@ singleton Material(TerrainFX_@)
impactSoundId = "0"; impactSoundId = "0";
}; };
new TerrainMaterial(@) singleton TerrainMaterial(@)
{ {
internalName = "@"; internalName = "@";
diffuseMap = ""; diffuseMap = "";

2
Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shadowViz.tscript
View file

@ -34,7 +34,7 @@ singleton shaderData( AL_ShadowVisualizeShader )
pixVersion = 2.0; pixVersion = 2.0;
}; };
new CustomMaterial( AL_ShadowVisualizeMaterial ) singleton CustomMaterial( AL_ShadowVisualizeMaterial )
{ {
shader = AL_ShadowVisualizeShader; shader = AL_ShadowVisualizeShader;
stateBlock = AL_DepthVisualizeState; stateBlock = AL_DepthVisualizeState;