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

Further conversions of missed file fields in core and tools

Browse source 
Assets created for missed objects and files
Improvements to the Project Importer to correct a number of issues, including not parsing ,'s from object names, trimming whitespace, pruning script extensions from exec invokes
This commit is contained in:
Areloch 2021-07-24 02:08:23 -05:00
parent 36b31ae19d
commit 432d201569
49 changed files with 406 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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)

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" />

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" />

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" />

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" />

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" />

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;

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;

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" />

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

@ -5,12 +5,12 @@
singleton CubemapData( BlankSkyCubemap )
{
cubeFaceAsset[0] = "Core_Rendering:BlankSkybox_image";
cubeFaceAsset[1] = "Core_Rendering:BlankSkybox_image";
cubeFaceAsset[2] = "Core_Rendering:BlankSkybox_image";
cubeFaceAsset[3] = "Core_Rendering:BlankSkybox_image";
cubeFaceAsset[4] = "Core_Rendering:BlankSkybox_image";
cubeFaceAsset[5] = "Core_Rendering:BlankSkybox_image";
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 )

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

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

2
Templates/BaseGame/game/core/rendering/materials/NoMaterial.asset.taml
View file

@ -2,5 +2,5 @@
canSave="true"
canSaveDynamicFields="true"
AssetName="NoMaterial"
scriptFile="NoMaterial"
scriptFile="@assetFile=NoMaterial"
materialDefinitionName="NoMaterial" />

42
Templates/BaseGame/game/core/rendering/materials/materials.tscript
View file

@ -20,18 +20,46 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//--- OBJECT WRITE BEGIN ---
singleton CubemapData( NightCubemap )
{
cubeFaceAsset[0] = "Core_Rendering:NightSkybox_1";
cubeFaceAsset[1] = "Core_Rendering:NightSkybox_2";
cubeFaceAsset[2] = "Core_Rendering:NightSkybox_3";
cubeFaceAsset[3] = "Core_Rendering:NightSkybox_4";
cubeFaceAsset[4] = "Core_Rendering:NightSkybox_5";
cubeFaceAsset[5] = "Core_Rendering:NightSkybox_6";
cubeMapFaceAsset[0] = "Core_Rendering:NightSkybox_1";
cubeMapFaceAsset[1] = "Core_Rendering:NightSkybox_2";
cubeMapFaceAsset[2] = "Core_Rendering:NightSkybox_3";
cubeMapFaceAsset[3] = "Core_Rendering:NightSkybox_4";
cubeMapFaceAsset[4] = "Core_Rendering:NightSkybox_5";
cubeMapFaceAsset[5] = "Core_Rendering:NightSkybox_6";
};
singleton Material( NightSkyMat )
{
cubemap = NightCubemap;
materialTag0 = "Skies";
};
};
singleton Material(moon_noglow) {
mapTo="moon_noglow";
DiffuseMapAsset = "Core_Rendering:moon_noglow_image";
emissive = true;
translucent = true;
vertColor[ 0 ] = true;
};
singleton Material(moon_wglow) {
mapTo="moon_wglow";
DiffuseMapAsset = "Core_Rendering:moon_wglow_image";
emissive = true;
translucent = true;
vertColor[ 0 ] = true;
};
singleton Material(moon_wcorona) {
mapTo="moon_wcorona";
DiffuseMapAsset = "Core_Rendering:moon_wcorona_image";
emissive = true;
translucent = true;
vertColor[ 0 ] = true;
};
//--- OBJECT WRITE END ---

9
Templates/BaseGame/game/core/rendering/materials/moon_noglow.tscript
View file

@ -1,9 +0,0 @@
//--- OBJECT WRITE BEGIN ---
singleton Material(moon_noglow) {
mapTo="moon_noglow";
DiffuseMapAsset = "Core_Rendering:moon_noglow_image";
emissive = true;
translucent = true;
vertColor[ 0 ] = true;
};
//--- OBJECT WRITE END ---

9
Templates/BaseGame/game/core/rendering/materials/moon_wglow.tscript
View file

@ -1,9 +0,0 @@
//--- OBJECT WRITE BEGIN ---
singleton Material(moon_wglow) {
mapTo="moon_wglow";
DiffuseMapAsset = "Core_Rendering:moon_wglow_image";
emissive = true;
translucent = true;
vertColor[ 0 ] = true;
};
//--- OBJECT WRITE END ---

7
Templates/BaseGame/game/core/rendering/scripts/gfxData/UnderWaterBasicShader.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/core/rendering/scripts/gfxData/UnderWaterShader.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/core/rendering/scripts/gfxData/WaterBasicShader.asset.taml Normal file
View file

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