TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-08 14:05:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GFX card profile config file logging moved to debug only

Browse source 
WIP mode of guiSliderCtrl to be a filled rectangle instead of a textured UI
Fixed bug with guiTextEditCtrl losing focus updating history passing malformed strings
Updated WIP options menu
Editor/Project settings WIP
Updated editor theme to be consistent, and feed off the editor settings
Updated popup menus to reference renamed profiles
Added more in-progress modules for examples/stress testing
This commit is contained in:
Areloch 2019-06-17 02:30:45 -05:00
parent dd3422b5a2
commit 07b28cb29a
44 changed files with 972 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/gfx/gfxCardProfile.cpp
View file

@ -41,17 +41,22 @@ void GFXCardProfiler::loadProfileScript(const char* aScriptName)
void *data = NULL;
U32 dataSize = 0;
Torque::FS::ReadFile( scriptName.c_str(), data, dataSize, true );
if(data == NULL)
{
#if TORQUE_DEBUG
Con::warnf(" - No card profile %s exists", scriptName.c_str());
#endif
return;
}
const char *script = static_cast<const char *>(data);
#if TORQUE_DEBUG
Con::printf(" - Loaded card profile %s", scriptName.c_str());
#endif
Con::evaluate(script, false, NULL);
delete[] script;

44
Engine/source/gui/controls/guiSliderCtrl.cpp
View file

@ -89,6 +89,7 @@ IMPLEMENT_CALLBACK( GuiSliderCtrl, onMouseDragged, void, (), (),
GuiSliderCtrl::GuiSliderCtrl()
: mRange( 0., 1.f ),
mTicks( 10 ),
mRenderTicks(true),
mSnap( false ),
mValue( 0.5f ),
mThumbSize( 8, 20 ),
@ -98,7 +99,9 @@ GuiSliderCtrl::GuiSliderCtrl()
mDisplayValue( false ),
mMouseOver( false ),
mDepressed( false ),
mMouseDragged( false )
mMouseDragged( false ),
mUseFillBar(false),
mFillBarColor(ColorI(255,255,255))
{
}
@ -117,6 +120,12 @@ void GuiSliderCtrl::initPersistFields()
addProtectedField( "value", TypeF32, Offset( mValue, GuiSliderCtrl ),
_setValue, defaultProtectedGetFn,
"The value corresponding to the current slider position." );
addField("useFillBar", TypeBool, Offset(mUseFillBar, GuiSliderCtrl),
"Whether to render the tick marks.");
addField("fillBarColor", TypeColorI, Offset(mFillBarColor, GuiSliderCtrl),
"Whether to render the tick marks.");
addField("renderTicks", TypeBool, Offset(mRenderTicks, GuiSliderCtrl),
"Whether to render the tick marks.");
endGroup( "Slider" );
@ -365,9 +374,18 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect)
GFXDrawUtil* drawUtil = GFX->getDrawUtil();
if (mUseFillBar)
{
drawUtil->drawRectFill(RectI(offset.x, offset.y, getWidth() * mValue, getHeight()), mFillBarColor);
renderChildControls(offset, updateRect);
return;
}
if( mHasTexture )
{
if(mTicks > 0)
if(mTicks > 0 && mRenderTicks)
{
// TODO: tick marks should be positioned based on the bitmap dimensions.
Point2I mid(ext.x, ext.y/2);
@ -443,11 +461,14 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect)
PrimBuild::vertex2i( pos.x + mid.x, pos.y + mid.y );
// tick marks
for( U32 t = 0; t <= ( mTicks + 1 ); t++ )
if (mRenderTicks)
{
S32 x = (S32)( F32( mid.x - 1 ) / F32( mTicks + 1 ) * F32( t ) );
PrimBuild::vertex2i( pos.x + x, pos.y + mid.y - mShiftPoint );
PrimBuild::vertex2i( pos.x + x, pos.y + mid.y + mShiftPoint );
for (U32 t = 0; t <= (mTicks + 1); t++)
{
S32 x = (S32)(F32(mid.x - 1) / F32(mTicks + 1) * F32(t));
PrimBuild::vertex2i(pos.x + x, pos.y + mid.y - mShiftPoint);
PrimBuild::vertex2i(pos.x + x, pos.y + mid.y + mShiftPoint);
}
}
PrimBuild::end();
}
@ -462,11 +483,14 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect)
PrimBuild::vertex2i( pos.x + mid.x, pos.y + mid.y );
// tick marks
for( U32 t = 0; t <= ( mTicks + 1 ); t++ )
if (mRenderTicks)
{
S32 y = (S32)( F32( mid.y - 1 ) / F32( mTicks + 1 ) * F32( t ) );
PrimBuild::vertex2i( pos.x + mid.x - mShiftPoint, pos.y + y );
PrimBuild::vertex2i( pos.x + mid.x + mShiftPoint, pos.y + y );
for (U32 t = 0; t <= (mTicks + 1); t++)
{
S32 y = (S32)(F32(mid.y - 1) / F32(mTicks + 1) * F32(t));
PrimBuild::vertex2i(pos.x + mid.x - mShiftPoint, pos.y + y);
PrimBuild::vertex2i(pos.x + mid.x + mShiftPoint, pos.y + y);
}
}
PrimBuild::end();
mDisplayValue = false;

3
Engine/source/gui/controls/guiSliderCtrl.h
View file

@ -39,6 +39,7 @@ class GuiSliderCtrl : public GuiControl
Point2F mRange;
U32 mTicks;
bool mRenderTicks;
bool mSnap;
F32 mValue;
RectI mThumb;
@ -51,6 +52,8 @@ class GuiSliderCtrl : public GuiControl
bool mMouseOver;
bool mMouseDragged;
bool mHasTexture;
bool mUseFillBar;
ColorI mFillBarColor;
enum
{

2
Engine/source/gui/controls/guiTextEditCtrl.cpp
View file

@ -1246,7 +1246,7 @@ void GuiTextEditCtrl::onLoseFirstResponder()
//execute the validate command
if( mValidateCommand.isNotEmpty() )
evaluate( mValidateCommand );
evaluate( mValidateCommand.c_str() );
onValidate_callback();

2
Engine/source/gui/editor/popupMenu.cpp
View file

@ -286,7 +286,7 @@ void PopupMenu::showPopup(GuiCanvas *owner, S32 x /* = -1 */, S32 y /* = -1 */)
Sim::findObject("PopUpMenuControl", backgroundCtrl);
GuiControlProfile* profile;
Sim::findObject("GuiMenubarProfile", profile);
Sim::findObject("ToolsGuiMenuBarProfile", profile);
if (!profile)
return;

2
Engine/source/postFx/postEffect.cpp
View file

@ -1703,7 +1703,7 @@ void PostEffect::setShaderConst(const String &name, const F32 &val)
void PostEffect::setShaderConst(const String& name, const int& val)
{
PROFILE_SCOPE(PostEffect_SetShaderConst_Float);
PROFILE_SCOPE(PostEffect_SetShaderConst_Int);
EffectConstTable::Iterator iter = mEffectConsts.find(name);
if (iter == mEffectConsts.end())

3
Templates/BaseGame/game/core/Core.cs
View file

@ -27,6 +27,9 @@ function CoreModule::onCreate(%this)
ModuleDatabase.LoadExplicit( "Core_GameObjects" );
ModuleDatabase.LoadExplicit( "Core_ClientServer" );
new Settings(ProjectSettings) { file = "core/settings.xml"; };
ProjectSettings.read();
%prefPath = getPrefpath();
if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
exec( %prefPath @ "/clientPrefs.cs" );

6
Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs
View file

@ -47,18 +47,12 @@ function onActivateAdvancedLM()
// Enable the offscreen target so that AL will work
// with MSAA back buffers and for HDR rendering.
AL_FormatToken.enable();
// Activate Deferred Shading
AL_DeferredShading.enable();
}
function onDeactivateAdvancedLM()
{
// Disable the offscreen render target.
AL_FormatToken.disable();
// Deactivate Deferred Shading
AL_DeferredShading.disable();
}
function setAdvancedLighting()

162
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeP.glsl Normal file
View file

@ -0,0 +1,162 @@
//-----------------------------------------------------------------------------
// 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.
//-----------------------------------------------------------------------------
#include "../../../gl/hlslCompat.glsl"
#include "shadergen:/autogenConditioners.h"
#include "farFrustumQuad.glsl"
#include "../../../gl/torque.glsl"
#include "../../../gl/lighting.glsl"
#line 27
in vec4 pos;
in vec4 wsEyeDir;
in vec4 ssPos;
in vec4 vsEyeDir;
uniform sampler2D deferredBuffer;
uniform sampler2D colorBuffer;
uniform sampler2D matInfoBuffer;
uniform samplerCube cubeMap;
uniform samplerCube irradianceCubemap;
uniform sampler2D BRDFTexture;
uniform float cubeMips;
uniform vec4 rtParams0;
uniform vec3 probeWSPos;
uniform vec3 probeLSPos;
uniform vec4 vsFarPlane;
uniform float radius;
uniform vec2 attenuation;
uniform mat4 worldToObj;
uniform mat4 cameraToWorld;
uniform vec3 eyePosWorld;
uniform vec3 bbMin;
uniform vec3 bbMax;
uniform float useSphereMode;
// Box Projected IBL Lighting
// Based on: http://www.gamedev.net/topic/568829-box-projected-cubemap-environment-mapping/
// and https://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
vec3 boxProject(vec3 wsPosition, vec3 reflectDir, vec3 boxWSPos, vec3 boxMin, vec3 boxMax)
{
vec3 nrdir = reflectDir;
vec3 offset = wsPosition;
vec3 plane1vec = (boxMax - offset) / nrdir;
vec3 plane2vec = (boxMin - offset) / nrdir;
vec3 furthestPlane = max(plane1vec, plane2vec);
float dist = min(min(furthestPlane.x, furthestPlane.y), furthestPlane.z);
vec3 posonbox = offset + nrdir * dist;
return posonbox - boxWSPos;
}
vec3 iblBoxSpecular(vec3 normal, vec3 wsPos, float roughness, vec3 surfToEye,
sampler2D brdfTexture,
samplerCube radianceCube,
vec3 boxPos,
vec3 boxMin,
vec3 boxMax)
{
float ndotv = clamp(dot(normal, surfToEye), 0.0, 1.0);
// BRDF
vec2 brdf = textureLod(brdfTexture, vec2(roughness, ndotv),0).xy;
// Radiance (Specular)
float maxmip = pow(cubeMips+1,2);
float lod = roughness*maxmip;
vec3 r = reflect(surfToEye, normal);
vec3 cubeR = normalize(r);
cubeR = boxProject(wsPos, cubeR, boxPos, boxMin, boxMax);
vec3 radiance = textureLod(radianceCube, cubeR, lod).xyz * (brdf.x + brdf.y);
return radiance;
}
float defineBoxSpaceInfluence(vec3 surfPosWS, vec3 probePos, float radius, float atten)
{
vec3 surfPosLS = tMul( worldToObj, vec4(surfPosWS,1.0)).xyz;
vec3 boxMinLS = probePos-(vec3(1,1,1)*radius);
vec3 boxMaxLS = probePos+(vec3(1,1,1)*radius);
float boxOuterRange = length(boxMaxLS - boxMinLS);
float boxInnerRange = boxOuterRange / atten;
vec3 localDir = vec3(abs(surfPosLS.x), abs(surfPosLS.y), abs(surfPosLS.z));
localDir = (localDir - boxInnerRange) / (boxOuterRange - boxInnerRange);
return max(localDir.x, max(localDir.y, localDir.z)) * -1;
}
out vec4 OUT_col;
void main()
{
// Compute scene UV
vec2 uvScene = getUVFromSSPos( ssPos.xyz/ssPos.w, rtParams0 );
//eye ray WS/LS
vec3 vsEyeRay = getDistanceVectorToPlane( -vsFarPlane.w, vsEyeDir.xyz, vsFarPlane );
vec3 wsEyeRay = tMul(cameraToWorld, vec4(vsEyeRay, 0)).xyz;
//unpack normal and linear depth
vec4 normDepth = deferredUncondition(deferredBuffer, uvScene);
//create surface
Surface surface = createSurface( normDepth, colorBuffer, matInfoBuffer,
uvScene, eyePosWorld, wsEyeRay, cameraToWorld);
float blendVal = 1.0;
if(useSphereMode>0)
{
vec3 L = probeWSPos - surface.P;
blendVal = 1.0-length(L)/radius;
clip(blendVal);
}
else
{
float tempAttenVal = 3.5;
blendVal = defineBoxSpaceInfluence(surface.P, probeWSPos, radius, tempAttenVal);
clip(blendVal);
float compression = 0.05;
blendVal=(1.0-compression)+blendVal*compression;
}
//render into the bound space defined above
vec3 surfToEye = normalize(surface.P - eyePosWorld);
vec3 irradiance = textureLod(irradianceCubemap, surface.N,0).xyz;
vec3 specular = iblBoxSpecular(surface.N, surface.P, surface.roughness, surfToEye, BRDFTexture, cubeMap, probeWSPos, bbMin, bbMax);
vec3 F = FresnelSchlickRoughness(surface.NdotV, surface.f0, surface.roughness);
specular *= F;
//energy conservation
vec3 kD = vec3(1.0) - F;
kD *= 1.0 - surface.metalness;
//final diffuse color
vec3 diffuse = kD * irradiance * surface.baseColor.rgb;
OUT_col = vec4(diffuse + specular * surface.ao, blendVal);
}

32
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeV.glsl Normal file
View file

@ -0,0 +1,32 @@
#include "shadergen:/autogenConditioners.h"
#include "../../torque.hlsl"
// This is the shader input
struct Vert
{
float4 position : POSITION;
float2 uv0 : TEXCOORD0;
float3 wsEyeRay : TEXCOORD1;
};
// This is the shader output data.
struct Conn
{
float4 position : POSITION;
float2 uv0 : TEXCOORD0;
float3 wsEyeRay : TEXCOORD1;
};
// Render Target Paramaters
float4 rtParams0;
Conn main(Vert IN,
uniform float4x4 modelView : register(C0))
{
Conn OUT;
OUT.position = IN.position;
OUT.uv0 = viewportCoordToRenderTarget( IN.uv0, rtParams0 );
OUT.wsEyeRay = IN.wsEyeRay;
return OUT;
}

13
Templates/BaseGame/game/core/settings.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<ProjectSettings>
<Group name="AssetManagement">
<Group name="Modules">
<Setting name="coreModulePath">core/</Setting>
</Group>
</Group>
<Group name="Gameplay">
<Group name="GameModes">
<Setting name="defaultModeName">a</Setting>
</Group>
</Group>
</ProjectSettings>

BIN
Templates/BaseGame/game/data/ui/art/optionsMenuSliderBitmapArray.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Templates/BaseGame/game/data/ui/art/slider - Copy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 908 B

4
Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml
View file

@ -89,7 +89,9 @@
isContainer="false"
internalName="slider"
canSave="true"
canSaveDynamicFields="false" />
canSaveDynamicFields="false"
renderTicks="false"
useFillBar="true" />
<GuiTextCtrl
text="5"
maxLength="1024"

72
Templates/BaseGame/game/data/ui/scripts/optionsMenu.cs
View file

@ -66,34 +66,38 @@ function OptionsMenu::onWake(%this)
%array = OptionsSettingStack;
%array.clear();
%controllerMenuBtn = new GuiButtonCtrl(){
%keyboardMenuBtn = new GuiButtonCtrl(){
text = "Keyboard and Mouse";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
};
%displayMenuBtn = new GuiButtonCtrl(){
%controllerMenuBtn = new GuiButtonCtrl(){
text = "Controller";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="DisplayMenu::loadSettings();";
};
%keyboardMenuBtn = new GuiButtonCtrl(){
%displayMenuBtn = new GuiButtonCtrl(){
text = "Display";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="DisplayMenu::loadSettings();";
};
%graphicsMenuBtn = new GuiButtonCtrl(){
text = "Graphics";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="GraphicsMenu::loadSettings();";
};
%audioMenuBtn = new GuiButtonCtrl(){
text = "Audio";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="AudioMenu::loadSettings();";
};
%gameplayMenuBtn = new GuiButtonCtrl(){
@ -236,7 +240,7 @@ function OptionsMenu::addSettingOption(%this, %arrayTarget, %optionName, %defaul
return %option;
}
function OptionsMenu::addSliderOption(%this, %arrayTarget, %optionName, %variable, %range, %ticks, %value, %class)
function OptionsMenu::addSliderOption(%this, %arrayTarget, %optionName, %variable, %range, %ticks, %value, %class)
{
%option = TAMLRead("data/ui/scripts/guis/graphicsMenuSettingsSlider.taml");
@ -620,3 +624,63 @@ function AudioMenuSoundDevice::onSelect( %this, %id, %text )
SPC $pref::SFX::device
SPC $pref::SFX::useHardware );
}
//==============================================================================
// DISPLAY MENU
//==============================================================================
function DisplayMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSettingOption(OptionsSettingStack, "Resolution", "1024 x 768", "", $pref::Video::Resolution);
OptionsMenu.addSettingOption(OptionsSettingStack, "Full Screen", "Off", "", $pref::Video::FullScreen);
OptionsMenu.addSettingOption(OptionsSettingStack, "Refresh Rate", "60", "", $pref::Video::RefreshRate);
OptionsMenu.addSettingOption(OptionsSettingStack, "VSync", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSliderOption(OptionsSettingStack, "Field of View", $pref::Video::FOV, "65 120", 55, 75);
OptionsMenu.addSliderOption(OptionsSettingStack, "Brightness", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Contrast", $pref::Video::Contrast, "0 1", 10, 5);
}
//==============================================================================
// GRAPHICS MENU
//==============================================================================
function GraphicsMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSettingOption(OptionsSettingStack, "Shadow Quality", "High", "", $pref::Video::Resolution);
OptionsMenu.addSettingOption(OptionsSettingStack, "Shadow Caching", "Off", "", $pref::Video::FullScreen);
OptionsMenu.addSettingOption(OptionsSettingStack, "Soft Shadows", "60", "", $pref::Video::RefreshRate);
OptionsMenu.addSettingOption(OptionsSettingStack, "Model Detail", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSliderOption(OptionsSettingStack, "Texture Detail", $pref::Video::FOV, "65 120", 55, 75);
OptionsMenu.addSettingOption(OptionsSettingStack, "Terrain Detail", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Decal Lifetime", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Ground Clutter Density", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Material Quality", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "HDR", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Parallax", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Ambient Occlusion", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Light Rays", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Depth of Field", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Vignetting", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Water Reflections", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Anti Aliasing", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Anisotropic Filtering", "Off", "", $pref::Video::Vsync);
}
//==============================================================================
// AUDIO MENU
//==============================================================================
function AudioMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSliderOption(OptionsSettingStack, "Master Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Menu Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Effects Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Music Volume", $pref::Video::Brightness, "0 1", 10, 5);
}

7
Templates/BaseGame/game/data/ui/scripts/profiles.cs
View file

@ -426,4 +426,11 @@ new GuiControlProfile(GuiMenuScrollProfile)
bitmap = "./images/scrollBar";
hasBitmapArray = true;
category = "Core";
};
singleton GuiControlProfile(SliderBitmapGUIProfile)
{
bitmap = "data/ui/art/optionsMenuSliderBitmapArray.png";
hasBitmapArray = true;
opaque = false;
};

34
Templates/BaseGame/game/tools/assetBrowser/_assetImportConfigs.xml Normal file
View file

@ -0,0 +1,34 @@
<AssetImportConfigs>
<Config Name="TestConfig">
<Mesh ImportMesh="1" DoUpAxisOverride="0" UpAxisOverride="Z_AXIS" DoScaleOverride="0" ScaleOverride="1" IgnoreNodeScale="0" AdjustCenter="0" AdjustFloor="1" CollapseSubmeshes="0" LODType="TrailingNumber" ImportedNodes="" IgnoreNodes="" ImportMeshes="" IgnoreMeshes="" />
<Materials ImportMaterials="1" IgnoreMaterials="" CreateComposites="1" UseDiffuseSuffixOnOriginImg="1" UseExistingMaterials="1" />
<Animations ImportAnimations="1" SeparateAnimations="1" SeparateAnimationPrefix="" />
<Collisions GenerateCollisions="1" GenCollisionType="CollisionMesh" CollisionMeshPrefix="Col" GenerateLOSCollisions="1" GenLOSCollisionType="CollisionMesh" LOSCollisionMeshPrefix="LOS" />
<Images ImageType="GUI" DiffuseTypeSuffixes="_ALBEDO,_DIFFUSE,_ALB,_DIF,_Base_Color,_COLOR,_COL" NormalTypeSuffixes="_NORMAL,_NORM" SpecularTypeSuffixes="_SPECULAR,_SPEC" MetalnessTypeSuffixes="_METAL,_MET,_METALNESS,_METALLIC" RoughnessTypeSuffixes="_ROUGH,_ROUGHNESS" SmoothnessTypeSuffixes="_SMOOTH,_SMOOTHNESS" AOTypeSuffixes="_AO,_AMBIENT,_AMBIENTOCCLUSION,_Ambient_Occlusion" CompositeTypeSuffixes="_COMP,_COMPOSITE" TextureFilteringMode="Bilinear" UseMips="1" IsHDR="0" Scaling="1" Compressed="0" GenerateMaterialOnImport="1" PopulateMaterialMaps="1" />
<Sounds VolumeAdjust="1" PitchAdjust="1" Compressed="0" />
</Config>
<Config Name="SecondTest">
<Mesh ImportMesh="1" DoUpAxisOverride="0" UpAxisOverride="Z_AXIS" DoScaleOverride="0" ScaleOverride="1" IgnoreNodeScale="0" AdjustCenter="0" AdjustFloor="0" CollapseSubmeshes="0" LODType="TrailingNumber" ImportedNodes="" IgnoreNodes="" ImportMeshes="" IgnoreMeshes="" />
<Materials ImportMaterials="1" IgnoreMaterials="" CreateComposites="1" UseDiffuseSuffixOnOriginImg="" UseExistingMaterials="" />
<Animations ImportAnimations="1" SeparateAnimations="1" SeparateAnimationPrefix="" />
<Collisions GenerateCollisions="1" GenCollisionType="CollisionMesh" CollisionMeshPrefix="Col" GenerateLOSCollisions="1" GenLOSCollisionType="CollisionMesh" LOSCollisionMeshPrefix="LOS" />
<Images ImageType="N/A" DiffuseTypeSuffixes="_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL" NormalTypeSuffixes="_NORMAL,_NORM" SpecularTypeSuffixes="_SPECULAR,_SPEC" MetalnessTypeSuffixes="_METAL,_MET,_METALNESS,_METALLIC" RoughnessTypeSuffixes="_ROUGH,_ROUGHNESS" SmoothnessTypeSuffixes="_SMOOTH,_SMOOTHNESS" AOTypeSuffixes="_AO,_AMBIENT,_AMBIENTOCCLUSION" CompositeTypeSuffixes="_COMP,_COMPOSITE" TextureFilteringMode="Bilinear" UseMips="1" IsHDR="0" Scaling="1" Compressed="0" GenerateMaterialOnImport="" PopulateMaterialMaps="" />
<Sounds VolumeAdjust="1" PitchAdjust="1" Compressed="0" />
</Config>
<Config Name="GUI_Image_Import">
<Mesh ImportMesh="0" DoUpAxisOverride="0" UpAxisOverride="Z_AXIS" DoScaleOverride="0" ScaleOverride="1" IgnoreNodeScale="0" AdjustCenter="0" AdjustFloor="0" CollapseSubmeshes="0" LODType="TrailingNumber" ImportedNodes="" IgnoreNodes="" ImportMeshes="" IgnoreMeshes="" />
<Materials ImportMaterials="0" IgnoreMaterials="" CreateComposites="1" UseDiffuseSuffixOnOriginImg="1" UseExistingMaterials="1" />
<Animations ImportAnimations="0" SeparateAnimations="1" SeparateAnimationPrefix="" />
<Collisions GenerateCollisions="0" GenCollisionType="CollisionMesh" CollisionMeshPrefix="Col" GenerateLOSCollisions="1" GenLOSCollisionType="CollisionMesh" LOSCollisionMeshPrefix="LOS" />
<Images ImageType="GUI" DiffuseTypeSuffixes="_ALBEDO;_DIFFUSE;_ALB;_DIF;_COLOR;_COL;_BASECOLOR;_BASE_COLOR" NormalTypeSuffixes="_NORMAL;_NORM" SpecularTypeSuffixes="_SPECULAR;_SPEC" MetalnessTypeSuffixes="_METAL;_MET;_METALNESS;_METALLIC" RoughnessTypeSuffixes="_ROUGH;_ROUGHNESS" SmoothnessTypeSuffixes="_SMOOTH;_SMOOTHNESS" AOTypeSuffixes="_AO;_AMBIENT;_AMBIENTOCCLUSION" CompositeTypeSuffixes="_COMP;_COMPOSITE" TextureFilteringMode="Bilinear" UseMips="1" IsHDR="0" Scaling="1" Compressed="0" GenerateMaterialOnImport="0" PopulateMaterialMaps="0" />
<Sounds VolumeAdjust="1" PitchAdjust="1" Compressed="0" />
</Config>
<Config Name="CogflictsMesh">
<Mesh ImportMesh="1" DoUpAxisOverride="0" UpAxisOverride="Z_AXIS" DoScaleOverride="0" ScaleOverride="1" IgnoreNodeScale="0" AdjustCenter="0" AdjustFloor="0" CollapseSubmeshes="0" LODType="TrailingNumber" ImportedNodes="" IgnoreNodes="" ImportMeshes="" IgnoreMeshes="" />
<Materials ImportMaterials="1" IgnoreMaterials="ColorEffect*;" CreateComposites="1" UseDiffuseSuffixOnOriginImg="1" UseExistingMaterials="1" />
<Animations ImportAnimations="1" SeparateAnimations="1" SeparateAnimationPrefix="" />
<Collisions GenerateCollisions="1" GenCollisionType="CollisionMesh" CollisionMeshPrefix="Col" GenerateLOSCollisions="1" GenLOSCollisionType="CollisionMesh" LOSCollisionMeshPrefix="LOS" />
<Images ImageType="N/A" DiffuseTypeSuffixes="_ALBEDO;_DIFFUSE;_ALB;_DIF;_COLOR;_COL;_BASECOLOR;_BASE_COLOR;_Al" NormalTypeSuffixes="_NORMAL;_NORM;_N" SpecularTypeSuffixes="_SPECULAR;_SPEC" MetalnessTypeSuffixes="_METAL;_MET;_METALNESS;_METALLIC" RoughnessTypeSuffixes="_ROUGH;_ROUGHNESS" SmoothnessTypeSuffixes="_SMOOTH;_SMOOTHNESS" AOTypeSuffixes="_AO;_AMBIENT;_AMBIENTOCCLUSION" CompositeTypeSuffixes="_COMP;_COMPOSITE;_C" TextureFilteringMode="Bilinear" UseMips="1" IsHDR="0" Scaling="1" Compressed="0" GenerateMaterialOnImport="1" PopulateMaterialMaps="1" />
<Sounds VolumeAdjust="1" PitchAdjust="1" Compressed="0" />
</Config>
</AssetImportConfigs>

12
Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui
View file

@ -323,7 +323,7 @@
minExtent = "64 64";
horizSizing = "relative";
vertSizing = "height";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -345,7 +345,7 @@
minExtent = "16 16";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -414,7 +414,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showFilterPopup();";
@ -530,7 +530,7 @@
minExtent = "16 16";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -657,7 +657,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.toggleTagFilterPopup();";
@ -798,7 +798,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

6
Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui
View file

@ -85,7 +85,7 @@
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -243,7 +243,7 @@
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -574,7 +574,7 @@
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui
View file

@ -66,7 +66,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiScrollProfile";
profile = "Tools";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui
View file

@ -66,7 +66,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui
View file

@ -196,7 +196,7 @@
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

1
Templates/BaseGame/game/tools/assetBrowser/main.cs
View file

@ -22,6 +22,7 @@
if( !isObject( ToolsGuiDefaultNonModalProfile ) )
new GuiControlProfile (ToolsGuiDefaultNonModalProfile : ToolsGuiDefaultProfile)
{
opaque = false;
modal = false;
};

2
Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui
View file

@ -114,7 +114,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "menubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "195 0";

BIN
Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 6.1 KiB

Before After
Before After

51
Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs
View file

@ -28,7 +28,6 @@ singleton GuiControlProfile (NavPanelProfile)
category = "Editor";
};
singleton GuiControlProfile (NavPanel : NavPanelProfile)
{
bitmap = "./navPanel";
@ -64,53 +63,3 @@ singleton GuiControlProfile (NavPanelYellow : NavPanelProfile)
bitmap = "./navPanel_yellow";
category = "Editor";
};
singleton GuiControlProfile (menubarProfile : NavPanelProfile)
{
bitmap = "./menubar";
category = "Editor";
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
};
singleton GuiControlProfile (editorMenubarProfile : NavPanelProfile)
{
bitmap = "./editor-menubar";
category = "Editor";
};
singleton GuiControlProfile (editorMenu_wBorderProfile : NavPanelProfile)
{
bitmap = "./menu-fullborder";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutProfile : NavPanelProfile)
{
bitmap = "./inspector-style-rollout";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutListProfile : NavPanelProfile)
{
bitmap = "./inspector-style-rollout-list";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutDarkProfile : NavPanelProfile)
{
bitmap = "./inspector-style-rollout-dark";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutInnerProfile : NavPanelProfile)
{
bitmap = "./inspector-style-rollout_inner";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutNoHeaderProfile : NavPanelProfile)
{
bitmap = "./inspector-style-rollout-noheader";
category = "Editor";
};
singleton GuiControlProfile (IconDropdownProfile : NavPanelProfile)
{
bitmap = "./icon-dropdownbar";
category = "Editor";
};

217
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs
View file

@ -22,19 +22,31 @@
function ESettingsWindow::startup( %this )
{
new ArrayObject(EditorSettingsPageList);
new ArrayObject(GameSettingsPageList);
%this.addEditorSettingsPage("Axis", "Axis Gizmo");
%this.addEditorSettingsPage("General", "General Settings");
%this.addEditorSettingsPage("Camera", "Camera Settings");
%this.addEditorSettingsPage("SceneEditor", "Scene Editor");
%this.addEditorSettingsPage("ShapeEditor", "Shape Editor");
%this.addEditorSettingsPage("NavEditor", "Navigation Editor");
%this.addEditorSettingsPage("Theme", "Theme");
%this.addGameSettingsPage("GameGeneral", "General");
%this.addGameSettingsPage("Gameplay", "Gameplay");
%this.addGameSettingsPage("Paths", "Paths");
%this.addGameSettingsPage("UI", "UI");
%this.addGameSettingsPage("LevelDefaults", "Level Defaults");
%this.addGameSettingsPage("GameOptions", "Game Options");
%this.addGameSettingsPage("AssetManagement", "Asset Management");
%this.mode = "Editor";
}
function ESettingsWindow::onWake( %this )
{
new ArrayObject(SettingsPageList);
%this.addSettingsPage("Axis", "Axis Gizmo");
%this.addSettingsPage("General", "General Settings");
%this.addSettingsPage("Camera", "Camera Settings");
%this.addSettingsPage("SceneEditor", "Scene Editor");
%this.addSettingsPage("ShapeEditor", "Shape Editor");
%this.addSettingsPage("NavEditor", "Navigation Editor");
ESettingsWindowList.setSelectedById( 1 );
}
function ESettingsWindow::hideDialog( %this )
@ -47,7 +59,6 @@ function ESettingsWindow::ToggleVisibility()
if ( ESettingsWindow.visible )
{
ESettingsWindow.setVisible(false);
EditorSettings.write();
}
else
{
@ -59,19 +70,50 @@ function ESettingsWindow::ToggleVisibility()
ESettingsWindowList.setSelectedById( 1 );
}
/*function ESettingsWindow::addTabPage( %this, %page )
function ESettingsWindow::toggleProjectSettings(%this)
{
ESettingsWindowTabBook.add( %page );
ESettingsWindowList.addRow( ESettingsWindowTabBook.getSelectedPage(), %page.text );
ESettingsWindowList.sort(0);
}*/
function ESettingsWindow::addSettingsPage(%this, %settingsPageName, %settingsPageText)
{
SettingsPageList.add(%settingsPageName, %settingsPageText);
%this.ToggleVisibility();
ESettingsWindowList.addRow( SettingsPageList.count(), %settingsPageText );
%count = GameSettingsPageList.count();
for(%i=0; %i < %count; %i++)
{
%settingsPageText = GameSettingsPageList.getValue(%i);
ESettingsWindowList.addRow( %i, %settingsPageText );
}
ESettingsWindowList.sort(0);
ESettingsWindowList.setSelectedById( 1 );
%this.mode = "Project";
ESettingsWindow.text = "Game Project Settings";
}
function ESettingsWindow::toggleEditorSettings(%this)
{
%this.ToggleVisibility();
%count = EditorSettingsPageList.count();
for(%i=0; %i < %count; %i++)
{
%settingsPageText = EditorSettingsPageList.getValue(%i);
ESettingsWindowList.addRow( %i, %settingsPageText );
}
ESettingsWindowList.sort(0);
ESettingsWindowList.setSelectedById( 1 );
%this.mode = "Editor";
ESettingsWindow.text = "Editor Settings";
}
function ESettingsWindow::addEditorSettingsPage(%this, %settingsPageName, %settingsPageText)
{
EditorSettingsPageList.add(%settingsPageName, %settingsPageText);
}
function ESettingsWindow::addGameSettingsPage(%this, %settingsPageName, %settingsPageText)
{
GameSettingsPageList.add(%settingsPageName, %settingsPageText);
}
//-----------------------------------------------------------------------------
@ -79,10 +121,49 @@ function ESettingsWindow::addSettingsPage(%this, %settingsPageName, %settingsPag
function ESettingsWindowList::onSelect( %this, %id, %text )
{
SettingsInspector.clearFields();
%pageName = SettingsPageList.getKey(SettingsPageList.getIndexFromValue(%text));
if(ESettingsWindow.mode $= "Editor")
%pageName = EditorSettingsPageList.getKey(EditorSettingsPageList.getIndexFromValue(%text));
else
%pageName = GameSettingsPageList.getKey(GameSettingsPageList.getIndexFromValue(%text));
eval("ESettingsWindow.get" @ %pageName @ "Settings();");
}
//Read/write field functions
function SettingsInspector::addSettingsField(%this, %settingsFieldName, %labelText, %fieldType, %tooltip, %fieldData)
{
%moddedSettingsFieldName = strreplace(%settingsFieldName, "/", "-");
if(ESettingsWindow.mode $= "Editor")
%this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", EditorSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting");
else
%this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", ProjectSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting");
}
function SettingsInspector::changeEditorSetting(%this, %varName, %value)
{
%varName = strreplace(%varName, "-", "/");
echo("Set " @ %varName @ " to be " @ %value);
if(ESettingsWindow.mode $= "Editor")
EditorSettings.setValue(%varName, %value);
else
ProjectSettings.setValue(%varName, %value);
//%id = ESettingsWindowList.getSelectedRow();
//ESettingsWindowList.setSelectedRow(%id);
if(ESettingsWindow.mode $= "Editor")
%success = EditorSettings.write();
else
%success = ProjectSettings.write();
}
//
// COMMON EDITOR SETTINGS
//
function ESettingsWindow::getAxisSettings(%this)
{
SettingsInspector.startGroup("Gizmo");
@ -182,21 +263,89 @@ function ESettingsWindow::getShapeEditorSettings(%this)
SettingsInspector.endGroup();
}
//Read/write field functions
function SettingsInspector::addSettingsField(%this, %settingsFieldName, %labelText, %fieldType, %tooltip, %fieldData)
function ESettingsWindow::getThemeSettings(%this)
{
%moddedSettingsFieldName = strreplace(%settingsFieldName, "/", "-");
%this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", EditorSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting");
}
SettingsInspector.startGroup("Colors");
SettingsInspector.addSettingsField("Theme/headerColor", "Headerbar Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/windowBackgroundColor", "Window Background Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tabsColor", "Tabs Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tabsHLColor", "Tabs Highlight Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tabsSELColor", "Tabs Selected Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/dividerDarkColor", "Divider Dark Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/dividerMidColor", "Divider Mid Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/dividerLightColor", "Divider Light Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/headerTextColor", "Header Text Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextColor", "Field Text Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextHLColor", "Field Text Highlight Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextSELColor", "Field Text Selected Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldBGColor", "Field Background Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldBGHLColor", "Field Background Highlight Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldBGSELColor", "Field Background Selected Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tooltipBGColor", "Tooltip Background Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tooltipTextColor", "Tooltip Text Highlight Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/tooltipDivColor", "Tooltip Divider Color", "ColorI", "");
SettingsInspector.endGroup();
}
//
// COMMON GAME SETTINGS
//
function ESettingsWindow::getGameGeneralSettings(%this)
{
SettingsInspector.startGroup("General");
SettingsInspector.addSettingsField("General/ProjectName", "Project Name", "string", "");
SettingsInspector.endGroup();
}
function SettingsInspector::changeEditorSetting(%this, %varName, %value)
function ESettingsWindow::getPathsSettings(%this)
{
%varName = strreplace(%varName, "-", "/");
SettingsInspector.startGroup("Paths");
SettingsInspector.addSettingsField("Paths/splashImagePath", "Splash Image", "filename", "");
SettingsInspector.addSettingsField("Paths/iconImagePath", "Icon Image", "filename", "");
SettingsInspector.addSettingsField("Paths/missingTexturePath", "Missing Texture Image", "filename", "");
SettingsInspector.addSettingsField("Paths/noMaterialPath", "No Material Image", "filename", "");
SettingsInspector.addSettingsField("Paths/errorMaterialMath", "Error Material Image", "filename", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getUISettings(%this)
{
SettingsInspector.startGroup("UI");
SettingsInspector.addSettingsField("UI/playGUIName", "Play GUI Name", "string", "");
SettingsInspector.addSettingsField("UI/mainMenuName", "Main Menu GUI Name", "string", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getAssetManagementSettings(%this)
{
SettingsInspector.startGroup("Modules");
SettingsInspector.addSettingsField("AssetManagement/Modules/coreModulePath", "Core Module Path", "string", "");
SettingsInspector.addSettingsField("AssetManagement/Modules/gameDataModulePath", "Game Data Module Path", "string", "");
SettingsInspector.addSettingsField("AssetManagement/Modules/moduleExtension", "Module Extension", "string", "");
SettingsInspector.endGroup();
echo("Set " @ %varName @ " to be " @ %value);
EditorSettings.setValue(%varName, %value);
%id = ESettingsWindowList.getSelectedRow();
ESettingsWindowList.setSelectedRow(%id);
}
SettingsInspector.startGroup("Assets");
SettingsInspector.addSettingsField("AssetManagement/Assets/assetExtension", "Asset Extension", "string", "");
SettingsInspector.addSettingsField("AssetManagement/Assets/datablockCaching", "Cache Datablocks", "bool", "");
//SettingsInspector.addSettingsField("AssetManagement/Assets/moduleExtension", "Module Extension", "string", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getGameplaySettings(%this)
{
SettingsInspector.startGroup("Game Modes");
SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getGameOptionsSettings(%this)
{
SettingsInspector.startGroup("Game Modes");
SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", "");
SettingsInspector.endGroup();
}

BIN
Templates/BaseGame/game/tools/gui/images/button.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

BIN
Templates/BaseGame/game/tools/gui/images/tab.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 4 KiB

Before After
Before After

BIN
Templates/BaseGame/game/tools/gui/images/window.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 861 B

After

Width:  |  Height:  |  Size: 5.2 KiB

Before After
Before After

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui
View file

@ -99,7 +99,7 @@
};
new GuiScrollCtrl(MBOKCancelDetailsScroll) {
canSaveDynamicFields = "0";
Profile = "GuiScrollProfile";
Profile = "ToolsGuiScrollProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "8 115";

381
Templates/BaseGame/game/tools/gui/profiles.ed.cs
View file

@ -37,27 +37,27 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
mouseOverSelected = false;
// fill color
opaque = false;
fillColor = "50 50 50";
fillColorHL = "91 101 116";
fillColorSEL = "91 101 116";
fillColorNA = "255 0 255 ";
opaque = true;
fillColor = EditorSettings.value("Theme/tabsColor");
fillColorHL = EditorSettings.value("Theme/tabsGLColor");
fillColorSEL = EditorSettings.value("Theme/tabsSELColor");
fillColorNA = EditorSettings.value("Theme/tabsSELColor");
// border color
border = 0;
borderColor = "34 34 34";
borderColorHL = "91 101 116";
borderColorNA = "32 32 32";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
borderColorHL = EditorSettings.value("Theme/dividerMidColor");
borderColorNA = EditorSettings.value("Theme/dividerLightColor");
// font
fontType = "Noto Sans";
fontSize = 14;
fontCharset = ANSI;
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "215 215 215";
fontColorSEL= "255 255 255";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
// bitmap information
bitmap = "";
@ -118,15 +118,15 @@ if( !isObject( ToolsGuiToolTipProfile ) )
new GuiControlProfile (ToolsGuiToolTipProfile)
{
// fill color
fillColor = "255 255 255";
fillColor = EditorSettings.value("Theme/tooltipBGColor");
// border color
borderColor = "0 0 0";
borderColor = EditorSettings.value("Theme/tooltipDivColor");
// font
fontType = "Noto Sans";
fontSize = 14;
fontColor = "24 24 24";
fontColor = EditorSettings.value("Theme/tooltipTextColor");
category = "Tools";
};
@ -141,7 +141,7 @@ new GuiControlProfile( ToolsGuiModelessDialogProfile )
if( !isObject( ToolsGuiFrameSetProfile ) )
new GuiControlProfile (ToolsGuiFrameSetProfile)
{
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
borderColor = "246 245 244";
border = 1;
opaque = true;
@ -154,11 +154,11 @@ new GuiControlProfile (ToolsGuiWindowProfile)
{
opaque = false;
border = 1;
fillColor = EditorSettings.value("WorldEditor/Theme/windowTitleBGColor");
fillColorHL = EditorSettings.value("WorldEditor/Theme/windowTitleBGHLColor");
fillColorNA = EditorSettings.value("WorldEditor/Theme/windowTitleBGNAColor");
fontColor = EditorSettings.value("WorldEditor/Theme/windowTitleFontColor");
fontColorHL = EditorSettings.value("WorldEditor/Theme/windowTitleFontHLColor");
fillColor = EditorSettings.value("Theme/tabsColor");
fillColorHL = EditorSettings.value("Theme/tabsColor");
fillColorNA = EditorSettings.value("Theme/tabsColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/headerTextColor");
bevelColorHL = "255 255 255";
bevelColorLL = "0 0 0";
text = "untitled";
@ -186,15 +186,16 @@ new GuiControlProfile (ToolsGuiWindowCollapseProfile : ToolsGuiWindowProfile)
if( !isObject( ToolsGuiTextProfile ) )
new GuiControlProfile (ToolsGuiTextProfile)
{
opaque = true;
justify = "left";
fontColor = "185 185 185";
fontColor = EditorSettings.value("Theme/headerTextColor");
category = "Tools";
};
if( !isObject( ToolsGuiTextBoldCenterProfile ) )
new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile)
{
fontColor = "165 165 165";
fontColor = EditorSettings.value("Theme/headerTextColor");
fontType = "Noto Sans Bold";
fontSize = 16;
justify = "center";
@ -218,7 +219,7 @@ new GuiControlProfile (ToolsGuiTextCenterProfile : ToolsGuiTextProfile)
if( !isObject( ToolsGuiInspectorTitleTextProfile ) )
new GuiControlProfile (ToolsGuiInspectorTitleTextProfile)
{
fontColor = "100 100 100";
fontColor = EditorSettings.value("Theme/headerTextColor");
category = "Tools";
};
@ -245,12 +246,12 @@ new GuiControlProfile( ToolsGuiMLTextProfile )
if( !isObject( ToolsGuiTextArrayProfile ) )
new GuiControlProfile( ToolsGuiTextArrayProfile : ToolsGuiTextProfile )
{
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorSEL = "215 215 215";
fillColor = "200 200 200";
fillColorHL = "228 228 235";
fillColorSEL = "200 200 200";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
border = false;
category = "Tools";
};
@ -272,11 +273,11 @@ new GuiControlProfile( ToolsGuiTextEditProfile )
border = -2; // fix to display textEdit img
//borderWidth = "1"; // fix to display textEdit img
//borderColor = "100 100 100";
fillColor = "42 42 42 0";
fillColorHL = "91 101 116";
fontColor = "215 215 215";
fontColorHL = "115 115 115";
fontColorSEL = "98 100 137";
fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorNA = "200 200 200";
textOffset = "4 2";
autoSizeWidth = false;
@ -325,9 +326,9 @@ new GuiControlProfile( ToolsGuiButtonProfile )
{
opaque = true;
border = true;
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorNA = "200 200 200";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fixedExtent = false;
justify = "center";
canKeyFocus = false;
@ -348,9 +349,9 @@ new GuiControlProfile( ToolsGuiIconButtonProfile )
{
opaque = true;
border = true;
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorNA = "200 200 200";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fixedExtent = false;
justify = "center";
canKeyFocus = false;
@ -371,10 +372,10 @@ new GuiControlProfile(ToolsGuiEditorTabPage)
{
opaque = true;
border = false;
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
fillColor = EditorSettings.value("Theme/tabsColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
fixedExtent = false;
justify = "left";
canKeyFocus = false;
@ -387,13 +388,13 @@ if( !isObject( ToolsGuiCheckBoxProfile ) )
new GuiControlProfile( ToolsGuiCheckBoxProfile )
{
opaque = false;
fillColor = "232 232 232";
fillColor = EditorSettings.value("Theme/fieldBGColor");
border = false;
borderColor = "100 100 100";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
fontSize = 14;
fontColor = "185 185 185";
fontColorHL = "80 80 80";
fontColorNA = "200 200 200";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fixedExtent = true;
justify = "left";
bitmap = "./images/checkbox";
@ -417,7 +418,7 @@ new GuiControlProfile( ToolsGuiCheckBoxListFlipedProfile : ToolsGuiCheckBoxProfi
if( !isObject( ToolsGuiInspectorCheckBoxTitleProfile ) )
new GuiControlProfile( ToolsGuiInspectorCheckBoxTitleProfile : ToolsGuiCheckBoxProfile ){
fontColor = "100 100 100";
fontColor = EditorSettings.value("Theme/fieldTextColor");
category = "Tools";
};
@ -425,9 +426,9 @@ if( !isObject( ToolsGuiRadioProfile ) )
new GuiControlProfile( ToolsGuiRadioProfile )
{
fontSize = 14;
fillColor = "232 232 232";
fontColor = "185 185 185";
fontColorHL = "80 80 80";
fillColor = EditorSettings.value("Theme/fieldBGColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fixedExtent = true;
bitmap = "./images/radioButton";
hasBitmapArray = true;
@ -438,10 +439,10 @@ if( !isObject( ToolsGuiScrollProfile ) )
new GuiControlProfile( ToolsGuiScrollProfile )
{
opaque = true;
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
fillColor = EditorSettings.value("Theme/tabsColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
border = true;
bitmap = "./images/scrollBar";
hasBitmapArray = true;
@ -452,10 +453,9 @@ if( !isObject( ToolsGuiOverlayProfile ) )
new GuiControlProfile( ToolsGuiOverlayProfile )
{
opaque = true;
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "255 255 255";
fillColor = "0 0 0 100";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextGLColor");
category = "Tools";
};
@ -478,9 +478,9 @@ new GuiControlProfile( ToolsGuiPopupMenuItemBorder : ToolsGuiButtonProfile )
{
opaque = true;
border = true;
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "255 255 255";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextGLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fixedExtent = false;
justify = "center";
canKeyFocus = false;
@ -500,13 +500,14 @@ new GuiControlProfile( ToolsGuiPopUpMenuDefault : ToolsGuiDefaultProfile )
bitmap = "./images/scrollbar";
hasBitmapArray = true;
profileForChildren = ToolsGuiPopupMenuItemBorder;
fillColor = "48 48 48";//"255 255 255";//100
fillColorHL = "228 228 235 ";//"91 101 116";
fillColorSEL = "98 100 137 ";//"91 101 116";
fillColor = EditorSettings.value("Theme/fieldBGColor");//"255 255 255";//100
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");//"91 101 116";
fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");//"91 101 116";
// font color is black
fontColorHL = "215 215 215 ";//"215 215 215";
fontColorSEL = "255 255 255";//"215 215 215";
borderColor = "100 100 100";
fontColor = EditorSettings.value("Theme/fieldTextColor");//"215 215 215";
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");//"215 215 215";
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");//"215 215 215";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
category = "Tools";
};
@ -548,11 +549,11 @@ new GuiControlProfile( ToolsGuiPopUpMenuEditProfile : ToolsGuiPopUpMenuDefault )
if( !isObject( ToolsGuiListBoxProfile ) )
new GuiControlProfile( ToolsGuiListBoxProfile )
{
fillColorHL = "100 100 100";
fillColorNA = "150 150 150";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "50 50 50";
fillColorHL = EditorSettings.value("Theme/windowBackgroundColor");
fillColorNA = EditorSettings.value("Theme/windowBackgroundColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
tab = true;
canKeyFocus = true;
@ -562,11 +563,11 @@ new GuiControlProfile( ToolsGuiListBoxProfile )
if( !isObject( ToolsGuiTabBookProfile ) )
new GuiControlProfile( ToolsGuiTabBookProfile )
{
fillColorHL = "100 100 100";
fillColorNA = "150 150 150";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "50 50 50";
fillColorHL = EditorSettings.value("Theme/windowBackgroundColor");
fillColorNA = EditorSettings.value("Theme/windowBackgroundColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans";
fontSize = 14;
justify = "center";
@ -606,7 +607,7 @@ new GuiControlProfile( ToolsGuiTreeViewProfile )
bitmap = "./images/treeView";
autoSizeHeight = true;
canKeyFocus = true;
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fillColorHL = "116 116 116";
fillColorSEL = "91 101 116";
fillColorNA = "40 40 40";
@ -632,7 +633,7 @@ new GuiControlProfile( ToolsGuiTextPadProfile )
// Deviate from the Default
opaque=true;
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
border = 0;
category = "Tools";
};
@ -686,7 +687,7 @@ singleton GuiControlProfile( GuiBackFillProfile )
singleton GuiControlProfile( GuiControlListPopupProfile )
{
opaque = true;
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fillColorHL = "91 101 116";
border = false;
//borderColor = "0 0 0";
@ -719,10 +720,10 @@ singleton GuiControlProfile( GuiInspectorButtonProfile : ToolsGuiButtonProfile )
singleton GuiControlProfile( GuiInspectorSwatchButtonProfile )
{
borderColor = "100 100 100 255";
borderColorNA = "200 200 200 255";
fillColorNA = "255 255 255 0";
borderColorHL = "0 0 0 255";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
borderColorNA = EditorSettings.value("Theme/dividerMidColor");
fillColorNA = EditorSettings.value("Theme/fieldBGColor");
borderColorHL = EditorSettings.value("Theme/dividerLightColor");
category = "Editor";
};
@ -730,8 +731,8 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile )
{
// Transparent Background
opaque = true;
fillColor = "0 0 0 0";
fillColorHL = "91 101 116";
fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
// No Border (Rendered by field control)
border = false;
@ -743,10 +744,10 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile )
fontType = "Noto Sans";
fontSize = 14;
fontColor = "215 215 215";
fontColorSEL = "0 140 220";
fontColorHL = "240 240 240";
fontColorNA = "100 100 100";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorHL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
category = "Editor";
};
singleton GuiControlProfile( GuiDropdownTextEditProfile : ToolsGuiTextEditProfile )
@ -765,9 +766,9 @@ singleton GuiControlProfile( GuiInspectorGroupProfile )
fontType = "Noto Sans";
fontSize = "14";
fontColor = "215 215 215 150";
fontColorHL = "215 215 215 220";
fontColorNA = "128 128 128";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
justify = "left";
opaque = false;
@ -783,16 +784,16 @@ singleton GuiControlProfile( GuiInspectorGroupProfile )
singleton GuiControlProfile( GuiInspectorFieldProfile)
{
// fill color
opaque = false;
fillColor = "48 48 48";
fillColorHL = "91 101 116";
fillColorNA = "244 244 244";
opaque = true;
fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
fillColorNA = EditorSettings.value("Theme/fieldBGSELColor");
// border color
border = false;
borderColor = "190 190 190";
borderColorHL = "156 156 156";
borderColorNA = "200 200 200";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
borderColorHL = EditorSettings.value("Theme/dividerMidColor");
borderColorNA = EditorSettings.value("Theme/dividerLightColor");
//bevelColorHL = "255 255 255";
//bevelColorLL = "0 0 0";
@ -801,9 +802,9 @@ singleton GuiControlProfile( GuiInspectorFieldProfile)
fontType = "Noto Sans";
fontSize = 14;
fontColor = "240 240 240";
fontColorHL = "240 240 240";
fontColorNA = "190 190 190";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
textOffset = "10 0";
tab = true;
@ -822,15 +823,15 @@ singleton GuiControlProfile( GuiInspectorMultiFieldProfile : GuiInspectorFieldPr
singleton GuiControlProfile( GuiInspectorMultiFieldDifferentProfile : GuiInspectorFieldProfile )
{
border = true;
borderColor = "190 100 100";
borderColor = EditorSettings.value("Theme/dividerMidColor");
};
singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorFieldProfile )
{
// Transparent Background
opaque = true;
fillColor = "0 0 0 0";
fillColorHL = "91 101 116";
fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
// No Border (Rendered by field control)
border = false;
@ -842,21 +843,21 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField
fontType = "Noto Sans";
fontSize = 14;
fontColor = "215 215 215";
fontColorSEL = "0 140 220";
fontColorHL = "240 240 240";
fontColorNA = "100 100 100";
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorHL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
category = "Editor";
};
singleton GuiControlProfile( GuiRolloutProfile )
{
border = 0;
borderColor = "200 200 200";
borderColor = EditorSettings.value("Theme/dividerLightColor");
fontColor = "240 240 240";
fontColorHL = "240 240 240";
fontColorNA = "190 190 190";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
hasBitmapArray = true;
bitmap = "tools/editorClasses/gui/images/rollout";
@ -894,12 +895,19 @@ singleton GuiControlProfile( GuiInspectorStackProfile )
opaque = false;
border = false;
category = "Editor";
fillColor = EditorSettings.value("Theme/tabsColor");
fillColorHL = EditorSettings.value("Theme/tabsHLColor");
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
};
singleton GuiControlProfile( GuiInspectorProfile : GuiInspectorFieldProfile )
{
opaque = true;
fillColor = "42 42 42 255";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
border = 0;
cankeyfocus = true;
tab = true;
@ -908,7 +916,7 @@ singleton GuiControlProfile( GuiInspectorProfile : GuiInspectorFieldProfile )
singleton GuiControlProfile( GuiInspectorInfoProfile : GuiInspectorFieldProfile )
{
opaque = true;
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
border = 0;
cankeyfocus = true;
tab = true;
@ -945,7 +953,7 @@ singleton GuiControlProfile( GuiInspectorTypeFileNameProfile )
fontColorHL = "240 240 240";
fontColorNA = "215 215 215";
fillColor = "48 48 48";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fillColorHL = "91 101 116";
fillColorNA = "244 244 244";
@ -987,7 +995,7 @@ singleton GuiControlProfile( InspectorTypeCheckboxProfile : GuiInspectorFieldPro
singleton GuiControlProfile( GuiToolboxButtonProfile : ToolsGuiButtonProfile )
{
justify = "center";
fontColor = "215 215 215";
fontColor = EditorSettings.value("Theme/fieldTextColor");
border = 0;
textOffset = "0 0";
category = "Editor";
@ -995,10 +1003,10 @@ singleton GuiControlProfile( GuiToolboxButtonProfile : ToolsGuiButtonProfile )
singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile )
{
fontColor = "240 240 240";
fontColorSEL= "250 250 250 175";
fillColorHL = "0 60 150";
fontColorNA = "240 240 240";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
fillColorHL = EditorSettings.value("Theme/fieldBGColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans";
fontSize = 14;
category = "Editor";
@ -1006,10 +1014,10 @@ singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile )
singleton GuiControlProfile( GuiDirectoryFileListProfile )
{
fontColor = "240 240 240";
fontColorSEL= "250 250 250 175";
fillColorHL = "0 60 150";
fontColorNA = "240 240 240";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
fillColorHL = EditorSettings.value("Theme/fieldBGColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans";
fontSize = 14;
category = "Editor";
@ -1035,13 +1043,17 @@ singleton GuiControlProfile( GuiInspectorFieldInfoMLTextProfile : ToolsGuiMLText
border = 0;
textOffset = "5 0";
category = "Editor";
fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
};
singleton GuiControlProfile( GuiEditorScrollProfile )
{
opaque = true;
fillcolor = GuiInspectorBackgroundProfile.fillColor;
borderColor = ToolsGuiDefaultProfile.borderColor;
fillcolor = EditorSettings.value("Theme/windowBackgroundColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
border = 1;
bitmap = "tools/gui/images/scrollBar";
hasBitmapArray = true;
@ -1077,16 +1089,16 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
category = "Editor";
};
singleton GuiControlProfile( GuiMenuBarProfile )
singleton GuiControlProfile( ToolsGuiMenuBarProfile )
{
fillColor = "48 48 48";
fillcolorHL = "42 42 42";
borderColor = "30 30 30 255";
borderColorHL = "30 30 30 255";
fontColor = "215 215 215";
fontColorSEL = "43 107 206";
fontColorHL = "244 244 244";
fontColorNA = "100 100 100";
fillColor = EditorSettings.value("Theme/headerColor");
fillcolorHL = EditorSettings.value("Theme/tabsSELColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
borderColorHL = EditorSettings.value("Theme/dividerMidColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
border = 0;
borderThickness = 1;
opaque = true;
@ -1094,3 +1106,90 @@ singleton GuiControlProfile( GuiMenuBarProfile )
category = "Editor";
bitmap = "tools/gui/images/checkbox-menubar";
};
singleton GuiControlProfile( ToolsMenubarProfile : ToolsGuiDefaultProfile )
{
bitmap = "./menubar";
category = "Editor";
fillColor = EditorSettings.value("Theme/headerColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
};
singleton GuiControlProfile (menubarProfile)
{
opaque = false;
border = -2;
category = "Editor";
bitmap = "./menubar";
category = "Editor";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
};
singleton GuiControlProfile (editorMenubarProfile)
{
border = -2;
category = "Editor";
bitmap = "./editor-menubar";
category = "Editor";
};
singleton GuiControlProfile (editorMenu_wBorderProfile)
{
border = -2;
category = "Editor";
bitmap = "./menu-fullborder";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutProfile)
{
border = -2;
category = "Editor";
bitmap = "./inspector-style-rollout";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutListProfile)
{
border = -2;
category = "Editor";
bitmap = "./inspector-style-rollout-list";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutDarkProfile)
{
border = -2;
category = "Editor";
bitmap = "./inspector-style-rollout-dark";
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
borderColor = EditorSettings.value("Theme/dividerDarkColor");
};
singleton GuiControlProfile (inspectorStyleRolloutInnerProfile)
{
border = -2;
category = "Editor";
bitmap = "./inspector-style-rollout_inner";
category = "Editor";
};
singleton GuiControlProfile (inspectorStyleRolloutNoHeaderProfile)
{
border = -2;
category = "Editor";
bitmap = "./inspector-style-rollout-noheader";
category = "Editor";
};
singleton GuiControlProfile (IconDropdownProfile)
{
border = -2;
category = "Editor";
bitmap = "./icon-dropdownbar";
category = "Editor";
};

6
Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui
View file

@ -58,7 +58,7 @@
anchorLeft = "1";
anchorRight = "0";
isContainer = "1";
profile = "menubarProfile";
profile = "ToolsMenubarProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "0 0";
@ -755,7 +755,7 @@
};
new GuiControl(GuiEditorSidebar) {
isContainer = "1";
Profile = "menubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "height";
position = "798 0";
@ -1503,7 +1503,7 @@
canSave = "1";
visible = "1";
isContainer = "1";
profile = "menubarProfile";
profile = "ToolsMenubarProfile";
new GuiTextCtrl( GuiEditorStatusBar ) {
profile = "ToolsGuiTextProfile";

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.cs
View file

@ -72,7 +72,7 @@ function GuiEditCanvas::onCreateMenu(%this)
extent = "1024 20";
minExtent = "320 20";
horizSizing = "width";
profile = "GuiMenuBarProfile";
profile = "ToolsGuiMenuBarProfile";
new PopupMenu()
{

2
Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui
View file

@ -43,7 +43,7 @@
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiScrollProfile";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

264
Templates/BaseGame/game/tools/settings.xml
View file

@ -1,7 +1,145 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<EditorSettings>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>
<Group name="Theme">
<Setting name="tooltipDividerColor">72 70 68 255</Setting>
<Setting name="fieldTextHLColor">234 232 230 255</Setting>
<Setting name="fieldBGSELColor">100 98 96 255</Setting>
<Setting name="dividerLightColor">96 94 92 255</Setting>
<Setting name="tabsSELColor">59 58 57 255</Setting>
<Setting name="headerColor">50 49 48 255</Setting>
<Setting name="fieldBGHLColor">72 70 68 255</Setting>
<Setting name="tabsHLColor">50 49 48 255</Setting>
<Setting name="fieldTextSELColor">240 240 240 255</Setting>
<Setting name="fieldBGColor">59 58 57 255</Setting>
<Setting name="headerTextColor">236 234 232 255</Setting>
<Setting name="dividerMidColor">50 49 48 255</Setting>
<Setting name="tabsColor">37 36 35 255</Setting>
<Setting name="fieldTextColor">178 175 172 255</Setting>
<Setting name="tooltipBGColor">43 43 43 255</Setting>
<Setting name="dividerDarkColor">17 16 15 255</Setting>
<Setting name="tooltipTextColor">255 255 255 255</Setting>
<Setting name="windowBackgroundColor">32 31 30 255</Setting>
</Group>
<Group name="GuiEditor">
<Setting name="lastPath">tools/gui</Setting>
<Setting name="previewResolution">1024 768</Setting>
<Group name="Help">
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Snapping">
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snapToControls">1</Setting>
<Setting name="snapToEdges">1</Setting>
<Setting name="snap2Grid">0</Setting>
<Setting name="snapToCanvas">1</Setting>
</Group>
<Group name="Rendering">
<Setting name="drawGuides">1</Setting>
<Setting name="drawBorderLines">1</Setting>
</Group>
<Group name="EngineDevelopment">
<Setting name="showEditorGuis">0</Setting>
<Setting name="showEditorProfiles">0</Setting>
<Setting name="toggleIntoEditor">0</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
</Group>
</Group>
<Group name="AxisGizmo">
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Group name="Grid">
<Setting name="snapToGrid">0</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="planeDim">500</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
</Group>
</Group>
<Group name="WorldEditor">
<Setting name="forceLoadDAE">0</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="torsionPath">AssetWork_Debug.exe</Setting>
<Setting name="undoLimit">40</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="displayType">6</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Group name="Color">
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
</Group>
<Group name="Tools">
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="snapSoftSize">2</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
</Group>
<Group name="Theme">
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
<Setting name="windowTitleFontColor">215 215 215 255</Setting>
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
<Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
</Group>
<Group name="Images">
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
</Group>
<Group name="Render">
<Setting name="renderObjText">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
</Group>
<Group name="Grid">
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
</Group>
<Group name="Docs">
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
</Group>
<Group name="LevelInformation">
<Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
@ -14,125 +152,7 @@
</Group>
</Group>
</Group>
<Group name="WorldEditor">
<Setting name="dropType">screenCenter</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="undoLimit">40</Setting>
<Setting name="torsionPath">AssetWork_Debug.exe</Setting>
<Setting name="displayType">6</Setting>
<Setting name="orthoFOV">50</Setting>
<Group name="Color">
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
</Group>
<Group name="Theme">
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
<Setting name="windowTitleFontColor">215 215 215 255</Setting>
<Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
</Group>
<Group name="Tools">
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
</Group>
<Group name="Grid">
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridSnap">0</Setting>
</Group>
<Group name="Images">
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
</Group>
<Group name="Docs">
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
</Group>
<Group name="Render">
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderObjHandle">1</Setting>
</Group>
</Group>
<Group name="AxisGizmo">
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Group name="Grid">
<Setting name="snapToGrid">0</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="planeDim">500</Setting>
</Group>
</Group>
<Group name="GuiEditor">
<Setting name="lastPath">tools/gui</Setting>
<Setting name="previewResolution">1024 768</Setting>
<Group name="EngineDevelopment">
<Setting name="showEditorProfiles">0</Setting>
<Setting name="toggleIntoEditor">0</Setting>
<Setting name="showEditorGuis">0</Setting>
</Group>
<Group name="Help">
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Snapping">
<Setting name="snapToCanvas">1</Setting>
<Setting name="snapToControls">1</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snapToEdges">1</Setting>
<Setting name="snap2Grid">0</Setting>
</Group>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
</Group>
<Group name="Rendering">
<Setting name="drawGuides">1</Setting>
<Setting name="drawBorderLines">1</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>
</Group>
</EditorSettings>

2
Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui
View file

@ -25,7 +25,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "menubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "0 0";

4
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -23,7 +23,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "menubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "0 0";
@ -313,7 +313,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "menubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "top";
Position = "0 578";

4
Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
View file

@ -4,7 +4,7 @@
Enabled = "0";
internalName = "ToolsToolbar";
isContainer = "1";
Profile = "editorMenubarProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "0 31";
@ -20,7 +20,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "4 3";

12
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui
View file

@ -4,7 +4,7 @@
internalName = "WorldEditorToolbar";
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "306 0";
@ -21,7 +21,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
Profile = "ToolsMenubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "0 3";
@ -83,7 +83,7 @@
new GuiControl(SnapToBar){
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
profile = "ToolsMenubarProfile";
Position = "116 3";
Extent = "123 27";
Padding = "4";
@ -296,7 +296,7 @@
new GuiControl(ToggleButtonBar){
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
profile = "ToolsMenubarProfile";
Position = "313 3";
Extent = "65 27";
@ -377,7 +377,7 @@
new GuiControl(ToggleNodeBar){
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
profile = "ToolsMenubarProfile";
Position = "386 3";
Extent = "63 27";
@ -441,7 +441,7 @@
new GuiControl(PrefabBar){
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
profile = "ToolsMenubarProfile";
Position = "386 3";
Extent = "63 27";
visible = true;

1
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui
View file

@ -274,6 +274,7 @@
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
profile = "ToolsGuiScrollProfile";
hovertime = "1000";
Docking = "Client";
Margin = "0 0 0 0";

1
Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorCreatorWindow.ed.gui
View file

@ -79,6 +79,7 @@
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
profile = "ToolsGuiScrollProfile";
hovertime = "1000";
Docking = "Client";
Margin = "0 0 0 0";

7
Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs
View file

@ -51,13 +51,11 @@ function toggleColorBufferViz( %enable )
}
else if ( %enable )
{
AL_DeferredShading.disable();
AL_ColorBufferVisualize.enable();
}
else if ( !%enable )
{
AL_ColorBufferVisualize.disable();
AL_DeferredShading.enable();
}
}
@ -360,12 +358,7 @@ function toggleBackbufferViz( %enable )
if ( %enable $= "" )
{
$AL_BackbufferVisualizeVar = AL_DeferredShading.isEnabled() ? true : false;
AL_DeferredShading.toggle();
}
else if ( %enable )
AL_DeferredShading.disable();
else if ( !%enable )
AL_DeferredShading.enable();
}
function toggleColorBlindnessViz( %enable )

13
Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs
View file

@ -116,7 +116,7 @@ function EditorGui::buildMenus(%this)
extent = Canvas.extent.x SPC "20";
minExtent = "320 20";
horizSizing = "width";
profile = "GuiMenuBarProfile";
profile = "ToolsGuiMenuBarProfile";
};
// File Menu
@ -185,11 +185,12 @@ function EditorGui::buildMenus(%this)
Item[9] = "Select..." TAB "" TAB "EditorGui.toggleObjectSelectionsWindow();";
item[10] = "-";
item[11] = "Audio Parameters..." TAB "" TAB "EditorGui.toggleSFXParametersWindow();";
item[12] = "Editor Settings..." TAB "" TAB "ESettingsWindow.ToggleVisibility();";
item[13] = "Snap Options..." TAB "" TAB "ESnapOptions.ToggleVisibility();";
item[14] = "-";
item[15] = "Game Options..." TAB "" TAB "Canvas.pushDialog(optionsDlg);";
item[16] = "PostEffect Manager" TAB "" TAB "Canvas.pushDialog(PostFXManager);";
item[12] = "Editor Settings..." TAB "" TAB "ESettingsWindow.toggleEditorSettings();";
item[13] = "Game Settings..." TAB "" TAB "ESettingsWindow.toggleProjectSettings();";
item[14] = "Snap Options..." TAB "" TAB "ESnapOptions.ToggleVisibility();";
item[15] = "-";
item[16] = "Game Options..." TAB "" TAB "Canvas.pushDialog(optionsDlg);";
item[17] = "PostEffect Manager" TAB "" TAB "Canvas.pushDialog(PostFXManager);";
};
%this.menuBar.insert(%editMenu);