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

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework

Browse source
This commit is contained in:
Areloch 2020-06-01 03:48:20 -05:00
commit 69089e1ee2
297 changed files with 4174 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
View file

@ -201,7 +201,7 @@ function onServerCreated()
physicsInitWorld( "server" );
physicsStartSimulation("server");
DatablockFilesList.clear();
loadDatablockFiles( DatablockFilesList, true );
callOnModules("onServerScriptExec", "Core");

2
Templates/BaseGame/game/core/postFX/scripts/HDRPostFX.cs
View file

@ -287,7 +287,7 @@ function HDRPostFX::onEnabled( %this )
// Set the right global shader define for HDR.
if ( %format $= "GFXFormatR10G10B10A2" )
addGlobalShaderMacro( "TORQUE_HDR_RGB10" );
else if ( %format $= "GFXFormatR16G16B16A16" )
else if ( %format $= "GFXFormatR16G16B16A16F" )
addGlobalShaderMacro( "TORQUE_HDR_RGB16" );
echo( "HDR FORMAT: " @ %format );

2
Templates/BaseGame/game/core/rendering/scripts/renderManager.cs
View file

@ -34,7 +34,7 @@ function initRenderManager()
enabled = "false";
//When hdr is enabled this will be changed to the appropriate format
format = "GFXFormatR8G8B8A8_SRGB";
format = "GFXFormatR16G16B16A16F";
depthFormat = "GFXFormatD24S8";
aaLevel = 0; // -1 = match backbuffer

2
Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file

@ -377,7 +377,7 @@ float3 boxProject(float3 wsPosition, float3 wsReflectVec, float4x4 worldToObj, f
float dist = min(min(furthestPlane.x, furthestPlane.y), furthestPlane.z);
float3 posonbox = wsPosition + wsReflectVec * dist;
return posonbox - refPosition.xyz;
return posonbox-refPosition;
}
float4 computeForwardProbes(Surface surface,

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.cs
View file

@ -190,7 +190,7 @@ function AssetBrowser::buildImageAssetPreview(%this, %assetDef, %previewData)
%previewData.tooltip = "Asset Name: " @ %assetDef.assetName @ "\n" @
"Asset Type: Image Asset\n" @
"Asset Defition ID: " @ %assetDef @ "\n" @
"Asset Definition ID: " @ %assetDef @ "\n" @
"Image Type: " @ %assetDef.imageType @ "\n" @
"Format: " @ getWord(%info, 0) @ "\n" @
"Height: " @ getWord(%info, 1) @ "\n" @

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
View file

@ -464,7 +464,7 @@ function AssetBrowser::buildMaterialAssetPreview(%this, %assetDef, %previewData)
%previewData.assetDesc = %assetDef.description;
%previewData.tooltip = "Asset Name: " @ %assetDef.assetName @ "\n" @
"Asset Type: Material Asset\n" @
"Asset Defition ID: " @ %assetDef;
"Asset Definition ID: " @ %assetDef;
}
function AssetBrowser::onMaterialAssetEditorDropped(%this, %assetDef, %position)

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.cs
View file

@ -253,7 +253,7 @@ function AssetBrowser::buildShapeAssetPreview(%this, %assetDef, %previewData)
%previewData.assetDesc = %assetDef.description;
%previewData.tooltip = "Asset Name: " @ %assetDef.assetName @ "\n" @
"Asset Type: Shape Asset\n" @
"Asset Defition ID: " @ %assetDef;
"Asset Definition ID: " @ %assetDef;
}
function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position)

8
Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.cs
View file

@ -489,4 +489,10 @@ function foCollaps (%this, %tab){
case "container2":
%tab.visible = "0";
}
}
}
function simGroup::onInspectPostApply(%this)
{
%this.callOnChildren("setHidden",%this.hidden);
%this.callOnChildren("setLocked",%this.locked);
}