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

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/core/clientServer/Core_ClientServer.module
View file

@ -6,4 +6,9 @@
CreateFunction="onCreate"
DestroyFunction="onDestroy"
Group="Core">
<DeclaredAssets
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
</ModuleDefinition>

1
Templates/BaseGame/game/core/clientServer/scripts/client/client.tscript
View file

@ -25,4 +25,5 @@ function initClient()
// Copy saved script prefs into C++ code.
setDefaultFov( $pref::Player::defaultFov );
setZoomSpeed( $pref::Player::zoomSpeed );
loadModuleMaterials();
}

5
Templates/BaseGame/game/core/console/Core_Console.module
View file

@ -7,4 +7,9 @@
DestroyFunction="onDestroy"
Group="Core"
Dependencies="Core_GUI=1">
<DeclaredAssets
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
</ModuleDefinition>

7
Templates/BaseGame/game/core/console/guis/ConsoleDlg.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ConsoleDlg"
scriptFile="@assetFile=console.gui"
GUIFile="@assetFile=console.gui"
VersionId="1" />

2
Templates/BaseGame/game/core/Core.module → Templates/BaseGame/game/core/core.module
View file

@ -2,7 +2,7 @@
ModuleId="CoreModule"
VersionId="1"
Description="Module that implements the core engine-level setup for the game."
ScriptFile="Core"
ScriptFile="core"
CreateFunction="onCreate"
DestroyFunction="onDestroy"
Group="Core"/>

0
Templates/BaseGame/game/core/Core.tscript → Templates/BaseGame/game/core/core.tscript
View file

8
Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.tscript
View file

@ -18,7 +18,7 @@ datablock ParticleEmitterNodeData(DefaultEmitterNodeData)
datablock ParticleData(DefaultParticle)
{
textureName = "core/gameObjects/images/defaultParticle";
textureAsset = "Core_GameObjects:defaultParticle_image";
dragCoefficient = 0.498534;
gravityCoefficient = 0;
inheritedVelFactor = 0.499022;
@ -127,19 +127,19 @@ datablock RibbonData(TexturedRibbon)
datablock MissionMarkerData(WayPointMarker)
{
category = "Misc";
shapeFile = "core/gameObjects/shapes/octahedron.dts";
shapeAsset = "Core_GameObjects:octahedron";
};
datablock MissionMarkerData(SpawnSphereMarker)
{
category = "Misc";
shapeFile = "core/gameObjects/shapes/octahedron.dts";
shapeAsset = "Core_GameObjects:octahedron";
};
datablock MissionMarkerData(CameraBookmarkMarker)
{
category = "Misc";
shapeFile = "core/gameObjects/shapes/camera.dts";
shapeAsset = "Core_GameObjects:Camera";
};
datablock CameraData(Observer)

8
Templates/BaseGame/game/core/gameObjects/images/camera_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="camera_image"
imageFile="@assetFile=camera.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/defaultParticle_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="defaultParticle_image"
imageFile="@assetFile=defaultParticle.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/defaultRoadTextureOther_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="defaultRoadTextureOther_image"
imageFile="@assetFile=defaultRoadTextureOther.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/defaultRoadTextureTop_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="defaultRoadTextureTop_image"
imageFile="@assetFile=defaultRoadTextureTop.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/defaultpath_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="defaultpath_image"
imageFile="@assetFile=defaultpath.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/defaultpath_normal_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="defaultpath_normal_image"
imageFile="@assetFile=defaultpath_normal.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/green_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="green_image"
imageFile="@assetFile=green.jpg"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gameObjects/images/ribTex_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ribTex_image"
imageFile="@assetFile=ribTex.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

7
Templates/BaseGame/game/core/gameObjects/materials/DefaultDecalRoadMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DefaultDecalRoadMaterial"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="DefaultDecalRoadMaterial"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/materials/DefaultRoadMaterialOther.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DefaultRoadMaterialOther"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="DefaultRoadMaterialOther"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/materials/DefaultRoadMaterialTop.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DefaultRoadMaterialTop"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="DefaultRoadMaterialTop"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/materials/TexturedRibbonMat.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="TexturedRibbonMat"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="TexturedRibbonMat"
VersionId="1" />

8
Templates/BaseGame/game/core/gameObjects/materials/materials.tscript
View file

@ -58,7 +58,7 @@ singleton CustomMaterial( TexturedRibbonMat )
singleton Material(DefaultDecalRoadMaterial)
{
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureTop.png";
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
mapTo = "unmapped_mat";
materialTag0 = "RoadAndPath";
};
@ -66,13 +66,13 @@ singleton Material(DefaultDecalRoadMaterial)
singleton Material(DefaultRoadMaterialTop)
{
mapTo = "unmapped_mat";
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureTop.png";
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
materialTag0 = "RoadAndPath";
};
singleton Material(DefaultRoadMaterialOther)
{
mapTo = "unmapped_mat";
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureOther.png";
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureOther_image";
materialTag0 = "RoadAndPath";
};
};

6
Templates/BaseGame/game/core/gameObjects/shapes/Camera.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Camera"
fileName="@assetFile=camera.dts"
constuctorFileName="@assetFile=camera.tscript" />

7
Templates/BaseGame/game/core/gameObjects/shapes/CameraMat.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="CameraMat"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="CameraMat"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/shapes/OctahedronMat.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="OctahedronMat"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="OctahedronMat"
VersionId="1" />

11
Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(cameradts)
{
baseShapeAsset = "Core_GameObjects:Camera";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

10
Templates/BaseGame/game/core/gameObjects/shapes/materials.tscript
View file

@ -24,7 +24,7 @@ singleton Material(OctahedronMat)
{
mapTo = "green";
diffuseMap[0] = "core/gameObjects/images/camera";
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
translucent = "1";
translucentBlendOp = "PreMul";
@ -39,7 +39,7 @@ singleton Material(CameraMat)
{
mapTo = "pasted__phongE1";
diffuseMap[0] = "core/gameObjects/images/camera";
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
diffuseColor[0] = "0 0.627451 1 1";
specular[0] = "1 1 1 1";
@ -60,7 +60,7 @@ singleton Material(noshape_NoShape)
{
mapTo = "NoShape";
diffuseMap[0] = "";
diffuseMapAsset[0] = "";
diffuseColor[0] = "0.8 0.003067 0 .8";
emissive[0] = 0;
@ -78,7 +78,7 @@ singleton Material(noshapetext_lambert1)
{
mapTo = "lambert1";
diffuseMap[0] = "";
diffuseMapAsset[0] = "";
diffuseColor[0] = "0.4 0.4 0.4 1";
specular[0] = "1 1 1 1";
@ -95,7 +95,7 @@ singleton Material(noshapetext_noshape_mat)
{
mapTo = "noshape_mat";
diffuseMap[0] = "";
diffuseMapAsset[0] = "";
diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
specular[0] = "1 1 1 1";

6
Templates/BaseGame/game/core/gameObjects/shapes/noshape.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="noshape"
fileName="@assetFile=noshape.dts"
constuctorFileName="@assetFile=noshape.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/noshape.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(noshapedts)
{
baseShapeAsset = "Core_GameObjects:noshape";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

7
Templates/BaseGame/game/core/gameObjects/shapes/noshape_NoShape.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="noshape_NoShape"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="noshape_NoShape"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/shapes/noshapetext_lambert1.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="noshapetext_lambert1"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="noshapetext_lambert1"
VersionId="1" />

7
Templates/BaseGame/game/core/gameObjects/shapes/noshapetext_noshape_mat.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="noshapetext_noshape_mat"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="noshapetext_noshape_mat"
VersionId="1" />

6
Templates/BaseGame/game/core/gameObjects/shapes/octahedron.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="octahedron"
fileName="@assetFile=octahedron.dts"
constuctorFileName="@assetFile=octahedron.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/octahedron.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(octahedrondts)
{
baseShapeAsset = "Core_GameObjects:octahedron";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

6
Templates/BaseGame/game/core/gameObjects/shapes/simplecone.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="simplecone"
fileName="@assetFile=simplecone.dts"
constuctorFileName="@assetFile=simplecone.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/simplecone.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(simpleconedts)
{
baseShapeAsset = "Core_GameObjects:simplecone";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

6
Templates/BaseGame/game/core/gameObjects/shapes/unit_capsule.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="unit_capsule"
fileName="@assetFile=unit_capsule.dts"
constuctorFileName="@assetFile=unit_capsule.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/unit_capsule.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(unit_capsuledts)
{
baseShapeAsset = "Core_GameObjects:unit_capsule";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

6
Templates/BaseGame/game/core/gameObjects/shapes/unit_cube.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="unit_cube"
fileName="@assetFile=unit_cube.dts"
constuctorFileName="@assetFile=unit_cube.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/unit_cube.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(unit_cubedts)
{
baseShapeAsset = "Core_GameObjects:unit_cube";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

6
Templates/BaseGame/game/core/gameObjects/shapes/unit_sphere.asset.taml Normal file
View file

@ -0,0 +1,6 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="unit_sphere"
fileName="@assetFile=unit_sphere.dts"
constuctorFileName="@assetFile=unit_sphere.tscript" />

11
Templates/BaseGame/game/core/gameObjects/shapes/unit_sphere.tscript Normal file
View file

@ -0,0 +1,11 @@
singleton TSShapeConstructor(unit_spheredts)
{
baseShapeAsset = "Core_GameObjects:unit_sphere";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";
reverseWindingOrder = "0";
removeRedundantMats = "0";
animFPS = "2";
};

5
Templates/BaseGame/game/core/gui/Core_GUI.module
View file

@ -7,4 +7,9 @@
DestroyFunction="onDestroy"
Group="Core"
Dependencies="Core_Rendering=1">
<DeclaredAssets
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
</ModuleDefinition>

8
Templates/BaseGame/game/core/gui/images/button_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="button_image"
imageFile="@assetFile=button.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/checkbox_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="checkbox_image"
imageFile="@assetFile=checkbox.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/group_border_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="group_border_image"
imageFile="@assetFile=group-border.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/inactive_overlay_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="inactive_overlay_image"
imageFile="@assetFile=inactive-overlay.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/loadingbar_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="loadingbar_image"
imageFile="@assetFile=loadingbar.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/scrollBar_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="scrollBar_image"
imageFile="@assetFile=scrollBar.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/slider_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="slider_image"
imageFile="@assetFile=slider.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/textEdit_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="textEdit_image"
imageFile="@assetFile=textEdit.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/thumbHighlightButton_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="thumbHighlightButton_image"
imageFile="@assetFile=thumbHighlightButton.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/gui/images/window_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="window_image"
imageFile="@assetFile=window.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

18
Templates/BaseGame/game/core/gui/scripts/profiles.tscript
View file

@ -63,7 +63,7 @@ new GuiControlProfile (GuiDefaultProfile)
fontColorSEL= "255 255 255";
// bitmap information
bitmap = "";
bitmapAsset = "";
bitmapBase = "";
textOffset = "0 0";
@ -107,7 +107,7 @@ new GuiControlProfile (GuiWindowProfile)
bevelColorHL = "255 255 255";
bevelColorLL = "0 0 0";
text = "untitled";
bitmap = "core/gui/images/window";
bitmapAsset = "Core_GUI:window_image";
textOffset = "8 4";
hasBitmapArray = true;
justify = "left";
@ -119,7 +119,7 @@ if(!isObject(GuiTextEditProfile))
new GuiControlProfile(GuiTextEditProfile)
{
opaque = true;
bitmap = "core/gui/images/textEdit";
bitmapAsset = "Core_GUI:textEdit_image";
hasBitmapArray = true;
border = -2;
fillColor = "242 241 240 0";
@ -145,7 +145,7 @@ new GuiControlProfile(GuiScrollProfile)
fontColor = "0 0 0";
fontColorHL = "150 150 150";
border = true;
bitmap = "core/gui/images/scrollBar";
bitmapAsset = "Core_GUI:scrollBar_image";
hasBitmapArray = true;
category = "Core";
};
@ -173,7 +173,7 @@ new GuiControlProfile(GuiCheckBoxProfile)
fontColorNA = "200 200 200";
fixedExtent = true;
justify = "left";
bitmap = "core/gui/images/checkbox";
bitmapAsset = "Core_GUI:checkbox_image";
hasBitmapArray = true;
category = "Tools";
};
@ -193,7 +193,7 @@ new GuiControlProfile( GuiProgressBitmapProfile )
{
border = false;
hasBitmapArray = true;
bitmap = "core/gui/images/loadingbar";
bitmapAsset = "Core_GUI:loadingbar_image";
category = "Core";
};
@ -220,7 +220,7 @@ new GuiControlProfile( GuiButtonProfile )
fixedExtent = false;
justify = "center";
canKeyFocus = false;
bitmap = "core/gui/images/button";
bitmapAsset = "Core_GUI:button_image";
hasBitmapArray = false;
category = "Core";
};
@ -231,6 +231,6 @@ new GuiControlProfile( GuiButtonProfile )
if( !isObject( GuiSliderProfile ) )
new GuiControlProfile( GuiSliderProfile )
{
bitmap = "core/gui/images/slider";
bitmapAsset = "Core_GUI:slider_image";
category = "Core";
};
};

5
Templates/BaseGame/game/core/lighting/Core_Lighting.module
View file

@ -6,4 +6,9 @@
CreateFunction="onCreate"
DestroyFunction="onDestroy"
Group="Core">
<DeclaredAssets
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
</ModuleDefinition>

7
Templates/BaseGame/game/core/lighting/scripts/AL_ConvexLightState.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AL_ConvexLightState"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="AL_ConvexLightState"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/AL_DefaultDeferredMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AL_DefaultDeferredMaterial"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="AL_DefaultDeferredMaterial"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/AL_DefaultShadowMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AL_DefaultShadowMaterial"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="AL_DefaultShadowMaterial"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/AL_ParticlePointLightShader.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AL_ParticlePointLightShader"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="AL_ParticlePointLightShader"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/AL_SpotLightShader.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AL_SpotLightShader"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="AL_SpotLightShader"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/BL_ProjectedShadowRPM.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="BL_ProjectedShadowRPM"
scriptFile="@assetFile=basicLighting_Init.tscript"
materialDefinitionName="BL_ProjectedShadowRPM"
VersionId="1" />

7
Templates/BaseGame/game/core/lighting/scripts/IrradianceShader.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="IrradianceShader"
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
materialDefinitionName="IrradianceShader"
VersionId="1" />

5
Templates/BaseGame/game/core/postFX/Core_PostFX.module
View file

@ -7,4 +7,9 @@
DestroyFunction="onDestroy"
Group="Core"
Dependencies="Core_Rendering=1,Core_Lighting=1">
<DeclaredAssets
canSave="true"
canSaveDynamicFields="true"
Extension="asset.taml"
Recurse="true" />
</ModuleDefinition>

2
Templates/BaseGame/game/core/postFX/Core_PostFX.tscript
View file

@ -6,7 +6,7 @@ function Core_PostFX::onCreate(%this)
exec("./scripts/postFx." @ $TorqueScriptFileExtension);
//Load the default config
loadPresetHandler("./scripts/default.postfxpreset." @ $TorqueScriptFileExtension);
PostFXManager.loadPresetHandler("./scripts/default.postfxpreset." @ $TorqueScriptFileExtension);
}
function Core_PostFX::onDestroy(%this)

8
Templates/BaseGame/game/core/postFX/images/AreaMap33_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AreaMap33_image"
imageFile="@assetFile=AreaMap33.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

7
Templates/BaseGame/game/core/postFX/images/Empty.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="empty"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="empty"
VersionId="1" />

7
Templates/BaseGame/game/core/postFX/images/WarningMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="WarningMaterial"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="WarningMaterial"
VersionId="1" />

8
Templates/BaseGame/game/core/postFX/images/caustics_1_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="caustics_1_image"
imageFile="@assetFile=caustics_1.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/caustics_2_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="caustics_2_image"
imageFile="@assetFile=caustics_2.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/inactive_overlay_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="inactive_overlay_image"
imageFile="@assetFile=inactive-overlay.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

2
Templates/BaseGame/game/core/postFX/images/materials.tscript
View file

@ -25,7 +25,7 @@ singleton Material( Empty )
};
singleton Material(WarningMaterial) {
detailMap[0] = "missingTexture";
detailMapAsset[0] = "Core_PostFX:missingTexture_image";
diffuseColor[0] = "25 16 0";
emissive[0] = false;
translucent = false;

8
Templates/BaseGame/game/core/postFX/images/missingTexture_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="missingTexture_image"
imageFile="@assetFile=missingTexture.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/noise_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="noise_image"
imageFile="@assetFile=noise.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/null_color_ramp_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="null_color_ramp_image"
imageFile="@assetFile=null_color_ramp.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/unavailable_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="unavailable_image"
imageFile="@assetFile=unavailable.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/images/warnMat_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="warnMat_image"
imageFile="@assetFile=warnMat.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

4
Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.tscript
View file

@ -58,7 +58,7 @@ singleton PostEffect( CausticsPFX )
shader = PFX_CausticsShader;
stateBlock = PFX_CausticsStateBlock;
texture[0] = "#deferred";
texture[1] = "core/postFX/images/caustics_1";
texture[2] = "core/postFX/images/caustics_2";
textureAsset[1] = "Core_PostFX:caustics_1_image";
textureAsset[2] = "Core_PostFX:caustics_2_image";
target = "$backBuffer";
};

8
Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/Eerie_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Eerie_image"
imageFile="@assetFile=Eerie.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/Misty_Blue_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Misty_Blue_image"
imageFile="@assetFile=Misty_Blue.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/Warm_Day_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Warm_Day_image"
imageFile="@assetFile=Warm_Day.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/perfect_Gradient_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="perfect_Gradient_image"
imageFile="@assetFile=perfect_Gradient.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

4
Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.tscript
View file

@ -162,7 +162,7 @@ singleton PostEffect( MLAAFx )
texture[0] = "$inTex"; // Edges mask
texture[1] = "$inTex"; // Edges mask
texture[2] = "core/postFX/images/AreaMap33.dds";
textureAsset[2] = "Core_PostFX:AreaMap33_image";
};
new PostEffect()
@ -183,4 +183,4 @@ function MLAAFx::setShaderConsts(%this)
%this.setShaderConst("$lumaCoefficients", %this.lumaCoefficients);
%this.setShaderConst("$threshold", %this.threshold);
%this.setShaderConst("$depthThreshold", %this.depthThreshold);
}
}

4
Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.tscript
View file

@ -270,7 +270,7 @@ singleton PostEffect( SSAOPostFx )
stateBlock = SSAOStateBlock;
texture[0] = "#deferred";
texture[1] = "core/postFX/images/noise.png";
textureAsset[1] = "Core_PostFX:noise_image";
texture[2] = "#ssao_pow_table";
target = "$outTex";
@ -369,4 +369,4 @@ singleton PostEffect( SSAOPowTablePostFx )
targetFormat = "GFXFormatR16F";
targetSize = "256 1";
};
};

20
Templates/BaseGame/game/core/rendering/Core_Rendering.tscript
View file

@ -9,6 +9,10 @@ function Core_Rendering::onCreate(%this)
$Core::DefaultPrefilterCubemap = "core/rendering/images/default_prefilter.dds";
$Core::BRDFTexture = "core/rendering/images/brdfTexture.dds";
$Core::NoImageAssetFallback = "Core_Rendering:missingTexture_image";
$Core::NoMaterialAssetFallback = "Core_Rendering:noMaterial";
$Core::NoShapeAssetFallback = "Core_Rendering:noShape";
$pref::ReflectionProbes::BakeResolution = ProjectSettings.value("Rendering/ProbeCaptureResolution", "64");
$Terrain::LerpBlend = ProjectSettings.value("Terrain/LerpBlend");
@ -26,15 +30,7 @@ function Core_Rendering::onCreate(%this)
$Terrain::OrmTextureFormat = ProjectSettings.value("Terrain/OrmTextureFormat", 12);
exec("./scripts/graphicsOptions." @ $TorqueScriptFileExtension);
exec("./scripts/terrainSettings." @ $TorqueScriptFileExtension);
exec("./scripts/renderManager." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/clouds." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/commonMaterialData." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/scatterSky." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/shaders." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/terrainBlock." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/water." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/warningTerrainMat." @ $TorqueScriptFileExtension);
}
function Core_Rendering::onDestroy(%this)
@ -46,6 +42,14 @@ function Core_Rendering::initClient(%this)
// Start rendering and stuff.
initRenderManager();
initLightingSystems("Advanced Lighting");
exec("./scripts/gfxData/clouds." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/commonMaterialData." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/scatterSky." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/shaders." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/terrainBlock." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/water." @ $TorqueScriptFileExtension);
exec("./scripts/gfxData/warningTerrainMat." @ $TorqueScriptFileExtension);
//load prefs
exec("data/defaults." @ $TorqueScriptFileExtension);

8
Templates/BaseGame/game/core/rendering/images/brdfTexture_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="brdfTexture_image"
imageFile="@assetFile=brdfTexture.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/cloud1_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="cloud1_image"
imageFile="@assetFile=cloud1.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/cloud2_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="cloud2_image"
imageFile="@assetFile=cloud2.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/cloud3_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="cloud3_image"
imageFile="@assetFile=cloud3.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/clouds_normal_displacement_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="clouds_normal_displacement_image"
imageFile="@assetFile=clouds_normal_displacement.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/default_irradiance_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="default_irradiance_image"
imageFile="@assetFile=default_irradiance.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/default_prefilter_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="default_prefilter_image"
imageFile="@assetFile=default_prefilter.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/depthcolor_ramp_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="depthcolor_ramp_image"
imageFile="@assetFile=depthcolor_ramp.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/foam_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="foam_image"
imageFile="@assetFile=foam.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

2
Templates/BaseGame/game/core/rendering/images/materials.tscript
View file

@ -25,7 +25,7 @@ singleton Material( Empty )
};
singleton Material(WarningMaterial) {
detailMap[0] = "missingTexture";
detailMapAsset[0] = "Core_Rendering:missingTexture_image";
diffuseColor[0] = "25 16 0";
emissive[0] = false;
translucent = false;

8
Templates/BaseGame/game/core/rendering/images/missingTexture_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="missingTexture_image"
imageFile="@assetFile=missingTexture.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/ripple_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ripple_image"
imageFile="@assetFile=ripple.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/unavailable_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="unavailable_image"
imageFile="@assetFile=unavailable.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/core/rendering/images/warnMat_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="warnMat_image"
imageFile="@assetFile=warnMat.dds"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

7
Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkyMat.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="BlankSkyMat"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="BlankSkyMat"
VersionId="1" />

BIN
Templates/BaseGame/game/tools/editorClasses/gui/images/textEdit.png → Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

8
Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="BlankSkybox_image"
imageFile="@assetFile=BlankSkybox.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

19
Templates/BaseGame/game/core/rendering/materials/Blank_sky/materials.tscript Normal file
View file

@ -0,0 +1,19 @@
//-----------------------------------------------------------------------------
// Torque
// Copyright GarageGames, LLC 2011
//-----------------------------------------------------------------------------
singleton CubemapData( BlankSkyCubemap )
{
cubeMapFaceAsset[0] = "Core_Rendering:BlankSkybox_image";
cubeMapFaceAsset[1] = "Core_Rendering:BlankSkybox_image";
cubeMapFaceAsset[2] = "Core_Rendering:BlankSkybox_image";
cubeMapFaceAsset[3] = "Core_Rendering:BlankSkybox_image";
cubeMapFaceAsset[4] = "Core_Rendering:BlankSkybox_image";
cubeMapFaceAsset[5] = "Core_Rendering:BlankSkybox_image";
};
singleton Material( BlankSkyMat )
{
cubemap = BlankSkyCubemap;
};

Some files were not shown because too many files have changed in this diff Show more