TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #415 from Areloch/GroundPlaneAssetify

Browse source 
Converts GroundPlane to utilize assets
This commit is contained in:
Brian Roberts 2020-12-19 02:35:32 -06:00 • committed by GitHub
commit 7dc6fc8abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 278 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,6 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="NoMaterial"
scriptFile="@assetFile=NoMaterial.cs"
materialDefinitionName="NoMaterial" />

6
Templates/BaseGame/game/core/rendering/materials/NoMaterial.cs Normal file
View file

@ -0,0 +1,6 @@
//--- OBJECT WRITE BEGIN ---
singleton Material(NoMaterial) {
mapTo="NoMaterial";
DiffuseMap = "core/rendering/images/warnMat";
};
//--- OBJECT WRITE END ---

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

@ -36,7 +36,7 @@ new Scene(EditorTemplateLevel) {
squareSize = "128";
scaleU = "25";
scaleV = "25";
Material = "Grid_512_Grey";
Material = "FloorGray";
canSave = "1";
canSaveDynamicFields = "1";
Enabled = "1";
@ -100,7 +100,6 @@ new Scene(EditorTemplateLevel) {
canSave = "1";
canSaveDynamicFields = "1";
persistentId = "fff282f5-dced-11e9-a423-bb0e346e3870";
reflectionPath = "D:/Gamedev/T3DMIT/T3DPreview4_0/Bugfixaroo/My Projects/Bugfixaroo/game/data/ExampleModule/levels/ExampleLevel/probes/";
};
};
//--- OBJECT WRITE END ---

1
Templates/BaseGame/game/data/Prototyping/Materials/DetailBlue.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="DetailBlue"
scriptFile="@assetFile=DetailBlue.cs"
materialDefinitionName="DetailBlue"
imageMap0="@Asset=Prototyping:DetailBlue_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/DetailBlue.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="FloorGray"
scriptFile="@assetFile=FloorGray.cs"
materialDefinitionName="FloorGray"
imageMap0="@Asset=Prototyping:FloorGray_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/FloorGray.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/InteractiveRed.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="InteractiveRed"
scriptFile="@assetFile=InteractiveRed.cs"
materialDefinitionName="InteractiveRed"
imageMap0="@Asset=Prototyping:InteractiveRed_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/InteractiveRed.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/NatureBrown.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="NatureBrown"
scriptFile="@assetFile=NatureBrown.cs"
materialDefinitionName="NatureBrown"
imageMap0="@Asset=Prototyping:NatureBrown_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/NatureBrown.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/NatureGreen.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="NatureGreen"
scriptFile="@assetFile=NatureGreen.cs"
materialDefinitionName="NatureGreen"
imageMap0="@Asset=Prototyping:NatureGreen_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/NatureGreen.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/NullPink.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="NullPink"
scriptFile="@assetFile=NullPink.cs"
materialDefinitionName="NullPink"
imageMap0="@Asset=Prototyping:NullPink_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/NullPink.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/TrimYellow.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="TrimYellow"
scriptFile="@assetFile=TrimYellow.cs"
materialDefinitionName="TrimYellow"
imageMap0="@Asset=Prototyping:TrimYellow_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/TrimYellow.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="WallOrange"
scriptFile="@assetFile=WallOrange.cs"
materialDefinitionName="WallOrange"
imageMap0="@Asset=Prototyping:WallOrange_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/WallOrange.png" />

1
Templates/BaseGame/game/data/Prototyping/Materials/WaterBlue.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="WaterBlue"
scriptFile="@assetFile=WaterBlue.cs"
materialDefinitionName="WaterBlue"
imageMap0="@Asset=Prototyping:WaterBlue_ALBEDO"
originalFilePath="D:/Gamedev/art/Blockout/WaterBlue.png" />

1
Templates/BaseGame/game/data/Prototyping/shapes/kork_chan.asset.taml
View file

@ -3,5 +3,6 @@
canSaveDynamicFields="true"
AssetName="kork_chan"
scriptFile="@assetFile=kork_chan.cs"
materialDefinitionName="kork_chan"
imageMap0="@Asset=Prototyping:kork_chan_ALBEDO"
originalFilePath="D:/Gamedev/T3DMIT/Resources/Prototyping/Shapes" />

6
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs
View file

@ -28,6 +28,12 @@ function AssetBrowser::editAsset(%this, %assetDef)
}
}
}
else if(!isObject(%assetDef) && strchrpos(%assetDef, ":") != -1)
{
//Turns out we were passed an assetid, not an asset definition.
//Grab the asset def from that
%assetDef = AssetDatabase.acquireAsset(%assetDef);
}
%assetType = %assetDef.getClassName();

2
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml
View file

@ -6,5 +6,5 @@
LevelName="DefaultEditorLevel"
isSubScene="false"
description="An empty room"
staticObjectAssetDependency0="@Asset=FPSGameplay:station01"
staticObjectAssetDependency0="@Asset=Prototyping:FloorGray"
VersionId="1" />

12
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis
View file

@ -5,6 +5,7 @@ new Scene(EditorTemplateLevel) {
isSubScene = "0";
isEditing = "0";
isDirty = "0";
EditPostEffects = "0";
cdTrack = "2";
CTF_scoreLimit = "5";
Enabled = "1";
@ -35,6 +36,7 @@ new Scene(EditorTemplateLevel) {
Material = "BlankSkyMat";
drawBottom = "0";
fogBandHeight = "0";
dirtyGameObject = "0";
position = "0 0 0";
rotation = "1 0 0 0";
scale = "1 1 1";
@ -48,8 +50,6 @@ new Scene(EditorTemplateLevel) {
ambient = "0.337255 0.533333 0.619608 1";
brightness = "1";
castShadows = "1";
staticRefreshFreq = "250";
dynamicRefreshFreq = "8";
coronaEnabled = "1";
coronaScale = "0.5";
coronaTint = "1 1 1 1";
@ -68,6 +68,7 @@ new Scene(EditorTemplateLevel) {
representedInLightmap = "0";
shadowDarkenColor = "0 0 0 -1";
includeLightmappedGeometryInShadow = "0";
dirtyGameObject = "0";
position = "0 0 0";
rotation = "1 0 0 0";
scale = "1 1 1";
@ -75,6 +76,7 @@ new Scene(EditorTemplateLevel) {
canSaveDynamicFields = "1";
bias = "0.1";
Blur = "1";
dynamicRefreshFreq = "8";
Enabled = "1";
height = "1024";
lightBleedFactor = "0.8";
@ -82,13 +84,15 @@ new Scene(EditorTemplateLevel) {
pointShadowType = "PointShadowType_Paraboloid";
shadowBox = "-100 -100 -100 100 100 100";
splitFadeDistances = "1 1 1 1";
staticRefreshFreq = "250";
width = "3072";
};
new GroundPlane() {
squareSize = "128";
scaleU = "25";
scaleV = "25";
Material = "Grid_512_Grey";
MaterialAsset = "Prototyping:FloorGray";
dirtyGameObject = "0";
canSave = "1";
canSaveDynamicFields = "1";
Enabled = "1";
@ -99,12 +103,12 @@ new Scene(EditorTemplateLevel) {
new Skylight() {
Enabled = "1";
ReflectionMode = "Baked Cubemap";
dirtyGameObject = "0";
position = "1.37009 -5.23561 46.5817";
rotation = "1 0 0 0";
canSave = "1";
canSaveDynamicFields = "1";
persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
reflectionPath = "tools/levels/BlankRoom/probes/";
};
};
//--- OBJECT WRITE END ---

3
Templates/BaseGame/game/tools/levels/EditorTemplateLevel.mis
View file

@ -88,7 +88,7 @@ new Scene(EditorTemplateLevel) {
squareSize = "128";
scaleU = "25";
scaleV = "25";
Material = "Grid_512_Grey";
Material = "Prototyping:FloorGray";
canSave = "1";
canSaveDynamicFields = "1";
Enabled = "1";
@ -104,7 +104,6 @@ new Scene(EditorTemplateLevel) {
canSave = "1";
canSaveDynamicFields = "1";
persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
reflectionPath = "tools/levels/BlankRoom/probes/";
};
};
//--- OBJECT WRITE END ---