mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 00:24:40 +00:00
Force proper update of box probe when attenuation changes
Fixed multiple case sensitivity issues Adds GL ARB check for cubemap arrays for certain cases where the driver only supports the extension, not as core Fixes undeeded namespace declaration in an inline operator function Cleaned up/reordered some modules default in the data dir WIP of Das Boot test map Begun refactoring visualizer tools Added default cloud and water textures to core/rendering so water and cloud objects work correctly Added default Fog_Cube mesh so volumetric fog works correctly
This commit is contained in:
parent
142da31156
commit
e916d14440
697 changed files with 11775 additions and 7072 deletions
|
|
@ -0,0 +1,9 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock_ambientOcclusion"
|
||||
imageFile="@assetFile=greyrock_ambientOcclusion.png"
|
||||
useMips="true"
|
||||
isHDRImage="false"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_ambientOcclusion.png"
|
||||
VersionId="1" />
|
||||
BIN
Templates/Modules/Rocks/Images/greyrock_ambientOcclusion.png
Normal file
BIN
Templates/Modules/Rocks/Images/greyrock_ambientOcclusion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 MiB |
|
|
@ -0,0 +1,9 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock_diffuse"
|
||||
imageFile="@assetFile=greyrock_diffuse.dds"
|
||||
useMips="true"
|
||||
isHDRImage="false"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_diffuse.dds"
|
||||
VersionId="1" />
|
||||
BIN
Templates/Modules/Rocks/Images/greyrock_diffuse.dds
Normal file
BIN
Templates/Modules/Rocks/Images/greyrock_diffuse.dds
Normal file
Binary file not shown.
|
|
@ -0,0 +1,9 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock_metallic"
|
||||
imageFile="@assetFile=greyrock_metallic.png"
|
||||
useMips="true"
|
||||
isHDRImage="false"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_metallic.png"
|
||||
VersionId="1" />
|
||||
BIN
Templates/Modules/Rocks/Images/greyrock_metallic.png
Normal file
BIN
Templates/Modules/Rocks/Images/greyrock_metallic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9 KiB |
|
|
@ -0,0 +1,9 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock_normal"
|
||||
imageFile="@assetFile=greyrock_normal.dds"
|
||||
useMips="true"
|
||||
isHDRImage="false"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_normal.dds"
|
||||
VersionId="1" />
|
||||
BIN
Templates/Modules/Rocks/Images/greyrock_normal.dds
Normal file
BIN
Templates/Modules/Rocks/Images/greyrock_normal.dds
Normal file
Binary file not shown.
|
|
@ -0,0 +1,9 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock_roughness"
|
||||
imageFile="@assetFile=greyrock_roughness.png"
|
||||
useMips="true"
|
||||
isHDRImage="false"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_roughness.png"
|
||||
VersionId="1" />
|
||||
BIN
Templates/Modules/Rocks/Images/greyrock_roughness.png
Normal file
BIN
Templates/Modules/Rocks/Images/greyrock_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.8 MiB |
10
Templates/Modules/Rocks/Rocks.cs
Normal file
10
Templates/Modules/Rocks/Rocks.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
function Rocks::onCreate(%this)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
function Rocks::onDestroy(%this)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
25
Templates/Modules/Rocks/Rocks.module
Normal file
25
Templates/Modules/Rocks/Rocks.module
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<ModuleDefinition
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
ModuleId="Rocks"
|
||||
VersionId="1"
|
||||
Group="Game"
|
||||
scriptFile="Rocks.cs"
|
||||
CreateFunction="onCreate"
|
||||
DestroyFunction="onDestroy">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
<AutoloadAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetType="ComponentAsset"
|
||||
Recurse="true" />
|
||||
<AutoloadAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetType="GUIAsset"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
464
Templates/Modules/Rocks/Shapes/chasmfive.DAE
Normal file
464
Templates/Modules/Rocks/Shapes/chasmfive.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmfive.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmfive.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmfive"
|
||||
fileName="@assetFile=chasmfive.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:greyrock"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmfive.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmfive.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmfive.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmfiveDAE)
|
||||
{
|
||||
baseShape = "./chasmfive.DAE";
|
||||
};
|
||||
464
Templates/Modules/Rocks/Shapes/chasmfour.DAE
Normal file
464
Templates/Modules/Rocks/Shapes/chasmfour.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmfour.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmfour.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmfour"
|
||||
fileName="@assetFile=chasmfour.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmfour.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmfour.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmfour.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmfourDAE)
|
||||
{
|
||||
baseShape = "./chasmfour.DAE";
|
||||
};
|
||||
652
Templates/Modules/Rocks/Shapes/chasmone.DAE
Normal file
652
Templates/Modules/Rocks/Shapes/chasmone.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmone.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmone.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmone"
|
||||
fileName="@assetFile=chasmone.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmone.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmone.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmone.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmoneDAE)
|
||||
{
|
||||
baseShape = "./chasmone.DAE";
|
||||
};
|
||||
464
Templates/Modules/Rocks/Shapes/chasmseven.DAE
Normal file
464
Templates/Modules/Rocks/Shapes/chasmseven.DAE
Normal file
File diff suppressed because one or more lines are too long
10
Templates/Modules/Rocks/Shapes/chasmseven.asset.taml
Normal file
10
Templates/Modules/Rocks/Shapes/chasmseven.asset.taml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmseven"
|
||||
fileName="@assetFile=chasmseven.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
materialSlot1="@Asset=Rocks:greyrock"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmseven.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmseven.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmseven.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmsevenDAE)
|
||||
{
|
||||
baseShape = "./chasmseven.DAE";
|
||||
};
|
||||
511
Templates/Modules/Rocks/Shapes/chasmsix.DAE
Normal file
511
Templates/Modules/Rocks/Shapes/chasmsix.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmsix.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmsix.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmsix"
|
||||
fileName="@assetFile=chasmsix.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmsix.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmsix.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmsix.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmsixDAE)
|
||||
{
|
||||
baseShape = "./chasmsix.DAE";
|
||||
};
|
||||
895
Templates/Modules/Rocks/Shapes/chasmthree.DAE
Normal file
895
Templates/Modules/Rocks/Shapes/chasmthree.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmthree.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmthree.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmthree"
|
||||
fileName="@assetFile=chasmthree.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmthree.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmthree.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmthree.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmthreeDAE)
|
||||
{
|
||||
baseShape = "./chasmthree.DAE";
|
||||
};
|
||||
511
Templates/Modules/Rocks/Shapes/chasmtwo.DAE
Normal file
511
Templates/Modules/Rocks/Shapes/chasmtwo.DAE
Normal file
File diff suppressed because one or more lines are too long
9
Templates/Modules/Rocks/Shapes/chasmtwo.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/chasmtwo.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="chasmtwo"
|
||||
fileName="@assetFile=chasmtwo.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR225G198B87-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/chasmtwo.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/chasmtwo.cs
Normal file
5
Templates/Modules/Rocks/Shapes/chasmtwo.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(ChasmtwoDAE)
|
||||
{
|
||||
baseShape = "./chasmtwo.DAE";
|
||||
};
|
||||
536
Templates/Modules/Rocks/Shapes/cliffwallone.DAE
Normal file
536
Templates/Modules/Rocks/Shapes/cliffwallone.DAE
Normal file
File diff suppressed because one or more lines are too long
BIN
Templates/Modules/Rocks/Shapes/cliffwallone.DAE.imposter.dds
Normal file
BIN
Templates/Modules/Rocks/Shapes/cliffwallone.DAE.imposter.dds
Normal file
Binary file not shown.
Binary file not shown.
9
Templates/Modules/Rocks/Shapes/cliffwallone.asset.taml
Normal file
9
Templates/Modules/Rocks/Shapes/cliffwallone.asset.taml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cliffwallone"
|
||||
fileName="@assetFile=cliffwallone.DAE"
|
||||
isNewShape="1"
|
||||
materialSlot0="@Asset=Rocks:ColorEffectR88G143B225-material"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/cliffwallone.DAE"
|
||||
VersionId="1" />
|
||||
5
Templates/Modules/Rocks/Shapes/cliffwallone.cs
Normal file
5
Templates/Modules/Rocks/Shapes/cliffwallone.cs
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
singleton TSShapeConstructor(CliffwalloneDAE)
|
||||
{
|
||||
baseShape = "./cliffwallone.DAE";
|
||||
};
|
||||
14
Templates/Modules/Rocks/materials/greyrock.asset.taml
Normal file
14
Templates/Modules/Rocks/materials/greyrock.asset.taml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="greyrock"
|
||||
scriptFile="@assetFile=greyrock.cs"
|
||||
materialDefinitionName="greyrock"
|
||||
imageMap0="@Asset=Rocks:greyrock_diffuse"
|
||||
imageMap1="@Asset=Rocks:greyrock_normal"
|
||||
imageMap2="@Asset=Rocks:greyrock_metallic"
|
||||
imageMap3="@Asset=Rocks:greyrock_roughness"
|
||||
imageMap4="@Asset=Rocks:greyrock_ambientOcclusion"
|
||||
originalFilePath="E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock"
|
||||
shaderGraph="data/Rocks/materials/greyrock.sgf"
|
||||
VersionId="1" />
|
||||
16
Templates/Modules/Rocks/materials/greyrock.cs
Normal file
16
Templates/Modules/Rocks/materials/greyrock.cs
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
singleton Material(greyrock) {
|
||||
mapTo = "greyrock";
|
||||
DiffuseMapAsset[0] = "Rocks:greyrock_diffuse";
|
||||
NormalMap[0] = "data/Rocks/Images/greyrock_normal.dds";
|
||||
NormalMapAsset[0] = "Rocks:greyrock_normal";
|
||||
RoughMap[0] = "E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_roughness.png";
|
||||
RoughMapAsset[0] = "Rocks:greyrock_roughness";
|
||||
AOMap[0] = "E:/Gamedev/Art/Pacific/art/shapes/rocks/greyrock_ambientOcclusion.png";
|
||||
AOMapAsset[0] = "Rocks:greyrock_ambientOcclusion";
|
||||
diffuseMap[0] = "data/Rocks/Images/greyrock_diffuse.dds";
|
||||
AOMapAsset0 = "Rocks:greyrock_ambientOcclusion";
|
||||
NormalMapAsset0 = "Rocks:greyrock_normal";
|
||||
RoughMapAsset0 = "Rocks:greyrock_roughness";
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
Loading…
Add table
Add a link
Reference in a new issue