Converts all game, gui editor, and system classes to utilize assets
Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
|
|
@ -6,4 +6,9 @@
|
|||
CreateFunction="onCreate"
|
||||
DestroyFunction="onDestroy"
|
||||
Group="Core">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
|
|
@ -7,4 +7,9 @@
|
|||
DestroyFunction="onDestroy"
|
||||
Group="Core"
|
||||
Dependencies="Core_GUI=1">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<GUIAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="ConsoleDlg"
|
||||
scriptFile="@assetFile=console.gui"
|
||||
GUIFile="@assetFile=console.gui"
|
||||
VersionId="1" />
|
||||
|
|
@ -18,7 +18,7 @@ datablock ParticleEmitterNodeData(DefaultEmitterNodeData)
|
|||
|
||||
datablock ParticleData(DefaultParticle)
|
||||
{
|
||||
textureName = "core/gameObjects/images/defaultParticle";
|
||||
textureAsset = "Core_GameObjects:defaultParticle_image";
|
||||
dragCoefficient = 0.498534;
|
||||
gravityCoefficient = 0;
|
||||
inheritedVelFactor = 0.499022;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="camera_image"
|
||||
imageFile="@assetFile=camera.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="defaultParticle_image"
|
||||
imageFile="@assetFile=defaultParticle.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="defaultRoadTextureOther_image"
|
||||
imageFile="@assetFile=defaultRoadTextureOther.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="defaultRoadTextureTop_image"
|
||||
imageFile="@assetFile=defaultRoadTextureTop.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="defaultpath_image"
|
||||
imageFile="@assetFile=defaultpath.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="defaultpath_normal_image"
|
||||
imageFile="@assetFile=defaultpath_normal.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="green_image"
|
||||
imageFile="@assetFile=green.jpg"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="ribTex_image"
|
||||
imageFile="@assetFile=ribTex.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -58,7 +58,7 @@ singleton CustomMaterial( TexturedRibbonMat )
|
|||
|
||||
singleton Material(DefaultDecalRoadMaterial)
|
||||
{
|
||||
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureTop.png";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
|
||||
mapTo = "unmapped_mat";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
|
|
@ -66,13 +66,13 @@ singleton Material(DefaultDecalRoadMaterial)
|
|||
singleton Material(DefaultRoadMaterialTop)
|
||||
{
|
||||
mapTo = "unmapped_mat";
|
||||
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureTop.png";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
|
||||
singleton Material(DefaultRoadMaterialOther)
|
||||
{
|
||||
mapTo = "unmapped_mat";
|
||||
diffuseMap[0] = "core/gameObjects/images/defaultRoadTextureOther.png";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureOther_image";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Camera"
|
||||
fileName="@assetFile=camera.dts"
|
||||
constuctorFileName="@assetFile=camera.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cameradts)
|
||||
{
|
||||
baseShape = "./camera.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -24,7 +24,7 @@ singleton Material(OctahedronMat)
|
|||
{
|
||||
mapTo = "green";
|
||||
|
||||
diffuseMap[0] = "core/gameObjects/images/camera";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
|
||||
|
||||
translucent = "1";
|
||||
translucentBlendOp = "PreMul";
|
||||
|
|
@ -39,7 +39,7 @@ singleton Material(CameraMat)
|
|||
{
|
||||
mapTo = "pasted__phongE1";
|
||||
|
||||
diffuseMap[0] = "core/gameObjects/images/camera";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
|
||||
|
||||
diffuseColor[0] = "0 0.627451 1 1";
|
||||
specular[0] = "1 1 1 1";
|
||||
|
|
@ -60,7 +60,7 @@ singleton Material(noshape_NoShape)
|
|||
{
|
||||
mapTo = "NoShape";
|
||||
|
||||
diffuseMap[0] = "";
|
||||
diffuseMapAsset[0] = "";
|
||||
|
||||
diffuseColor[0] = "0.8 0.003067 0 .8";
|
||||
emissive[0] = 0;
|
||||
|
|
@ -78,7 +78,7 @@ singleton Material(noshapetext_lambert1)
|
|||
{
|
||||
mapTo = "lambert1";
|
||||
|
||||
diffuseMap[0] = "";
|
||||
diffuseMapAsset[0] = "";
|
||||
|
||||
diffuseColor[0] = "0.4 0.4 0.4 1";
|
||||
specular[0] = "1 1 1 1";
|
||||
|
|
@ -95,7 +95,7 @@ singleton Material(noshapetext_noshape_mat)
|
|||
{
|
||||
mapTo = "noshape_mat";
|
||||
|
||||
diffuseMap[0] = "";
|
||||
diffuseMapAsset[0] = "";
|
||||
|
||||
diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
|
||||
specular[0] = "1 1 1 1";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="noshape"
|
||||
fileName="@assetFile=noshape.dts"
|
||||
constuctorFileName="@assetFile=noshape.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(noshapedts)
|
||||
{
|
||||
baseShape = "./noshape.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="octahedron"
|
||||
fileName="@assetFile=octahedron.dts"
|
||||
constuctorFileName="@assetFile=octahedron.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(octahedrondts)
|
||||
{
|
||||
baseShape = "./octahedron.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="simplecone"
|
||||
fileName="@assetFile=simplecone.dts"
|
||||
constuctorFileName="@assetFile=simplecone.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(simpleconedts)
|
||||
{
|
||||
baseShape = "./simplecone.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="unit_capsule"
|
||||
fileName="@assetFile=unit_capsule.dts"
|
||||
constuctorFileName="@assetFile=unit_capsule.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_capsuledts)
|
||||
{
|
||||
baseShape = "./unit_capsule.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="unit_cube"
|
||||
fileName="@assetFile=unit_cube.dts"
|
||||
constuctorFileName="@assetFile=unit_cube.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_cubedts)
|
||||
{
|
||||
baseShape = "./unit_cube.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="unit_sphere"
|
||||
fileName="@assetFile=unit_sphere.dts"
|
||||
constuctorFileName="@assetFile=unit_sphere.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(unit_spheredts)
|
||||
{
|
||||
baseShape = "./unit_sphere.dts";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -7,4 +7,9 @@
|
|||
DestroyFunction="onDestroy"
|
||||
Group="Core"
|
||||
Dependencies="Core_Rendering=1">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="button_image"
|
||||
imageFile="@assetFile=button.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="checkbox_image"
|
||||
imageFile="@assetFile=checkbox.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="group_border_image"
|
||||
imageFile="@assetFile=group-border.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="inactive_overlay_image"
|
||||
imageFile="@assetFile=inactive-overlay.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="loadingbar_image"
|
||||
imageFile="@assetFile=loadingbar.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="scrollBar_image"
|
||||
imageFile="@assetFile=scrollBar.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="slider_image"
|
||||
imageFile="@assetFile=slider.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="textEdit_image"
|
||||
imageFile="@assetFile=textEdit.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="thumbHighlightButton_image"
|
||||
imageFile="@assetFile=thumbHighlightButton.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="window_image"
|
||||
imageFile="@assetFile=window.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -107,7 +107,7 @@ new GuiControlProfile (GuiWindowProfile)
|
|||
bevelColorHL = "255 255 255";
|
||||
bevelColorLL = "0 0 0";
|
||||
text = "untitled";
|
||||
bitmap = "core/gui/images/window";
|
||||
bitmapAsset = "Core_GUI:window_image";
|
||||
textOffset = "8 4";
|
||||
hasBitmapArray = true;
|
||||
justify = "left";
|
||||
|
|
@ -119,7 +119,7 @@ if(!isObject(GuiTextEditProfile))
|
|||
new GuiControlProfile(GuiTextEditProfile)
|
||||
{
|
||||
opaque = true;
|
||||
bitmap = "core/gui/images/textEdit";
|
||||
bitmapAsset = "Core_GUI:textEdit_image";
|
||||
hasBitmapArray = true;
|
||||
border = -2;
|
||||
fillColor = "242 241 240 0";
|
||||
|
|
@ -145,7 +145,7 @@ new GuiControlProfile(GuiScrollProfile)
|
|||
fontColor = "0 0 0";
|
||||
fontColorHL = "150 150 150";
|
||||
border = true;
|
||||
bitmap = "core/gui/images/scrollBar";
|
||||
bitmapAsset = "Core_GUI:scrollBar_image";
|
||||
hasBitmapArray = true;
|
||||
category = "Core";
|
||||
};
|
||||
|
|
@ -173,7 +173,7 @@ new GuiControlProfile(GuiCheckBoxProfile)
|
|||
fontColorNA = "200 200 200";
|
||||
fixedExtent = true;
|
||||
justify = "left";
|
||||
bitmap = "core/gui/images/checkbox";
|
||||
bitmapAsset = "Core_GUI:checkbox_image";
|
||||
hasBitmapArray = true;
|
||||
category = "Tools";
|
||||
};
|
||||
|
|
@ -193,7 +193,7 @@ new GuiControlProfile( GuiProgressBitmapProfile )
|
|||
{
|
||||
border = false;
|
||||
hasBitmapArray = true;
|
||||
bitmap = "core/gui/images/loadingbar";
|
||||
bitmapAsset = "Core_GUI:loadingbar_image";
|
||||
category = "Core";
|
||||
};
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ new GuiControlProfile( GuiButtonProfile )
|
|||
fixedExtent = false;
|
||||
justify = "center";
|
||||
canKeyFocus = false;
|
||||
bitmap = "core/gui/images/button";
|
||||
bitmapAsset = "Core_GUI:button_image";
|
||||
hasBitmapArray = false;
|
||||
category = "Core";
|
||||
};
|
||||
|
|
@ -231,6 +231,6 @@ new GuiControlProfile( GuiButtonProfile )
|
|||
if( !isObject( GuiSliderProfile ) )
|
||||
new GuiControlProfile( GuiSliderProfile )
|
||||
{
|
||||
bitmap = "core/gui/images/slider";
|
||||
bitmapAsset = "Core_GUI:slider_image";
|
||||
category = "Core";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,4 +6,9 @@
|
|||
CreateFunction="onCreate"
|
||||
DestroyFunction="onDestroy"
|
||||
Group="Core">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
|
|
@ -7,4 +7,9 @@
|
|||
DestroyFunction="onDestroy"
|
||||
Group="Core"
|
||||
Dependencies="Core_Rendering=1,Core_Lighting=1">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AreaMap33_image"
|
||||
imageFile="@assetFile=AreaMap33.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="caustics_1_image"
|
||||
imageFile="@assetFile=caustics_1.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="caustics_2_image"
|
||||
imageFile="@assetFile=caustics_2.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="inactive_overlay_image"
|
||||
imageFile="@assetFile=inactive-overlay.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="missingTexture_image"
|
||||
imageFile="@assetFile=missingTexture.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="noise_image"
|
||||
imageFile="@assetFile=noise.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="null_color_ramp_image"
|
||||
imageFile="@assetFile=null_color_ramp.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="unavailable_image"
|
||||
imageFile="@assetFile=unavailable.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="warnMat_image"
|
||||
imageFile="@assetFile=warnMat.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -58,7 +58,7 @@ singleton PostEffect( CausticsPFX )
|
|||
shader = PFX_CausticsShader;
|
||||
stateBlock = PFX_CausticsStateBlock;
|
||||
texture[0] = "#deferred";
|
||||
texture[1] = "core/postFX/images/caustics_1";
|
||||
texture[2] = "core/postFX/images/caustics_2";
|
||||
textureAsset[1] = "Core_PostFX:caustics_1_image";
|
||||
textureAsset[2] = "Core_PostFX:caustics_2_image";
|
||||
target = "$backBuffer";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Eerie_image"
|
||||
imageFile="@assetFile=Eerie.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Misty_Blue_image"
|
||||
imageFile="@assetFile=Misty_Blue.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Warm_Day_image"
|
||||
imageFile="@assetFile=Warm_Day.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="perfect_Gradient_image"
|
||||
imageFile="@assetFile=perfect_Gradient.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -162,7 +162,7 @@ singleton PostEffect( MLAAFx )
|
|||
|
||||
texture[0] = "$inTex"; // Edges mask
|
||||
texture[1] = "$inTex"; // Edges mask
|
||||
texture[2] = "core/postFX/images/AreaMap33.dds";
|
||||
textureAsset[2] = "Core_PostFX:AreaMap33_image";
|
||||
};
|
||||
|
||||
new PostEffect()
|
||||
|
|
@ -183,4 +183,4 @@ function MLAAFx::setShaderConsts(%this)
|
|||
%this.setShaderConst("$lumaCoefficients", %this.lumaCoefficients);
|
||||
%this.setShaderConst("$threshold", %this.threshold);
|
||||
%this.setShaderConst("$depthThreshold", %this.depthThreshold);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ singleton PostEffect( SSAOPostFx )
|
|||
stateBlock = SSAOStateBlock;
|
||||
|
||||
texture[0] = "#deferred";
|
||||
texture[1] = "core/postFX/images/noise.png";
|
||||
textureAsset[1] = "Core_PostFX:noise_image";
|
||||
texture[2] = "#ssao_pow_table";
|
||||
|
||||
target = "$outTex";
|
||||
|
|
@ -369,4 +369,4 @@ singleton PostEffect( SSAOPowTablePostFx )
|
|||
|
||||
targetFormat = "GFXFormatR16F";
|
||||
targetSize = "256 1";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ function Core_Rendering::onCreate(%this)
|
|||
$Core::DefaultPrefilterCubemap = "core/rendering/images/default_prefilter.dds";
|
||||
$Core::BRDFTexture = "core/rendering/images/brdfTexture.dds";
|
||||
|
||||
$Core::NoImageAssetFallback = "Core_Rendering:missingTexture_image";
|
||||
$Core::NoMaterialAssetFallback = "Core_Rendering:noMaterial";
|
||||
$Core::NoShapeAssetFallback = "Core_Rendering:noShape";
|
||||
|
||||
$pref::ReflectionProbes::BakeResolution = ProjectSettings.value("Rendering/ProbeCaptureResolution", "64");
|
||||
|
||||
$Terrain::LerpBlend = ProjectSettings.value("Terrain/LerpBlend");
|
||||
|
|
@ -28,13 +32,6 @@ function Core_Rendering::onCreate(%this)
|
|||
exec("./scripts/graphicsOptions." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/terrainSettings." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/renderManager." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/clouds." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/commonMaterialData." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/scatterSky." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/shaders." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/terrainBlock." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/water." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/warningTerrainMat." @ $TorqueScriptFileExtension);
|
||||
}
|
||||
|
||||
function Core_Rendering::onDestroy(%this)
|
||||
|
|
@ -46,6 +43,14 @@ function Core_Rendering::initClient(%this)
|
|||
// Start rendering and stuff.
|
||||
initRenderManager();
|
||||
initLightingSystems("Advanced Lighting");
|
||||
|
||||
exec("./scripts/gfxData/clouds." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/commonMaterialData." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/scatterSky." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/shaders." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/terrainBlock." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/water." @ $TorqueScriptFileExtension);
|
||||
exec("./scripts/gfxData/warningTerrainMat." @ $TorqueScriptFileExtension);
|
||||
|
||||
//load prefs
|
||||
exec("data/defaults." @ $TorqueScriptFileExtension);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="brdfTexture_image"
|
||||
imageFile="@assetFile=brdfTexture.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cloud1_image"
|
||||
imageFile="@assetFile=cloud1.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cloud2_image"
|
||||
imageFile="@assetFile=cloud2.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cloud3_image"
|
||||
imageFile="@assetFile=cloud3.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="clouds_normal_displacement_image"
|
||||
imageFile="@assetFile=clouds_normal_displacement.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="default_irradiance_image"
|
||||
imageFile="@assetFile=default_irradiance.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="default_prefilter_image"
|
||||
imageFile="@assetFile=default_prefilter.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="depthcolor_ramp_image"
|
||||
imageFile="@assetFile=depthcolor_ramp.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="foam_image"
|
||||
imageFile="@assetFile=foam.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="missingTexture_image"
|
||||
imageFile="@assetFile=missingTexture.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="ripple_image"
|
||||
imageFile="@assetFile=ripple.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="unavailable_image"
|
||||
imageFile="@assetFile=unavailable.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="warnMat_image"
|
||||
imageFile="@assetFile=warnMat.dds"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// Copyright (c) 2012 GarageGames, LLC
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to
|
||||
// deal in the Software without restriction, including without limitation the
|
||||
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
// sell copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
singleton CubemapData( NightCubemap )
|
||||
{
|
||||
cubeFace[0] = "./skybox_1";
|
||||
cubeFace[1] = "./skybox_2";
|
||||
cubeFace[2] = "./skybox_3";
|
||||
cubeFace[3] = "./skybox_4";
|
||||
cubeFace[4] = "./skybox_5";
|
||||
cubeFace[5] = "./skybox_6";
|
||||
};
|
||||
|
||||
singleton Material( NightSkyMat )
|
||||
{
|
||||
cubemap = NightCubemap;
|
||||
materialTag0 = "Skies";
|
||||
};
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_noglow"
|
||||
scriptFile="@assetFile=moon_noglow.tscript"
|
||||
materialDefinitionName="moon_noglow"
|
||||
imageMap0="@Asset=Core_Rendering:moon_noglow_image"/>
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/moon_noglow.png
Normal file
|
After Width: | Height: | Size: 170 KiB |
|
|
@ -0,0 +1,9 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
singleton Material(moon_noglow) {
|
||||
mapTo="moon_noglow";
|
||||
DiffuseMapAsset = "Core_Rendering:moon_noglow_image";
|
||||
emissive = true;
|
||||
translucent = true;
|
||||
vertColor[ 0 ] = true;
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_noglow_image"
|
||||
imageFile="@assetFile=moon_noglow.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_wcorona"
|
||||
imageFile="@assetFile=moon_wcorona.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
After Width: | Height: | Size: 864 KiB |
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_wglow"
|
||||
scriptFile="@assetFile=moon_wglow.tscript"
|
||||
materialDefinitionName="moon_wglow"
|
||||
imageMap0="@Asset=Core_Rendering:moon_wglow_image"/>
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/moon_wglow.png
Normal file
|
After Width: | Height: | Size: 251 KiB |
|
|
@ -0,0 +1,9 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
singleton Material(moon_wglow) {
|
||||
mapTo="moon_wglow";
|
||||
DiffuseMapAsset = "Core_Rendering:moon_wglow_image";
|
||||
emissive = true;
|
||||
translucent = true;
|
||||
vertColor[ 0 ] = true;
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_wglow_image"
|
||||
imageFile="@assetFile=moon_wglow.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_1"
|
||||
imageFile="@assetFile=skybox_1.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_1.png
Normal file
|
After Width: | Height: | Size: 528 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_2"
|
||||
imageFile="@assetFile=skybox_2.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_2.png
Normal file
|
After Width: | Height: | Size: 530 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_3"
|
||||
imageFile="@assetFile=skybox_3.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_3.png
Normal file
|
After Width: | Height: | Size: 500 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_4"
|
||||
imageFile="@assetFile=skybox_4.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_4.png
Normal file
|
After Width: | Height: | Size: 502 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_5"
|
||||
imageFile="@assetFile=skybox_5.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_5.png
Normal file
|
After Width: | Height: | Size: 602 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<ImageAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="skybox_6"
|
||||
imageFile="@assetFile=skybox_6.png"
|
||||
UseMips="true"
|
||||
isHDRImage="false"
|
||||
imageType="Albedo" />
|
||||
BIN
Templates/BaseGame/game/core/rendering/materials/skybox_6.png
Normal file
|
After Width: | Height: | Size: 390 KiB |
|
|
@ -3,5 +3,5 @@ new TerrainMaterial()
|
|||
diffuseSize = "200";
|
||||
detailSize = "10";
|
||||
internalName = "warning_material";
|
||||
diffuseMap = "core/rendering/images/warnMat";
|
||||
};
|
||||
diffuseMapAsset = "Core_Rendering:warnMat_image";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Fog_Cube"
|
||||
fileName="@assetFile=Fog_Cube.DAE"
|
||||
constuctorFileName="@assetFile=Fog_Cube.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(Fog_CubeDAE)
|
||||
{
|
||||
baseShape = "./Fog_Cube.DAE";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -3,7 +3,7 @@ singleton Material(noshape_NoShape)
|
|||
{
|
||||
mapTo = "NoShape";
|
||||
|
||||
diffuseMap[0] = "";
|
||||
diffuseMapAsset[0] = "";
|
||||
diffuseColor[0] = "0.8 0.003067 0 .8";
|
||||
emissive[0] = 0;
|
||||
doubleSided = false;
|
||||
|
|
|
|||
|
|
@ -6,4 +6,9 @@
|
|||
CreateFunction="onCreate"
|
||||
DestroyFunction="onDestroy"
|
||||
Group="Core">
|
||||
<DeclaredAssets
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
Extension="asset.taml"
|
||||
Recurse="true" />
|
||||
</ModuleDefinition>
|
||||