mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 16:44:36 +00:00
Fixes and cleans up various issues and error spam for core and tools folders
Also: Fixes error spam about CreatorIconArray Fixes error spam about duplicate uses of various materials Converts a number of materials to be packed into the mat assets for cleanliness and preventing unwanted duplicate exec's Removed some extraneous misconvert '.asset.taml' files Fixes 'cannot compile shader' error when trying to use the viz modes Fixed a some instances of guiControlProfiles not being actually defined Fixed some instances of guiControlProfiles being duplicated
This commit is contained in:
JeffR
parent
0fad36787f
commit
2c999008f1
87 changed files with 373 additions and 1245 deletions
|
|
@ -0,0 +1,7 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="BasicRibbonMat"
|
||||
scriptFile="@assetFile=BasicRibbonMat.tscript"
|
||||
materialDefinitionName="BasicRibbonMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
singleton ShaderData( BasicRibbonShader )
|
||||
{
|
||||
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl";
|
||||
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl";
|
||||
|
||||
OGLVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderV.glsl";
|
||||
OGLPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderP.glsl";
|
||||
|
||||
samplerNames[0] = "$ribTex";
|
||||
|
||||
pixVersion = 2.0;
|
||||
};
|
||||
|
||||
singleton CustomMaterial( BasicRibbonMat )
|
||||
{
|
||||
shader = BasicRibbonShader;
|
||||
version = 2.0;
|
||||
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = true;
|
||||
translucent = true;
|
||||
BlendOp = AddAlpha;
|
||||
translucentBlendOp = AddAlpha;
|
||||
|
||||
preload = true;
|
||||
};
|
||||
|
|
@ -2,6 +2,13 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="DefaultDecalRoadMaterial"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="DefaultDecalRoadMaterial"
|
||||
VersionId="1" />
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="DefaultDecalRoadMaterial">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_GameObjects:defaultRoadTextureTop_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,13 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="DefaultRoadMaterialOther"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="DefaultRoadMaterialOther"
|
||||
VersionId="1" />
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="DefaultRoadMaterialOther">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_GameObjects:defaultRoadTextureOther_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,13 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="DefaultRoadMaterialTop"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="DefaultRoadMaterialTop"
|
||||
VersionId="1" />
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="DefaultRoadMaterialTop">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_GameObjects:defaultRoadTextureTop_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="TexturedRibbonMat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
scriptFile="@assetFile=TexturedRibbonMat.tscript"
|
||||
materialDefinitionName="TexturedRibbonMat"
|
||||
VersionId="1" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
singleton ShaderData( TexturedRibbonShader )
|
||||
{
|
||||
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl";
|
||||
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl";
|
||||
|
||||
OGLVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderV.glsl";
|
||||
OGLPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderP.glsl";
|
||||
|
||||
samplerNames[0] = "$ribTex";
|
||||
|
||||
pixVersion = 2.0;
|
||||
};
|
||||
|
||||
singleton CustomMaterial( TexturedRibbonMat )
|
||||
{
|
||||
shader = TexturedRibbonShader;
|
||||
version = 2.0;
|
||||
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = true;
|
||||
translucent = true;
|
||||
BlendOp = AddAlpha;
|
||||
translucentBlendOp = AddAlpha;
|
||||
|
||||
sampler["ribTex"] = "core/gameObjects/images/ribTex.png";
|
||||
|
||||
preload = true;
|
||||
};
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
singleton ShaderData( BasicRibbonShader )
|
||||
{
|
||||
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl";
|
||||
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl";
|
||||
|
||||
OGLVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderV.glsl";
|
||||
OGLPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderP.glsl";
|
||||
|
||||
samplerNames[0] = "$ribTex";
|
||||
|
||||
pixVersion = 2.0;
|
||||
};
|
||||
|
||||
singleton CustomMaterial( BasicRibbonMat )
|
||||
{
|
||||
shader = BasicRibbonShader;
|
||||
version = 2.0;
|
||||
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = true;
|
||||
translucent = true;
|
||||
BlendOp = AddAlpha;
|
||||
translucentBlendOp = AddAlpha;
|
||||
|
||||
preload = true;
|
||||
};
|
||||
|
||||
singleton ShaderData( TexturedRibbonShader )
|
||||
{
|
||||
DXVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl";
|
||||
DXPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl";
|
||||
|
||||
OGLVertexShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderV.glsl";
|
||||
OGLPixelShaderFile = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderP.glsl";
|
||||
|
||||
samplerNames[0] = "$ribTex";
|
||||
|
||||
pixVersion = 2.0;
|
||||
};
|
||||
|
||||
singleton CustomMaterial( TexturedRibbonMat )
|
||||
{
|
||||
shader = TexturedRibbonShader;
|
||||
version = 2.0;
|
||||
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = true;
|
||||
translucent = true;
|
||||
BlendOp = AddAlpha;
|
||||
translucentBlendOp = AddAlpha;
|
||||
|
||||
sampler["ribTex"] = "core/gameObjects/images/ribTex.png";
|
||||
|
||||
preload = true;
|
||||
};
|
||||
|
||||
singleton Material(DefaultDecalRoadMaterial)
|
||||
{
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
|
||||
mapTo = "unmapped_mat";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
|
||||
singleton Material(DefaultRoadMaterialTop)
|
||||
{
|
||||
mapTo = "unmapped_mat";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
|
||||
singleton Material(DefaultRoadMaterialOther)
|
||||
{
|
||||
mapTo = "unmapped_mat";
|
||||
diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureOther_image";
|
||||
materialTag0 = "RoadAndPath";
|
||||
};
|
||||
|
|
@ -2,6 +2,19 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="CameraMat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="CameraMat"
|
||||
VersionId="1" />
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="CameraMat"
|
||||
doubleSided="1"
|
||||
translucent="1"
|
||||
translucentBlendOp="LerpAlpha"
|
||||
castShadows="0">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_GameObjects:camera_image"
|
||||
diffuseColor="0 0.627451 1 1"
|
||||
emissive="1"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="Green"
|
||||
scriptFile="@assetFile=green"
|
||||
materialDefinitionName="Green"
|
||||
originalFilePath="D:/Gamedev/Projects/Catographer/GameBuild/Templates/BaseGame/game/core/gameObjects/shapes/green" />
|
||||
|
|
@ -2,6 +2,18 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="OctahedronMat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="OctahedronMat"
|
||||
VersionId="1" />
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="OctahedronMat"
|
||||
mapTo="green"
|
||||
translucent="1"
|
||||
translucentBlendOp="PreMul"
|
||||
castShadows="0">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_GameObjects:camera_image"
|
||||
diffuseColor="0 1 0 1"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -1,196 +0,0 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
new Material(OctahedronMat) {
|
||||
mapTo = "green";
|
||||
diffuseColor[0] = "0 1 0 1";
|
||||
diffuseColor[1] = "1 1 1 1";
|
||||
diffuseColor[2] = "1 1 1 1";
|
||||
diffuseColor[3] = "1 1 1 1";
|
||||
DiffuseMap[0] = "core/gameObjects/images/camera";
|
||||
diffuseMapSRGB[0] = "1";
|
||||
diffuseMapSRGB[1] = "1";
|
||||
diffuseMapSRGB[2] = "1";
|
||||
diffuseMapSRGB[3] = "1";
|
||||
detailScale[0] = "2 2";
|
||||
detailScale[1] = "2 2";
|
||||
detailScale[2] = "2 2";
|
||||
detailScale[3] = "2 2";
|
||||
detailNormalMapStrength[0] = "1";
|
||||
detailNormalMapStrength[1] = "1";
|
||||
detailNormalMapStrength[2] = "1";
|
||||
detailNormalMapStrength[3] = "1";
|
||||
roughness[0] = "1";
|
||||
roughness[1] = "1";
|
||||
roughness[2] = "1";
|
||||
roughness[3] = "1";
|
||||
metalness[0] = "0";
|
||||
metalness[1] = "0";
|
||||
metalness[2] = "0";
|
||||
metalness[3] = "0";
|
||||
glowMul[0] = "0";
|
||||
glowMul[1] = "0";
|
||||
glowMul[2] = "0";
|
||||
glowMul[3] = "0";
|
||||
accuEnabled[0] = "0";
|
||||
accuEnabled[1] = "0";
|
||||
accuEnabled[2] = "0";
|
||||
accuEnabled[3] = "0";
|
||||
accuScale[0] = "1";
|
||||
accuScale[1] = "1";
|
||||
accuScale[2] = "1";
|
||||
accuScale[3] = "1";
|
||||
accuDirection[0] = "1";
|
||||
accuDirection[1] = "1";
|
||||
accuDirection[2] = "1";
|
||||
accuDirection[3] = "1";
|
||||
accuStrength[0] = "0.6";
|
||||
accuStrength[1] = "0.6";
|
||||
accuStrength[2] = "0.6";
|
||||
accuStrength[3] = "0.6";
|
||||
accuCoverage[0] = "0.9";
|
||||
accuCoverage[1] = "0.9";
|
||||
accuCoverage[2] = "0.9";
|
||||
accuCoverage[3] = "0.9";
|
||||
accuSpecular[0] = "16";
|
||||
accuSpecular[1] = "16";
|
||||
accuSpecular[2] = "16";
|
||||
accuSpecular[3] = "16";
|
||||
isSRGB[0] = "0";
|
||||
isSRGB[1] = "0";
|
||||
isSRGB[2] = "0";
|
||||
isSRGB[3] = "0";
|
||||
invertRoughness[0] = "0";
|
||||
invertRoughness[1] = "0";
|
||||
invertRoughness[2] = "0";
|
||||
invertRoughness[3] = "0";
|
||||
roughnessChan[0] = "0";
|
||||
roughnessChan[1] = "0";
|
||||
roughnessChan[2] = "0";
|
||||
roughnessChan[3] = "0";
|
||||
AOChan[0] = "1";
|
||||
AOChan[1] = "1";
|
||||
AOChan[2] = "1";
|
||||
AOChan[3] = "1";
|
||||
metalChan[0] = "2";
|
||||
metalChan[1] = "2";
|
||||
metalChan[2] = "2";
|
||||
metalChan[3] = "2";
|
||||
glow[0] = "0";
|
||||
glow[1] = "0";
|
||||
glow[2] = "0";
|
||||
glow[3] = "0";
|
||||
parallaxScale[0] = "0";
|
||||
parallaxScale[1] = "0";
|
||||
parallaxScale[2] = "0";
|
||||
parallaxScale[3] = "0";
|
||||
useAnisotropic[0] = "1";
|
||||
useAnisotropic[1] = "1";
|
||||
useAnisotropic[2] = "1";
|
||||
useAnisotropic[3] = "1";
|
||||
vertLit[0] = "0";
|
||||
vertLit[1] = "0";
|
||||
vertLit[2] = "0";
|
||||
vertLit[3] = "0";
|
||||
vertColor[0] = "0";
|
||||
vertColor[1] = "0";
|
||||
vertColor[2] = "0";
|
||||
vertColor[3] = "0";
|
||||
minnaertConstant[0] = "-1";
|
||||
minnaertConstant[1] = "-1";
|
||||
minnaertConstant[2] = "-1";
|
||||
minnaertConstant[3] = "-1";
|
||||
subSurface[0] = "0";
|
||||
subSurface[1] = "0";
|
||||
subSurface[2] = "0";
|
||||
subSurface[3] = "0";
|
||||
subSurfaceColor[0] = "1 0.2 0.2 1";
|
||||
subSurfaceColor[1] = "1 0.2 0.2 1";
|
||||
subSurfaceColor[2] = "1 0.2 0.2 1";
|
||||
subSurfaceColor[3] = "1 0.2 0.2 1";
|
||||
subSurfaceRolloff[0] = "0.2";
|
||||
subSurfaceRolloff[1] = "0.2";
|
||||
subSurfaceRolloff[2] = "0.2";
|
||||
subSurfaceRolloff[3] = "0.2";
|
||||
emissive[0] = "0";
|
||||
emissive[1] = "0";
|
||||
emissive[2] = "0";
|
||||
emissive[3] = "0";
|
||||
foreground[0] = "0";
|
||||
foreground[1] = "0";
|
||||
foreground[2] = "0";
|
||||
foreground[3] = "0";
|
||||
doubleSided = "0";
|
||||
animFlags[0] = "0x00000000";
|
||||
animFlags[1] = "0x00000000";
|
||||
animFlags[2] = "0x00000000";
|
||||
animFlags[3] = "0x00000000";
|
||||
scrollDir[0] = "0 0";
|
||||
scrollDir[1] = "0 0";
|
||||
scrollDir[2] = "0 0";
|
||||
scrollDir[3] = "0 0";
|
||||
scrollSpeed[0] = "0";
|
||||
scrollSpeed[1] = "0";
|
||||
scrollSpeed[2] = "0";
|
||||
scrollSpeed[3] = "0";
|
||||
rotSpeed[0] = "0";
|
||||
rotSpeed[1] = "0";
|
||||
rotSpeed[2] = "0";
|
||||
rotSpeed[3] = "0";
|
||||
rotPivotOffset[0] = "0 0";
|
||||
rotPivotOffset[1] = "0 0";
|
||||
rotPivotOffset[2] = "0 0";
|
||||
rotPivotOffset[3] = "0 0";
|
||||
waveType[0] = "Sin";
|
||||
waveType[1] = "Sin";
|
||||
waveType[2] = "Sin";
|
||||
waveType[3] = "Sin";
|
||||
waveFreq[0] = "0";
|
||||
waveFreq[1] = "0";
|
||||
waveFreq[2] = "0";
|
||||
waveFreq[3] = "0";
|
||||
waveAmp[0] = "0";
|
||||
waveAmp[1] = "0";
|
||||
waveAmp[2] = "0";
|
||||
waveAmp[3] = "0";
|
||||
sequenceFramePerSec[0] = "0";
|
||||
sequenceFramePerSec[1] = "0";
|
||||
sequenceFramePerSec[2] = "0";
|
||||
sequenceFramePerSec[3] = "0";
|
||||
sequenceSegmentSize[0] = "0";
|
||||
sequenceSegmentSize[1] = "0";
|
||||
sequenceSegmentSize[2] = "0";
|
||||
sequenceSegmentSize[3] = "0";
|
||||
cellIndex[0] = "0 0";
|
||||
cellIndex[1] = "0 0";
|
||||
cellIndex[2] = "0 0";
|
||||
cellIndex[3] = "0 0";
|
||||
cellLayout[0] = "0 0";
|
||||
cellLayout[1] = "0 0";
|
||||
cellLayout[2] = "0 0";
|
||||
cellLayout[3] = "0 0";
|
||||
cellSize[0] = "0";
|
||||
cellSize[1] = "0";
|
||||
cellSize[2] = "0";
|
||||
cellSize[3] = "0";
|
||||
bumpAtlas[0] = "0";
|
||||
bumpAtlas[1] = "0";
|
||||
bumpAtlas[2] = "0";
|
||||
bumpAtlas[3] = "0";
|
||||
castShadows = "0";
|
||||
planarReflection = "0";
|
||||
translucent = "1";
|
||||
translucentBlendOp = "PreMul";
|
||||
translucentZWrite = "0";
|
||||
alphaTest = "0";
|
||||
alphaRef = "1";
|
||||
dynamicCubemap = "0";
|
||||
showFootprints = "1";
|
||||
showDust = "0";
|
||||
effectColor[0] = "0 0 0 0";
|
||||
effectColor[1] = "0 0 0 0";
|
||||
footstepSoundId = "-1";
|
||||
impactSoundId = "-1";
|
||||
ImpactFXIndex = "-1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 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 Material(OctahedronMat)
|
||||
{
|
||||
mapTo = "green";
|
||||
|
||||
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
|
||||
|
||||
translucent = "1";
|
||||
translucentBlendOp = "PreMul";
|
||||
emissive = "0";
|
||||
castShadows = "0";
|
||||
|
||||
diffuseColor[0] = "0 1 0 1";
|
||||
};
|
||||
|
||||
//--- camera.dts MATERIALS BEGIN ---
|
||||
singleton Material(CameraMat)
|
||||
{
|
||||
mapTo = "pasted__phongE1";
|
||||
|
||||
diffuseMapAsset[0] = "Core_GameObjects:camera_image";
|
||||
|
||||
diffuseColor[0] = "0 0.627451 1 1";
|
||||
specular[0] = "1 1 1 1";
|
||||
specularPower[0] = 211;
|
||||
pixelSpecular[0] = 1;
|
||||
emissive[0] = 1;
|
||||
|
||||
doubleSided = 1;
|
||||
translucent = true;
|
||||
translucentBlendOp = "LerpAlpha";
|
||||
castShadows = false;
|
||||
materialTag0 = "Miscellaneous";
|
||||
};
|
||||
|
||||
//--- camera.dts MATERIALS END ---
|
||||
|
||||
//--- noshapetext.dae MATERIALS BEGIN ---
|
||||
singleton Material(noshapetext_lambert1)
|
||||
{
|
||||
mapTo = "lambert1";
|
||||
|
||||
diffuseMapAsset[0] = "";
|
||||
|
||||
diffuseColor[0] = "0.4 0.4 0.4 1";
|
||||
specular[0] = "1 1 1 1";
|
||||
specularPower[0] = 8;
|
||||
pixelSpecular[0] = false;
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = false;
|
||||
translucent = false;
|
||||
translucentBlendOp = "None";
|
||||
};
|
||||
|
||||
singleton Material(noshapetext_noshape_mat)
|
||||
{
|
||||
mapTo = "noshape_mat";
|
||||
|
||||
diffuseMapAsset[0] = "";
|
||||
|
||||
diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
|
||||
specular[0] = "1 1 1 1";
|
||||
specularPower[0] = 8;
|
||||
pixelSpecular[0] = false;
|
||||
emissive[0] = true;
|
||||
|
||||
doubleSided = false;
|
||||
translucent = true;
|
||||
translucentBlendOp = "None";
|
||||
};
|
||||
|
||||
//--- noshapetext.dae MATERIALS END ---
|
||||
|
||||
|
|
@ -3,4 +3,5 @@
|
|||
canSaveDynamicFields="true"
|
||||
AssetName="noshape"
|
||||
fileName="@assetFile=noshape.dts"
|
||||
materialSlot0="@asset=Core_Rendering:noShapeMat"
|
||||
constuctorFileName="@assetFile=noshape.tscript" />
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="noshape_NoShape"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="noshape_NoShape"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="noshapetext_lambert1"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="noshapetext_lambert1"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="noshapetext_noshape_mat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
materialDefinitionName="noshapetext_noshape_mat"
|
||||
VersionId="1" />
|
||||
|
|
@ -245,3 +245,11 @@ new GuiControlProfile( GuiSliderProfile )
|
|||
bitmapAsset = "Core_GUI:slider_image";
|
||||
category = "Core";
|
||||
};
|
||||
|
||||
//
|
||||
if(!isObject(GuiScrollProfile))
|
||||
new GuiControlProfile(GuiScrollProfile)
|
||||
{
|
||||
bitmapAsset = "Core_GUI:scrollBar_image";
|
||||
category = "Core";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AL_ConvexLightState"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="AL_ConvexLightState"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AL_DefaultDeferredMaterial"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="AL_DefaultDeferredMaterial"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AL_DefaultShadowMaterial"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="AL_DefaultShadowMaterial"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AL_ParticlePointLightShader"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="AL_ParticlePointLightShader"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="AL_SpotLightShader"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="AL_SpotLightShader"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="BL_ProjectedShadowRPM"
|
||||
scriptFile="@assetFile=basicLighting_Init.tscript"
|
||||
materialDefinitionName="BL_ProjectedShadowRPM"
|
||||
VersionId="1" />
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="IrradianceShader"
|
||||
scriptFile="@assetFile=advancedLighting_Shaders.tscript"
|
||||
materialDefinitionName="IrradianceShader"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="WarningMaterial"
|
||||
materialDefinitionName="WarningMaterial"
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="WarningMaterial">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_Rendering:missingTexture_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 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 Material( Empty )
|
||||
{
|
||||
};
|
||||
|
||||
singleton Material(WarningMaterial) {
|
||||
detailMapAsset[0] = "Core_Rendering:missingTexture_image";
|
||||
diffuseColor[0] = "25 16 0";
|
||||
emissive[0] = false;
|
||||
translucent = false;
|
||||
};
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="BlankSkyMat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
scriptFile="@assetFile=BlankSkyMat.tscript"
|
||||
materialDefinitionName="BlankSkyMat"
|
||||
VersionId="1" />
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="NightSkyMat"
|
||||
scriptFile="@assetFile=materials.tscript"
|
||||
scriptFile="@assetFile=NightSkyMat.tscript"
|
||||
materialDefinitionName="NightSkyMat"
|
||||
VersionId="1" />
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
singleton CubemapData( NightCubemap )
|
||||
{
|
||||
cubeMapFaceAsset[0] = "Core_Rendering:NightSkybox_1";
|
||||
cubeMapFaceAsset[1] = "Core_Rendering:NightSkybox_2";
|
||||
cubeMapFaceAsset[2] = "Core_Rendering:NightSkybox_3";
|
||||
cubeMapFaceAsset[3] = "Core_Rendering:NightSkybox_4";
|
||||
cubeMapFaceAsset[4] = "Core_Rendering:NightSkybox_5";
|
||||
cubeMapFaceAsset[5] = "Core_Rendering:NightSkybox_6";
|
||||
};
|
||||
|
||||
singleton Material( NightSkyMat )
|
||||
{
|
||||
cubemap = NightCubemap;
|
||||
materialTag0 = "Skies";
|
||||
};
|
||||
|
Before Width: | Height: | Size: 528 KiB After Width: | Height: | Size: 528 KiB |
|
Before Width: | Height: | Size: 530 KiB After Width: | Height: | Size: 530 KiB |
|
Before Width: | Height: | Size: 500 KiB After Width: | Height: | Size: 500 KiB |
|
Before Width: | Height: | Size: 502 KiB After Width: | Height: | Size: 502 KiB |
|
Before Width: | Height: | Size: 602 KiB After Width: | Height: | Size: 602 KiB |
|
Before Width: | Height: | Size: 390 KiB After Width: | Height: | Size: 390 KiB |
|
|
@ -2,5 +2,13 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="NoMaterial"
|
||||
scriptFile="@assetFile=NoMaterial"
|
||||
materialDefinitionName="NoMaterial" />
|
||||
materialDefinitionName="NoMaterial">
|
||||
<Material
|
||||
Name="NoMaterial"
|
||||
mapTo="NoMaterial">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_Rendering:warnMat_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
singleton Material(NoMaterial) {
|
||||
mapTo="NoMaterial";
|
||||
DiffuseMapAsset[0] = "Core_Rendering:warnMat_image";
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 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.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
//--- OBJECT WRITE BEGIN ---
|
||||
|
||||
singleton CubemapData( NightCubemap )
|
||||
{
|
||||
cubeMapFaceAsset[0] = "Core_Rendering:NightSkybox_1";
|
||||
cubeMapFaceAsset[1] = "Core_Rendering:NightSkybox_2";
|
||||
cubeMapFaceAsset[2] = "Core_Rendering:NightSkybox_3";
|
||||
cubeMapFaceAsset[3] = "Core_Rendering:NightSkybox_4";
|
||||
cubeMapFaceAsset[4] = "Core_Rendering:NightSkybox_5";
|
||||
cubeMapFaceAsset[5] = "Core_Rendering:NightSkybox_6";
|
||||
};
|
||||
|
||||
singleton Material( NightSkyMat )
|
||||
{
|
||||
cubemap = NightCubemap;
|
||||
materialTag0 = "Skies";
|
||||
};
|
||||
|
||||
singleton Material(moon_noglow) {
|
||||
mapTo="moon_noglow";
|
||||
DiffuseMapAsset = "Core_Rendering:moon_noglow_image";
|
||||
emissive = true;
|
||||
translucent = true;
|
||||
vertColor[ 0 ] = true;
|
||||
};
|
||||
|
||||
singleton Material(moon_wglow) {
|
||||
mapTo="moon_wglow";
|
||||
DiffuseMapAsset = "Core_Rendering:moon_wglow_image";
|
||||
emissive = true;
|
||||
translucent = true;
|
||||
vertColor[ 0 ] = true;
|
||||
};
|
||||
|
||||
singleton Material(moon_wcorona) {
|
||||
mapTo="moon_wcorona";
|
||||
DiffuseMapAsset = "Core_Rendering:moon_wcorona_image";
|
||||
emissive = true;
|
||||
translucent = true;
|
||||
vertColor[ 0 ] = true;
|
||||
};
|
||||
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -2,6 +2,17 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_noglow"
|
||||
scriptFile="@assetFile=moon_noglow.tscript"
|
||||
materialDefinitionName="moon_noglow"
|
||||
imageMap0="@Asset=Core_Rendering:moon_noglow_image"/>
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="moon_noglow"
|
||||
mapTo="moon_noglow"
|
||||
emissive="1"
|
||||
translucent="1">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_Rendering:moon_noglow_image"
|
||||
vertColor="1";/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="OccluderProxyMaterial"
|
||||
materialDefinitionName="OccluderProxyMaterial"
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="OccluderProxyMaterial">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="ToolsModule:occluderProxyImage_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_wcorona"
|
||||
materialDefinitionName="moon_wcorona"
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="moon_wcorona"
|
||||
mapTo="moon_wcorona"
|
||||
emissive="1"
|
||||
translucent="1">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_Rendering:moon_wcorona_image"
|
||||
vertColor="1";/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -2,6 +2,17 @@
|
|||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="moon_wglow"
|
||||
scriptFile="@assetFile=moon_wglow.tscript"
|
||||
materialDefinitionName="moon_wglow"
|
||||
imageMap0="@Asset=Core_Rendering:moon_wglow_image"/>
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="moon_wglow"
|
||||
mapTo="moon_wglow"
|
||||
emissive="1"
|
||||
translucent="1">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="Core_Rendering:moon_wglow_image"
|
||||
vertColor="1";/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="OccluderProxyMaterial"
|
||||
materialDefinitionName="OccluderProxyMaterial"
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="OccluderProxyMaterial">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
DiffuseMapAsset="ToolsModule:occluderProxyImage_image"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
//--- noshape.dts MATERIALS BEGIN ---
|
||||
singleton Material(noshape_NoShape)
|
||||
{
|
||||
mapTo = "NoShape";
|
||||
|
||||
diffuseMapAsset[0] = "";
|
||||
diffuseColor[0] = "0.8 0.003067 0 .8";
|
||||
emissive[0] = 0;
|
||||
doubleSided = false;
|
||||
translucent = 1;
|
||||
translucentBlendOp = "LerpAlpha";
|
||||
castShadows = false;
|
||||
materialTag0 = "WorldEditor";
|
||||
};
|
||||
|
||||
//--- noshape.dts MATERIALS END ---
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<MaterialAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="NoShapeMat"
|
||||
materialDefinitionName="NoShapeMat"
|
||||
VersionId="1">
|
||||
<Material
|
||||
Name="NoShapeMat"
|
||||
mapTo="NoShape"
|
||||
translucent="1";
|
||||
translucentBlendOp="LerpAlpha";
|
||||
castShadows="0">
|
||||
<Material.Stages>
|
||||
<Stages_beginarray
|
||||
diffuseColor="0.8 0.003067 0 .8"/>
|
||||
</Material.Stages>
|
||||
</Material>
|
||||
</MaterialAsset>
|
||||
|
|
@ -3,4 +3,5 @@
|
|||
canSaveDynamicFields="true"
|
||||
AssetName="noshape"
|
||||
fileName="@assetFile=noshape.dts"
|
||||
materialSlot0="@asset=Core_Rendering:NoShapeMat"
|
||||
VersionId="1" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue