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

Include materialball shape asset info

Browse source 
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
This commit is contained in:
Areloch 2019-05-25 03:37:18 -05:00
parent 729391eeeb
commit d1308c3aba
105 changed files with 3192 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Templates/BaseGame/game/data/pbr/images/base_material_ball_ALBEDO.asset.taml Normal file
View file

@ -0,0 +1,9 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="base_material_ball_ALBEDO"
imageFile="@assetFile=base_material_ball"
useMips="true"
isHDRImage="false"
originalFilePath="/base_material_ball"
VersionId="1" />

17
Templates/BaseGame/game/data/pbr/levels/PbrMatTest.mis
View file

@ -86,7 +86,7 @@ new Scene(PbrMatTestLevel) {
surfaceTexture = "Floor_Material";
surface = "0 0 0 1 0 0 0.5 1 0 0 1 1 0 1 1";
surface = "0 1 0 0 0 0 -0.5 1 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707107 0 4 0 1 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707106 0 4 0 1 0 0 1 1 0 1 1";
surface = "0 0.707107 -0.707107 0 0 -4 -2.27374e-13 1 0 0 1 1 0 1 1";
surface = "0.5 0.5 -0.5 0.5 -4 0 -1.49012e-08 1 0 0 1 1 0 1 1";
surface = "0.5 -0.5 0.5 0.5 4 0 -1.49012e-08 1 0 0 1 1 0 1 1";
@ -256,5 +256,20 @@ new Scene(PbrMatTestLevel) {
canSave = "1";
canSaveDynamicFields = "1";
};
/*new ConvexShape() {
Material = "Grid_512_Orange";
position = "1.69488 -1.65352 0.772905";
rotation = "1 0 0 0";
scale = "1 1 1";
canSave = "1";
canSaveDynamicFields = "1";
surface = "0 0 0 1 0 0 0.272904 0 0 0 1 1 0 0 0";
surface = "0 1 0 0 0 0 -0.272904 0 0 0 1 1 0 0 0";
surface = "0.707107 0 0 0.707107 0 0.05 0 0 0 0 1 1 0 0 0";
surface = "0 0.707107 -0.707107 0 0 -0.05 0 0 0 0 1 1 0 0 0";
surface = "0.5 0.5 -0.5 0.5 -0.370958 0 0 0 0 0 1 1 0 0 0";
surface = "0.5 -0.5 0.5 0.5 0.370958 0 0 0 0 0 1 1 0 0 0";
};*/
};
//--- OBJECT WRITE END ---

10
Templates/BaseGame/game/data/pbr/materials/base_material_ball.asset.taml Normal file
View file

@ -0,0 +1,10 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="base_material_ball"
scriptFile="@assetFile=data/pbr/materials/base_material_ball.cs"
materialDefinitionName="base_material_ball"
imageMap0="@Asset=pbr:base_material_ball_ALBEDO"
originalFilePath="/base_material_ball"
shaderGraph="data/pbr/materials/base_material_ball.sgf"
VersionId="1" />

7
Templates/BaseGame/game/data/pbr/materials/base_material_ball.cs Normal file
View file

@ -0,0 +1,7 @@
//--- OBJECT WRITE BEGIN ---
singleton Material(base_material_ball) {
mapTo = "base_material_ball";
DiffuseMap[0] = "data/pbr/Images/base_material_ball";
DiffuseMapAsset[0] = "pbr:base_material_ball_ALBEDO";
};
//--- OBJECT WRITE END ---

9
Templates/BaseGame/game/data/pbr/shapes/material_ball.asset.taml Normal file
View file

@ -0,0 +1,9 @@
<ShapeAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="material_ball"
fileName="@assetFile=material_ball.dae"
isNewShape="1"
materialSlot0="@Asset=pbr:base_material_ball"
originalFilePath="E:/Gamedev/T3DMIT/Preview40Update/Torque3D/My Projects/Preview4_0/game/data/pbr/shapes/material_ball.dae"
VersionId="1" />

5
Templates/BaseGame/game/data/pbr/shapes/material_ball.cs Normal file
View file

@ -0,0 +1,5 @@
singleton TSShapeConstructor(Material_ballDae)
{
baseShape = "./material_ball.dae";
};