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

Merge branch 'Preview4_0' into SoundAssetImplements

Browse source 
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
This commit is contained in:
AzaezelX 2021-10-11 20:11:27 -05:00
commit f5600826d7
122 changed files with 686 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/rendering/scripts/renderManager.tscript
View file

@ -59,8 +59,8 @@ function initRenderManager()
DiffuseRenderPassManager.addManager( new RenderObjectMgr(ObjectBin) { bintype = "Object"; renderOrder = 0.6; processAddOrder = 0.6; } );
DiffuseRenderPassManager.addManager( new RenderObjectMgr(ShadowBin) { bintype = "Shadow"; renderOrder = 0.7; processAddOrder = 0.7; } );
DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalRoadBin) { bintype = "DecalRoad"; renderOrder = 0.8; processAddOrder = 0.8; basicOnly = true;} );
DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalBin) { bintype = "Decal"; renderOrder = 0.81; processAddOrder = 0.81; basicOnly = true;} );
DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalRoadBin) { bintype = "DecalRoad"; renderOrder = 0.8; processAddOrder = 0.8; } );
DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalBin) { bintype = "Decal"; renderOrder = 0.81; processAddOrder = 0.81;} );
DiffuseRenderPassManager.addManager( new RenderOcclusionMgr(OccluderBin){ bintype = "Occluder"; renderOrder = 0.9; processAddOrder = 0.9; } );
// Render the sky last

4
Templates/BaseGame/game/core/rendering/shaders/gl/torque.glsl
View file

@ -291,8 +291,8 @@ void fizzle(vec2 vpos, float visibility)
// I'm sure there are many more patterns here to
// discover for different effects.
mat2x2 m = mat2x2( vpos.x, vpos.y, 0.916, 0.350 );
if( (visibility - fract( determinant( m ) )) < 0 ) //if(a < 0) discard;
mat2x2 m = mat2x2( vpos.x, 0.916, vpos.y, 0.350 );
if( (visibility - fract( determinant( m ) )) < 0 )
discard;
}
#endif //TORQUE_PIXEL_SHADER

20
Templates/BaseGame/game/core/utility/scripts/module.tscript
View file

@ -4,8 +4,7 @@ if (!isObject(ExecFilesList))
new ArrayObject(ExecFilesList);
function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3, %var4, %var5, %var6)
{
%maxvars = 7; // match this to i/o signature
{
//clear per module group file execution chain
ExecFilesList.empty();
//Get our modules so we can exec any specific client-side loading/handling
@ -19,22 +18,9 @@ function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3,
if(%module.group !$= %moduleGroup)
continue;
}
// match this to i/o signature
if(isObject(%module.scopeSet) && %module.scopeSet.isMethod(%functionName))
{
%stryng = %module.scopeSet @ "." @ %functionName @ "(";
for (%a=0;%a<%maxvars;%a++)
{
if (%var[%a] !$= "")
{
%stryng = %stryng @ %var[%a];
if (%a<%maxvars-1 && %var[%a+1] !$= "")
%stryng = %stryng @ ",";
}
}
%stryng = %stryng @ ");";
eval(%stryng);
}
%module.scopeSet.call(%functionName, %var0, %var1, %var2, %var3, %var4, %var5, %var6);
}
%execFilecount = ExecFilesList.count();

2
Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.mis
View file

@ -36,7 +36,7 @@ new Scene(EditorTemplateLevel) {
squareSize = "128";
scaleU = "25";
scaleV = "25";
MaterialFile = "FloorGray";
MaterialAsset = "Prototyping:FloorGray";
canSave = "1";
canSaveDynamicFields = "1";
Enabled = "1";

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

@ -1802,7 +1802,7 @@ function matchesSearch(%assetName, %assetType)
}
else
{
if(%assetName.tags !$= %word)
if(strstr(strlwr(%assetName.tags), strlwr(%word)) != -1)
%matchTags = true;
}
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/creator.tscript
View file

@ -174,7 +174,7 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
%method = "build" @ %class;
if( !ObjectBuilderGui.isMethod( %method ) )
%cmd = "return new " @ %class @ "();";
%cmd = "new " @ %class @ "();";
else
%cmd = "ObjectBuilderGui." @ %method @ "();";
@ -187,4 +187,4 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
%args.val[2] = %buildfunc;
%this.creatorClassArray.push_back( %group, %args );
}
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript
View file

@ -216,7 +216,7 @@ function directoryHandler::getFolderTreeItemFromAddress(%this, %address)
//break down the address
%folderCount = getTokenCount(%address, "/");
if(startsWith(%address, "Data/") || startsWith(%address, "Tools/") || startsWith(%address, "Core/"))
if(startsWith(%address, "data/") || startsWith(%address, "tools/") || startsWith(%address, "core/"))
{
%curItem = %this.treeCtrl.findChildItemByName(1, "Modules");
}
@ -242,7 +242,7 @@ function directoryHandler::expandTreeToAddress(%this, %address)
%rootId = AssetBrowser-->filterTree.findItemByName("Content");
%this.treeCtrl.expandItem(%rootId);
if(startsWith(%address, "Data/") || startsWith(%address, "Tools/") || startsWith(%address, "Core/"))
if(startsWith(%address, "data/") || startsWith(%address, "tools/") || startsWith(%address, "core/"))
{
%curItem = %this.treeCtrl.findChildItemByName(1, "Modules");
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.tscript
View file

@ -22,7 +22,7 @@ function SelectAssetPath::showDialog(%this, %startingPath, %callback, %promptTex
%this.callback = %callback;
%dataItem = SelectAssetPath-->folderTree.insertItem(0, "Data");
%this.dirHandler.loadFolders("Data", %dataItem);
%this.dirHandler.loadFolders("data", %dataItem);
%this.dirHandler.expandTreeToAddress(%startingPath);
%id = %this.dirHandler.getFolderTreeItemFromAddress(%startingPath);
@ -60,4 +60,4 @@ function SelectAssetPath::newFolder(%this)
{
AssetBrowser_newFolderNameTxt.text = "NewFolder";
Canvas.pushDialog(AssetBrowser_newFolder);
}
}