Include materialball shape asset info

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

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