mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 08:04:40 +00:00
Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check
# Conflicts: # Engine/source/ts/tsShapeConstruct.cpp
This commit is contained in:
commit
c5d0310bc3
180 changed files with 2337 additions and 1572 deletions
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(cameradts)
|
||||
{
|
||||
baseShape = "./camera.dts";
|
||||
baseShapeAsset = "Core_GameObjects:Camera";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(noshapedts)
|
||||
{
|
||||
baseShape = "./noshape.dts";
|
||||
baseShapeAsset = "Core_GameObjects:noshape";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(octahedrondts)
|
||||
{
|
||||
baseShape = "./octahedron.dts";
|
||||
baseShapeAsset = "Core_GameObjects:octahedron";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(simpleconedts)
|
||||
{
|
||||
baseShape = "./simplecone.dts";
|
||||
baseShapeAsset = "Core_GameObjects:simplecone";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_capsuledts)
|
||||
{
|
||||
baseShape = "./unit_capsule.dts";
|
||||
baseShapeAsset = "Core_GameObjects:unit_capsule";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_cubedts)
|
||||
{
|
||||
baseShape = "./unit_cube.dts";
|
||||
baseShapeAsset = "Core_GameObjects:unit_cube";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_spheredts)
|
||||
{
|
||||
baseShape = "./unit_sphere.dts";
|
||||
baseShapeAsset = "Core_GameObjects:unit_sphere";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ new GuiControlProfile (GuiDefaultProfile)
|
|||
fontColorSEL= "255 255 255";
|
||||
|
||||
// bitmap information
|
||||
bitmap = "";
|
||||
bitmapAsset = "";
|
||||
bitmapBase = "";
|
||||
textOffset = "0 0";
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="UnderwaterBasicMat"
|
||||
scriptFile="@assetFile=water.tscript"
|
||||
materialDefinitionName="UnderwaterBasicMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="UnderwaterMat"
|
||||
scriptFile="@assetFile=water.tscript"
|
||||
materialDefinitionName="UnderwaterMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="WaterBasicMat"
|
||||
scriptFile="@assetFile=water.tscript"
|
||||
materialDefinitionName="WaterBasicMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="WaterMat"
|
||||
scriptFile="@assetFile=water.tscript"
|
||||
materialDefinitionName="WaterMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
singleton TSShapeConstructor(Fog_CubeDAE)
|
||||
{
|
||||
baseShape = "./Fog_Cube.DAE";
|
||||
baseShapeAsset = "Core_Rendering:Fog_Cube";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue