TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into SubScenes_Gamemode_PR

Browse source
This commit is contained in:
JeffR 2024-09-28 22:11:39 -05:00
commit 20a01d9f02
71 changed files with 353 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -797,6 +797,13 @@ void WheeledVehicle::updateMove(const Move* move)
// Set the tail brake light thread direction based on the brake state. // Set the tail brake light thread direction based on the brake state.
if (mTailLightThread) if (mTailLightThread)
mShapeInstance->setTimeScale(mTailLightThread, mBraking? 1.0f : -1.0f); mShapeInstance->setTimeScale(mTailLightThread, mBraking? 1.0f : -1.0f);
// Update the steering animation: sequence time 0 is full right,
// and time 0.5 is straight ahead.
if (mSteeringThread) {
F32 t = (mSteering.x * mFabs(mSteering.x)) / mDataBlock->maxSteeringAngle;
mShapeInstance->setPos(mSteeringThread, 0.5 - t * 0.5);
}
} }

4
Engine/source/console/consoleFunctions.cpp
View file

@ -2803,7 +2803,7 @@ DefineEngineFunction(getTimestamp, const char*, (), ,
return returnBuffer; return returnBuffer;
} }
#ifdef TORQUE_TOOLS #ifdef TORQUE_TOOLS_EXT_COMMANDS
DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const char* callBackFunction), (""), "") DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const char* callBackFunction), (""), "")
{ {
if (commandLineAction && commandLineAction[0] != '\0') if (commandLineAction && commandLineAction[0] != '\0')
@ -2819,7 +2819,9 @@ DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const c
return -1; return -1;
} }
#endif
#ifdef TORQUE_TOOLS
const char* getDocsLink(const char* filename, U32 lineNumber) const char* getDocsLink(const char* filename, U32 lineNumber)
{ {
Vector<String> fileStringSplit; Vector<String> fileStringSplit;

2
Engine/source/console/torquescript/CMDgram.y
View file

@ -656,7 +656,7 @@ yyreport_syntax_error (const yypcontext_t *ctx)
output += String::ToString("%5s | %*s", "", loc->first_column, "^"); output += String::ToString("%5s | %*s", "", loc->first_column, "^");
} }
yyerror(output.c_str()); yyerror("%s", output.c_str());
return ret; return ret;
} }

2
Engine/source/console/torquescript/cmdgram.cpp
View file

@ -3363,7 +3363,7 @@ yyreport_syntax_error (const yypcontext_t *ctx)
output += String::ToString("%5s | %*s", "", loc->first_column, "^"); output += String::ToString("%5s | %*s", "", loc->first_column, "^");
} }
yyerror(output.c_str()); yyerror("%s",output.c_str());
return ret; return ret;
} }

1
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -779,6 +779,7 @@ bool GBitmap::getColor(const U32 x, const U32 y, ColorI& rColor) const
break; break;
case GFXFormatL16: case GFXFormatL16:
rColor.set(U8(U16((pLoc[0] << 8) + pLoc[1])), 0, 0, 0); rColor.set(U8(U16((pLoc[0] << 8) + pLoc[1])), 0, 0, 0);
break;
case GFXFormatR8G8B8: case GFXFormatR8G8B8:
case GFXFormatR8G8B8X8: case GFXFormatR8G8B8X8:
rColor.set( pLoc[0], pLoc[1], pLoc[2], 255 ); rColor.set( pLoc[0], pLoc[1], pLoc[2], 255 );

79
Engine/source/gui/controls/guiColorPicker.cpp
View file

@ -272,18 +272,18 @@ void GuiColorPickerCtrl::drawSelector(RectI &bounds, Point2I &selectorPos, Selec
{ {
case sVertical: case sVertical:
// Now draw the vertical selector Up -> Pos // Now draw the vertical selector Up -> Pos
if (selectorPos.y != bounds.point.y+1) if (selectorPos.y > bounds.point.y)
GFX->getDrawUtil()->drawLine(selectorPos.x, bounds.point.y, selectorPos.x, selectorPos.y-sMax-1, color); GFX->getDrawUtil()->drawLine(selectorPos.x, bounds.point.y, selectorPos.x, selectorPos.y-sMax-1, color);
// Down -> Pos // Down -> Pos
if (selectorPos.y != bounds.point.y+bounds.extent.y) if (selectorPos.y < bounds.point.y + bounds.extent.y)
GFX->getDrawUtil()->drawLine(selectorPos.x, selectorPos.y + sMax, selectorPos.x, bounds.point.y + bounds.extent.y, color); GFX->getDrawUtil()->drawLine(selectorPos.x, selectorPos.y + sMax, selectorPos.x, bounds.point.y + bounds.extent.y, color);
break; break;
case sHorizontal: case sHorizontal:
// Now draw the horizontal selector Left -> Pos // Now draw the horizontal selector Left -> Pos
if (selectorPos.x != bounds.point.x) if (selectorPos.x > bounds.point.x)
GFX->getDrawUtil()->drawLine(bounds.point.x, selectorPos.y-1, selectorPos.x-sMax, selectorPos.y-1, color); GFX->getDrawUtil()->drawLine(bounds.point.x, selectorPos.y-1, selectorPos.x-sMax, selectorPos.y-1, color);
// Right -> Pos // Right -> Pos
if (selectorPos.x != bounds.point.x) if (selectorPos.x < bounds.point.x + bounds.extent.x)
GFX->getDrawUtil()->drawLine(bounds.point.x+mSelectorPos.x+sMax, selectorPos.y-1, bounds.point.x + bounds.extent.x, selectorPos.y-1, color); GFX->getDrawUtil()->drawLine(bounds.point.x+mSelectorPos.x+sMax, selectorPos.y-1, bounds.point.x + bounds.extent.x, selectorPos.y-1, color);
break; break;
} }
@ -388,13 +388,11 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect)
{ {
Point2I resolution = getRoot()->getExtent(); Point2I resolution = getRoot()->getExtent();
U32 buf_x = offset.x + mSelectorPos.x + 1; U32 buf_x = offset.x + mSelectorPos.x;
U32 buf_y = resolution.y - (extent.y - (offset.y + mSelectorPos.y + 1)); U32 buf_y = resolution.y - (extent.y - (offset.y + mSelectorPos.y));
GFXTexHandle bb(resolution.x, resolution.y, GFXFormatR8G8B8A8_SRGB, &GFXRenderTargetSRGBProfile, avar("%s() - bb (line %d)", __FUNCTION__, __LINE__)); GFXTexHandle bb(resolution.x, resolution.y, GFXFormatR8G8B8A8_SRGB, &GFXRenderTargetSRGBProfile, avar("%s() - bb (line %d)", __FUNCTION__, __LINE__));
Point2I tmpPt(buf_x, buf_y);
GFXTarget *targ = GFX->getActiveRenderTarget(); GFXTarget *targ = GFX->getActiveRenderTarget();
targ->resolveTo(bb); targ->resolveTo(bb);
@ -458,19 +456,7 @@ void GuiColorPickerCtrl::setSelectorPos(const LinearColorF & color)
Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I& offset, const Point2I& resolution, GBitmap& bmp) Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I& offset, const Point2I& resolution, GBitmap& bmp)
{ {
RectI rect;
Point2I ext = getExtent(); Point2I ext = getExtent();
if (mDisplayMode != pDropperBackground)
{
ext.x -= 3;
ext.y -= 2;
rect = RectI(Point2I(1, 1), ext);
}
else
{
rect = RectI(Point2I(0, 0), ext);
}
Point2I closestPos(-1, -1); Point2I closestPos(-1, -1);
/* Debugging /* Debugging
@ -498,12 +484,12 @@ Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I&
F32 closestVal(10000.0f); F32 closestVal(10000.0f);
bool closestSet = false; bool closestSet = false;
for (S32 x = rect.point.x; x <= rect.extent.x; x++) for (S32 x = 0; x < ext.x; x++)
{ {
for (S32 y = rect.point.y; y <= rect.extent.y; y++) for (S32 y = 0; y < ext.y; y++)
{ {
buf_x = offset.x + x + 1; buf_x = offset.x + x;
buf_y = (resolution.y - (offset.y + y + 1)); buf_y = (resolution.y - (offset.y + y));
buf_y = resolution.y - buf_y; buf_y = resolution.y - buf_y;
//Get the color at that position //Get the color at that position
@ -532,46 +518,11 @@ Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I&
void GuiColorPickerCtrl::setSelectorPos(const Point2I &pos) void GuiColorPickerCtrl::setSelectorPos(const Point2I &pos)
{ {
Point2I extent = getExtent(); Point2I ext = getExtent();
RectI rect; mSelectorPos.x = mClamp(pos.x, 1, ext.x - 1);
if (mDisplayMode != pDropperBackground) mSelectorPos.y = mClamp(pos.y, 1, ext.y - 1);
{ mPositionChanged = true;
extent.x -= 3; setUpdate();
extent.y -= 2;
rect = RectI(Point2I(1,1), extent);
}
else
{
rect = RectI(Point2I(0,0), extent);
}
if (rect.pointInRect(pos))
{
mSelectorPos = pos;
mPositionChanged = true;
// We now need to update
setUpdate();
}
else
{
if ((pos.x > rect.point.x) && (pos.x < (rect.point.x + rect.extent.x)))
mSelectorPos.x = pos.x;
else if (pos.x <= rect.point.x)
mSelectorPos.x = rect.point.x;
else if (pos.x >= (rect.point.x + rect.extent.x))
mSelectorPos.x = rect.point.x + rect.extent.x - 1;
if ((pos.y > rect.point.y) && (pos.y < (rect.point.y + rect.extent.y)))
mSelectorPos.y = pos.y;
else if (pos.y <= rect.point.y)
mSelectorPos.y = rect.point.y;
else if (pos.y >= (rect.point.y + rect.extent.y))
mSelectorPos.y = rect.point.y + rect.extent.y - 1;
mPositionChanged = true;
setUpdate();
}
} }
void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event) void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event)

19
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
View file

@ -3043,16 +3043,23 @@ DefineEngineMethod(GuiConvexEditorCtrl, getSelectedFaceZRot, float, (), ,
} }
DefineEngineMethod(GuiConvexEditorCtrl, toggleGridSnapping, void, (),, DefineEngineMethod(GuiConvexEditorCtrl, toggleGridSnapping, void, (),,
"@brief Mount objB to this object at the desired slot with optional transform.\n\n" "@brief toggle grid snapping state.\n\n")
"@param objB Object to mount onto us\n"
"@param slot Mount slot ID\n"
"@param txfm (optional) mount offset transform\n"
"@return true if successful, false if failed (objB is not valid)")
{ {
object->toggleGridSnapping(); object->toggleGridSnapping();
} }
DefineEngineMethod(GuiConvexEditorCtrl, setGridSnap, void, (bool snap), ,
"@brief set grid snapping state.\n\n")
{
object->setGridSnap(snap);
}
DefineEngineMethod(GuiConvexEditorCtrl, getGridSnap, bool, (), ,
"@brief set grid snapping state.\n\n")
{
return object->getGridSnap();
}
DefineEngineMethod(GuiConvexEditorCtrl, setGridSnapSize, void, (float gridSize), (1.0), DefineEngineMethod(GuiConvexEditorCtrl, setGridSnapSize, void, (float gridSize), (1.0),
"@brief Mount objB to this object at the desired slot with optional transform.\n\n" "@brief Mount objB to this object at the desired slot with optional transform.\n\n"

2
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
View file

@ -130,6 +130,8 @@ public:
void setSelectedFaceVertFlip(bool flipped); void setSelectedFaceVertFlip(bool flipped);
void setSelectedFaceZRot(float degrees); void setSelectedFaceZRot(float degrees);
void toggleGridSnapping(); void toggleGridSnapping();
bool getGridSnap() { return mGridSnap; };
void setGridSnap(bool snap) { mGridSnap = snap; };
void setGridSnapSize(float gridSize); void setGridSnapSize(float gridSize);
void updateShape(); void updateShape();

27
Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl
View file

@ -22,7 +22,7 @@
#include "torque.glsl" #include "torque.glsl"
#line 25
#define IMPOSTER_MAX_UVS 64 #define IMPOSTER_MAX_UVS 64
@ -94,24 +94,22 @@ void imposter_v(
// First check to see if we need to render the top billboard. // First check to see if we need to render the top billboard.
int index; int index;
/* if ( includePoles && ( lookPitch < polarHalfStep || lookPitch > M_PI_F - polarHalfStep ) )
if ( includePoles && ( lookPitch < polarAngle || lookPitch > sPi - polarAngle ) )
{ {
index = numEquatorSteps * 3; index = numEquatorSteps * numPolarSteps;
// When we render the top/bottom billboard we always use // When we render the top/bottom billboard we always use
// a fixed vector that matches the rotation of the object. // a fixed vector that matches the rotation of the object.
rightVec = vec3( 1, 0, 0 ) * sCornerRight[corner]; rightVec = vec3( 1, 0, 0 ) * sCornerRight[corner];
upVec = vec3( 0, 1, 0 ) * sCornerUp[corner]; upVec = vec3( 0, -1, 0 ) * sCornerUp[corner];
if ( lookPitch > sPi - polarAngle ) if ( lookPitch < polarHalfStep )
{ {
upVec = -upVec; upVec = -upVec;
index++; index++;
} }
} }
else else
*/
{ {
// Calculate the rotation around the z axis then add the // Calculate the rotation around the z axis then add the
// equator half step. This gets the images to switch a // equator half step. This gets the images to switch a
@ -126,20 +124,23 @@ void imposter_v(
// TODO: How can we do this without conditionals? // TODO: How can we do this without conditionals?
// Normalize the result to 0 to 2PI. // Normalize the result to 0 to 2PI.
if ( rotZ < 0.0 ) if ( rotZ < 0 )
rotZ += M_2PI_F; rotZ += M_2PI_F;
if ( rotZ > M_2PI_F ) else if ( rotZ > M_2PI_F )
rotZ -= M_2PI_F; rotZ -= M_2PI_F;
if ( rotY < 0.0 )
if ( rotY < 0 )
rotY += M_2PI_F; rotY += M_2PI_F;
if ( rotY > M_PI_F ) // Not M_2PI_F? else if ( rotY > M_2PI_F )
rotY -= M_2PI_F; rotY -= M_2PI_F;
float polarIdx = round( abs( rotY ) / polarStepSize ); int polarIdx = int(max(min(round( rotY / polarStepSize ), numPolarSteps-2),0));
// Get the index to the start of the right polar // Get the index to the start of the right polar
// images for this viewing angle. // images for this viewing angle.
int numPolarOffset = int( float( numEquatorSteps ) * polarIdx ); int numPolarOffset = numEquatorSteps * polarIdx;
if (includePoles)
numPolarOffset = (numEquatorSteps+2) * polarIdx;
// Calculate the final image index for lookup // Calculate the final image index for lookup
// of the texture coords. // of the texture coords.

19
Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl
View file

@ -82,24 +82,22 @@ void imposter_v(
// First check to see if we need to render the top billboard. // First check to see if we need to render the top billboard.
int index; int index;
/* if ( includePoles && ( lookPitch < polarHalfStep || lookPitch > (M_PI_F - polarHalfStep) ) )
if ( includePoles && ( lookPitch < polarAngle || lookPitch > sPi - polarAngle ) )
{ {
index = numEquatorSteps * 3; index = numEquatorSteps * numPolarSteps;
// When we render the top/bottom billboard we always use // When we render the top/bottom billboard we always use
// a fixed vector that matches the rotation of the object. // a fixed vector that matches the rotation of the object.
rightVec = float3( 1, 0, 0 ) * sCornerRight[corner]; rightVec = float3( 1, 0, 0 ) * sCornerRight[corner];
upVec = float3( 0, 1, 0 ) * sCornerUp[corner]; upVec = float3( 0, -1, 0 ) * sCornerUp[corner];
if ( lookPitch > sPi - polarAngle ) if ( lookPitch < polarHalfStep )
{ {
upVec = -upVec; upVec = -upVec;
index++; index++;
} }
} }
else else
*/
{ {
// Calculate the rotation around the z axis then add the // Calculate the rotation around the z axis then add the
// equator half step. This gets the images to switch a // equator half step. This gets the images to switch a
@ -116,18 +114,21 @@ void imposter_v(
// Normalize the result to 0 to 2PI. // Normalize the result to 0 to 2PI.
if ( rotZ < 0 ) if ( rotZ < 0 )
rotZ += M_2PI_F; rotZ += M_2PI_F;
if ( rotZ > M_2PI_F ) else if ( rotZ > M_2PI_F )
rotZ -= M_2PI_F; rotZ -= M_2PI_F;
if ( rotY < 0 ) if ( rotY < 0 )
rotY += M_2PI_F; rotY += M_2PI_F;
if ( rotY > M_PI_F ) // Not M_2PI_F? else if ( rotY > M_2PI_F )
rotY -= M_2PI_F; rotY -= M_2PI_F;
float polarIdx = round( abs( rotY ) / polarStepSize ); int polarIdx = max(min(round( rotY / polarStepSize ), numPolarSteps-2),0);
// Get the index to the start of the right polar // Get the index to the start of the right polar
// images for this viewing angle. // images for this viewing angle.
int numPolarOffset = numEquatorSteps * polarIdx; int numPolarOffset = numEquatorSteps * polarIdx;
if (includePoles)
numPolarOffset = (numEquatorSteps+2) * polarIdx;
// Calculate the final image index for lookup // Calculate the final image index for lookup
// of the texture coords. // of the texture coords.

4
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui
View file

@ -71,7 +71,7 @@ new VPathEditor(EVPathEditor) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Verve Path Editor"; text = ":: Verve Path Editor";
new GuiContainer(){ new GuiContainer(){
profile = GuiDefaultProfile; profile = GuiDefaultProfile;
@ -218,7 +218,7 @@ new VPathEditor(EVPathEditor) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Verve Path - Properties"; text = ":: Verve Path - Properties";
new GuiContainer(){ //Node Properties new GuiContainer(){ //Node Properties
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript
View file

@ -31,8 +31,9 @@ function EVPathEditor::maxSize(%this, %window)
%fixedWindow = VPathEditorTreeWindow; %fixedWindow = VPathEditorTreeWindow;
%fluidWindow = VPathEditorOptionsWindow; %fluidWindow = VPathEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

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

@ -138,7 +138,7 @@ $guiContent = new GuiControl(AssetBrowser) {
}; };
}; };
new GuiWindowCtrl(AssetBrowserWindow) { new GuiWindowCtrl(AssetBrowserWindow) {
text = ":: Asset Browser"; text = ":: Asset Browser";
resizeWidth = "0"; resizeWidth = "0";
resizeHeight = "1"; resizeHeight = "1";
canMove = "1"; canMove = "1";
@ -1180,90 +1180,6 @@ $guiContent = new GuiControl(AssetBrowser) {
canSave = "1"; canSave = "1";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
}; };
new GuiButtonCtrl(assetBrowser_Tab1) {
text = "Tab1 Text 1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "5 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab2) {
text = "Tab1 Text 2";
buttonType = "PushButton";
useMouseEvents = "0";
position = "105 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab3) {
text = "Tab1 Text 3";
buttonType = "PushButton";
useMouseEvents = "0";
position = "205 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab4) {
text = "Tab1 Text 4";
buttonType = "PushButton";
useMouseEvents = "0";
position = "305 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowserWindow_UnDockBtn) { new GuiBitmapButtonCtrl(AssetBrowserWindow_UnDockBtn) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = ""; internalName = "";

46
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -92,42 +92,6 @@ function AssetBrowser::onDialogPop(%this)
function AssetBrowser::onDialogPush(%this) function AssetBrowser::onDialogPush(%this)
{ {
$AssetBrowser::Open = true; $AssetBrowser::Open = true;
// Add a tab to the windowed console
if($WindowConsole::Open)
{
%text = "Console Log";
%command = "windowConsoleControl.putToFront();";
AssetBrowserWindow.text = "";
windowConsoleControl.text = "";
AssetBrowser.setTab(assetBrowser_Tab1, "Asset Browser", "");
assetBrowser_Tab1.setHidden(false);
assetBrowser_Tab1.setActive(false);
if(assetBrowser_Tab2.text $= %text || assetBrowser_Tab3.text $= %text || assetBrowser_Tab4.text $= %text)
{
// we have a tab, don't do anything
}
else if(assetBrowser_Tab2.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab2, %text, %command);
}
else if(assetBrowser_Tab3.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab3, %text, %command);
}
else if(assetBrowser_Tab4.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab4, %text, %command);
}
else
{
warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()");
}
}
EditorGui.updateSideBar(); EditorGui.updateSideBar();
} }
@ -699,7 +663,9 @@ function AssetBrowser::doRefresh(%this)
function AssetBrowser::populatePreviewImages(%this) function AssetBrowser::populatePreviewImages(%this)
{ {
echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count()); if (AssetPreviewArray.count()>0)
echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count());
for(%i=0; %i < AssetPreviewArray.count(); %i++) for(%i=0; %i < AssetPreviewArray.count(); %i++)
{ {
%previewButton = AssetPreviewArray.getKey(%i); %previewButton = AssetPreviewArray.getKey(%i);
@ -1526,7 +1492,8 @@ function AssetBrowser::rebuildAssetArray(%this)
if(!%this.previewArrayDirty) if(!%this.previewArrayDirty)
{ {
%this.previewArrayDirty = true; %this.previewArrayDirty = true;
%this.schedule(16, "doRebuildAssetArray"); cancel(%this.pendingRebuild);
%this.pendingRebuild = %this.schedule(16, "doRebuildAssetArray");
} }
} }
@ -2899,6 +2866,5 @@ function AssetBrowserWindow::onResize(%this, %posX, %posY, %width, %height)
AssetBrowser-->assetList.fillRowFirst = true; AssetBrowser-->assetList.fillRowFirst = true;
else else
AssetBrowser-->assetList.fillRowFirst = false; AssetBrowser-->assetList.fillRowFirst = false;
AssetBrowser.rebuildAssetArray();
AssetBrowser.doRebuildAssetArray();
} }

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui
View file

@ -70,7 +70,7 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Convex Shape Editor"; text = ":: Convex Shape Editor";
new GuiContainer(){ new GuiContainer(){
profile = "ToolsGuiDefaultProfile"; profile = "ToolsGuiDefaultProfile";

17
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript
View file

@ -59,6 +59,11 @@ function ConvexEditorGui::onWake( %this )
%this.resizing = false; %this.resizing = false;
%this.releaseSidePanel(); %this.releaseSidePanel();
} }
EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
%this.setGridSnap( EWorldEditor.UseGridSnap );
EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
} }
function ConvexEditorGui::onSleep( %this ) function ConvexEditorGui::onSleep( %this )
@ -212,9 +217,14 @@ function ConvexEditorMaterialResetBtn::onClick(%this)
function ConvexEditorGui::toggleGridSnap(%this) function ConvexEditorGui::toggleGridSnap(%this)
{ {
%this.toggleGridSnapping(); EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap;
EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap );
CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
%this.setGridSnap( EWorldEditor.UseGridSnap );
EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
} }
function ConvexEditorGridSnapSizeFld::onReturn(%this) function ConvexEditorGridSnapSizeFld::onReturn(%this)
{ {
ConvexEditorGui.setGridSnapSize(%this.getText()); ConvexEditorGui.setGridSnapSize(%this.getText());
@ -276,8 +286,9 @@ function ConvexEditorGui::maxSize(%this, %window)
%this.resizing = false; %this.resizing = false;
%fluidWindow = ConvexEditorOptionsWindow; %fluidWindow = ConvexEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%position = Canvas.extent.x - %fluidWindow.extent.x SPC %top; %position = Canvas.extent.x - %fluidWindow.extent.x SPC %top;
%extent = %window.extent.x SPC Canvas.extent.y - %bottom; %extent = %window.extent.x SPC Canvas.extent.y - %bottom;

2
Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui
View file

@ -5,7 +5,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions)
extent = "800 600"; extent = "800 600";
new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) { new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) {
text = ":: Sketch Tool - Properties"; text = ":: Sketch Tool - Properties";
resizeWidth = "1"; resizeWidth = "1";
resizeHeight = "1"; resizeHeight = "1";
canMove = "1"; canMove = "1";

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

@ -110,7 +110,7 @@ $guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
MinExtent = "1 1"; MinExtent = "1 1";
bitmapAsset = "ToolsModule:separator_h_image"; bitmapAsset = "ToolsModule:separator_h_image";
}; };
new GuiContainer() { new GuiContainer(CESnapOptions) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
Enabled = "1"; Enabled = "1";
isContainer = "1"; isContainer = "1";

4
Templates/BaseGame/game/tools/convexEditor/main.tscript
View file

@ -130,6 +130,10 @@ function ConvexEditorPlugin::onActivated( %this )
ConvexEditorScaleModeBtn.performClick(); ConvexEditorScaleModeBtn.performClick();
} }
EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
%this.setGridSnap( EWorldEditor.UseGridSnap );
Parent::onActivated( %this ); Parent::onActivated( %this );
} }

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui
View file

@ -23,7 +23,7 @@ $guiContent = new GuiControl() {
minSize = "50 50"; minSize = "50 50";
closeCommand = "DatablockEditorInspectorWindow.setVisible(false);"; closeCommand = "DatablockEditorInspectorWindow.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Datablock Editor - Data"; text = ":: Datablock Editor - Data";
Margin = "8 8 8 8"; Margin = "8 8 8 8";
Padding = "0 0 0 0"; Padding = "0 0 0 0";
AnchorTop = "1"; AnchorTop = "1";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui
View file

@ -23,7 +23,7 @@ $guiContent = new GuiControl(DatablockEditorGui) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "DatablockInspectorTreeWindow.setVisible(false);"; closeCommand = "DatablockInspectorTreeWindow.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Datablock Editor - Library"; text = ":: Datablock Editor - Library";
Margin = "8 8 8 8"; Margin = "8 8 8 8";
Padding = "0 0 0 0"; Padding = "0 0 0 0";
AnchorTop = "1"; AnchorTop = "1";

5
Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript
View file

@ -824,8 +824,9 @@ function DatablockEditorGui::maxSize(%this, %window)
%fixedWindow = DatablockEditorTreeWindow; %fixedWindow = DatablockEditorTreeWindow;
%fluidWindow = DatablockEditorInspectorWindow; %fluidWindow = DatablockEditorInspectorWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

4
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui
View file

@ -69,7 +69,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Decal Editor"; text = ":: Decal Editor";
new GuiTabBookCtrl(DecalEditorTabBook) { new GuiTabBookCtrl(DecalEditorTabBook) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
@ -517,7 +517,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
minSize = "152 235"; minSize = "152 235";
closeCommand = "EPainter.parentGroup.setVisible(false);"; closeCommand = "EPainter.parentGroup.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Decal Properties"; text = ":: Decal Properties";
new GuiScrollCtrl(DecalEditorTemplateProperties){ new GuiScrollCtrl(DecalEditorTemplateProperties){
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

9
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript
View file

@ -54,8 +54,9 @@ function DecalEditorGui::maxSize(%this, %window)
%fixedWindow = DecalEditorWindow; %fixedWindow = DecalEditorWindow;
%fluidWindow = DecalPreviewWindow; %fluidWindow = DecalPreviewWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------
@ -486,7 +487,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx )
{ {
if( %idx == 0) if( %idx == 0)
{ {
DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; DecalPreviewWindow.text = ":: Decal Editor - Template Properties";
DecalEditorLibraryProperties.setVisible(true); DecalEditorLibraryProperties.setVisible(true);
DecalEditorTemplateProperties.setVisible(false); DecalEditorTemplateProperties.setVisible(false);
RetargetDecalButton.setVisible( true ); RetargetDecalButton.setVisible( true );
@ -496,7 +497,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx )
} }
else else
{ {
DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; DecalPreviewWindow.text = ":: Decal Editor - Instance Properties";
RetargetDecalButton.setVisible( false ); RetargetDecalButton.setVisible( false );
NewDecalButton.setVisible( false ); NewDecalButton.setVisible( false );
SaveDecalsButton.setVisible( false ); SaveDecalsButton.setVisible( false );

4
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui
View file

@ -46,7 +46,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Forest Editor - Pallete"; text = ":: Forest Editor - Pallete";
Margin = "0 0 0 0"; Margin = "0 0 0 0";
Padding = "0 0 0 0"; Padding = "0 0 0 0";
AnchorTop = "1"; AnchorTop = "1";
@ -525,7 +525,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Forest Editor - Properties"; text = ":: Forest Editor - Properties";
Margin = "0 0 0 0"; Margin = "0 0 0 0";
Padding = "0 0 0 0"; Padding = "0 0 0 0";
AnchorTop = "1"; AnchorTop = "1";

5
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript
View file

@ -56,8 +56,9 @@ function ForestEditorGui::maxSize(%this, %window)
%fixedWindow = ForestEditorPalleteWindow; %fixedWindow = ForestEditorPalleteWindow;
%fluidWindow = ForestEditorPropertiesWindow; %fluidWindow = ForestEditorPropertiesWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui
View file

@ -15,7 +15,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
new GuiWindowCollapseCtrl(ESettingsWindow) { new GuiWindowCollapseCtrl(ESettingsWindow) {
text = ":: Editor Settings"; text = ":: Editor Settings";
resizeWidth = "0"; resizeWidth = "0";
resizeHeight = "0"; resizeHeight = "0";
canMove = "1"; canMove = "1";

64
Templates/BaseGame/game/tools/gui/colorPicker.ed.gui
View file

@ -19,7 +19,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
new GuiWindowCtrl(GuiPickerDlg) { new GuiWindowCtrl(GuiPickerDlg) {
text = "Color Picker"; text = ":: Color Picker";
resizeWidth = "0"; resizeWidth = "0";
resizeHeight = "0"; resizeHeight = "0";
canMove = "1"; canMove = "1";
@ -45,8 +45,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
new GuiBitmapBorderCtrl(){ // color blend new GuiBitmapBorderCtrl(){ // color blend
position = "3 24"; position = "3 25";
extent = "255 258"; extent = "260 260";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
@ -67,8 +67,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
selectorGap = "1"; selectorGap = "1";
displayMode = "BlendColor"; displayMode = "BlendColor";
actionOnMove = "1"; actionOnMove = "1";
position = "1 0"; position = "1 1";
extent = "255 258"; extent = "255 255";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
@ -86,8 +86,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
}; };
new GuiBitmapBorderCtrl(){ // Hue new GuiBitmapBorderCtrl(){ // Hue
position = "263 23"; position = "265 25";
extent = "25 261"; extent = "25 260";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
@ -109,7 +109,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
displayMode = "VertColor"; displayMode = "VertColor";
actionOnMove = "1"; actionOnMove = "1";
position = "1 1"; position = "1 1";
extent = "21 257"; extent = "20 255";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
@ -128,9 +128,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
text = "New"; text = "New";
position = "306 22"; position = "305 22";
extent = "26 14"; extent = "26 14";
profile = "GuiDefaultProfile"; profile = "ToolsGuiTextProfile";
}; };
new GuiBitmapBorderCtrl(){ // new old color new GuiBitmapBorderCtrl(){ // new old color
position = "292 37"; position = "292 37";
@ -162,9 +162,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
text = "Old"; text = "Old";
position = "310 138"; position = "307 137";
extent = "26 14"; extent = "26 14";
profile = "GuiDefaultProfile"; profile = "ToolsGuiTextProfile";
}; };
new GuiBitmapBorderCtrl(){ // Color Text Fields new GuiBitmapBorderCtrl(){ // Color Text Fields
position = "291 165"; position = "291 165";
@ -185,7 +185,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
new GuiControl() { // rgb new GuiControl() { // rgb
position = "4 0"; position = "4 0";
extent = "52 75"; extent = "52 80";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
@ -209,7 +209,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "5 6"; position = "1 6";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -228,12 +228,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
new GuiTextEditCtrl(Channel_R_Val) { // Red Channal new GuiTextEditCtrl(Channel_R_Val) { // Red Channal
text = "0"; text = "0";
maxLength = "4"; maxLength = "6";
position = "14 6"; position = "14 6";
extent = "34 18"; extent = "34 28";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass"; class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Red Channel color value."; tooltip = "Red Channel color value.";
@ -247,7 +247,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "4 29"; position = "0 29";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -266,12 +266,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
new GuiTextEditCtrl(Channel_G_Val) { // Green Channal new GuiTextEditCtrl(Channel_G_Val) { // Green Channal
text = "0"; text = "0";
maxLength = "4"; maxLength = "6";
position = "14 29"; position = "14 29";
extent = "34 18"; extent = "34 28";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass"; class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Green Channel color value."; tooltip = "Green Channel color value.";
@ -285,7 +285,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "5 52"; position = "1 52";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -304,12 +304,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
}; };
new GuiTextEditCtrl(Channel_B_Val) { // Blue Channal new GuiTextEditCtrl(Channel_B_Val) { // Blue Channal
text = "0"; text = "0";
maxLength = "4"; maxLength = "6";
position = "14 52"; position = "14 52";
extent = "34 18"; extent = "34 28";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass"; class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Blue Channel color value."; tooltip = "Blue Channel color value.";
@ -341,7 +341,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "5 6"; position = "1 6";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -365,7 +365,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18"; extent = "34 18";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass"; class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Hue Channel color value."; tooltip = "Hue Channel color value.";
@ -404,7 +404,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "4 29"; position = "0 29";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -428,7 +428,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18"; extent = "34 18";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass"; class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Saturation Channel color value."; tooltip = "Saturation Channel color value.";
@ -467,7 +467,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0"; anchorBottom = "0";
anchorLeft = "1"; anchorLeft = "1";
anchorRight = "0"; anchorRight = "0";
position = "5 52"; position = "1 52";
extent = "8 18"; extent = "8 18";
minExtent = "8 2"; minExtent = "8 2";
horizSizing = "right"; horizSizing = "right";
@ -491,7 +491,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18"; extent = "34 18";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass"; class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
tooltip = "Brightness Channel color value. Aka value or lightness."; tooltip = "Brightness Channel color value. Aka value or lightness.";
@ -668,7 +668,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18"; extent = "34 18";
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly"; profile = "ToolsGuiTextEditProfile";
altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); updateColorPickerAlpha( $ThisControl.getValue() );"; altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); updateColorPickerAlpha( $ThisControl.getValue() );";
internalName = "TextEdit"; internalName = "TextEdit";
}; };

2
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
View file

@ -108,7 +108,7 @@ function ESettingsWindow::toggleEditorSettings(%this)
ESettingsWindowList.sort(0); ESettingsWindowList.sort(0);
%this.mode = "Editor"; %this.mode = "Editor";
ESettingsWindow.text = ":: Editor Settings"; ESettingsWindow.text = ":: Editor Settings";
ESettingsWindowList.setSelectedById( 1 ); ESettingsWindowList.setSelectedById( 1 );
} }

2
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui
View file

@ -11,7 +11,7 @@ $guiContent = new GuiWindowCollapseCtrl() {
minSize = "50 50"; minSize = "50 50";
closeCommand = "$ThisControl.onClose();"; closeCommand = "$ThisControl.onClose();";
edgeSnap = "1"; edgeSnap = "1";
text = ":: Object Inspector"; text = ":: Object Inspector";
margin = "0 0 0 0"; margin = "0 0 0 0";
padding = "0 0 0 0"; padding = "0 0 0 0";
anchorTop = "1"; anchorTop = "1";

2
Templates/BaseGame/game/tools/gui/postFxEditor.gui
View file

@ -15,7 +15,7 @@ $guiContent = new GuiControl(postFXEditor) {
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
new GuiWindowCtrl(PostFXEditorWindow) { new GuiWindowCtrl(PostFXEditorWindow) {
text = ":: PostFX Editor - EditorTemplateLevel"; text = ":: PostFX Editor - EditorTemplateLevel";
resizeWidth = "1"; resizeWidth = "1";
resizeHeight = "1"; resizeHeight = "1";
canMove = "1"; canMove = "1";

21
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -37,7 +37,7 @@ $Gui::fontTypeMono = "Arial";
$GUI::fontSize[12] = 12; $GUI::fontSize[12] = 12;
$GUI::fontSize[14] = 14; $GUI::fontSize[14] = 14;
$GUI::fontSize[16] = 16; $GUI::fontSize[16] = 16;
$GUI::fontSize[18] = 18; $GUI::fontSize[18] = 17;
$GUI::fontSize[24] = 24; $GUI::fontSize[24] = 24;
$GUI::fontSize[36] = 36; $GUI::fontSize[36] = 36;
@ -195,8 +195,8 @@ new GuiControlProfile (ToolsGuiWindowProfile)
hasBitmapArray = true; hasBitmapArray = true;
justify = "left"; justify = "left";
category = "Tools"; category = "Tools";
fontType = $Gui::fontTypeMedium; fontType = $Gui::fontTypeBold;
fontSize = $GUI::fontSize[18]; fontSize = $GUI::fontSize[16];
}; };
if( !isObject( ToolsGuiPaneProfile ) ) if( !isObject( ToolsGuiPaneProfile ) )
@ -211,7 +211,7 @@ new GuiControlProfile (ToolsGuiPaneProfile)
borderColor = EditorSettings.value("Theme/windowBackgroundColor"); borderColor = EditorSettings.value("Theme/windowBackgroundColor");
category = "Tools"; category = "Tools";
fontType = $Gui::fontTypeMedium; fontType = $Gui::fontTypeMedium;
fontSize = $GUI::fontSize[18]; fontSize = $GUI::fontSize[16];
}; };
if( !isObject( ToolsGuiToolbarWindowProfile ) ) if( !isObject( ToolsGuiToolbarWindowProfile ) )
@ -943,6 +943,14 @@ singleton GuiControlProfile( GuiBackFillProfile )
category = "Editor"; category = "Editor";
}; };
singleton GuiControlProfile( GuiDarkFillProfile )
{
opaque = true;
fillColor = "25 25 25";
border = false;
category = "Editor";
};
singleton GuiControlProfile(GuiShaderEditorProfile : ToolsGuiDefaultProfile) singleton GuiControlProfile(GuiShaderEditorProfile : ToolsGuiDefaultProfile)
{ {
opaque = true; opaque = true;
@ -1561,6 +1569,11 @@ new GuiControlProfile(ToolsGuiConsoleLargeProfile : ToolsGuiConsoleProfile)
{ {
fontSize = $GUI::fontSize[16]; fontSize = $GUI::fontSize[16];
}; };
if(!isObject(ToolsGuiConsoleXLProfile))
new GuiControlProfile(ToolsGuiConsoleXLProfile : ToolsGuiConsoleProfile)
{
fontSize = $GUI::fontSize[18];
};
if(!isObject(ToolsGuiConsoleTextProfile)) if(!isObject(ToolsGuiConsoleTextProfile))
new GuiControlProfile(ToolsGuiConsoleTextProfile) new GuiControlProfile(ToolsGuiConsoleTextProfile)
{ {

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

@ -234,7 +234,36 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSave = "1"; canSave = "1";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
}; };
new GuiIconButtonCtrl() {
buttonMargin = "0 0";
bitmapAsset = "ToolsModule:console_n_image";
iconLocation = "Left";
sizeIconToButton = "0";
makeIconSquare = "0";
textLocation = "Center";
textMargin = "0";
autoSize = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "132 0";
extent = "32 32";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "windowConsoleDlg.showWindow();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Open the console log in a window.";
hovertime = "1000";
isContainer = "0";
internalName = "ABwindowConsoleButton";
canSave = "1";
canSaveDynamicFields = "0";
buttonMargin = "-2 0";
};
new GuiBitmapCtrl() { new GuiBitmapCtrl() {
Enabled = "1"; Enabled = "1";
Profile = "ToolsGuiDefaultProfile"; Profile = "ToolsGuiDefaultProfile";

2
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file

@ -44,7 +44,7 @@ $guiContent = new GuiControl() {
closeCommand = "MaterialEditorPreviewWindow.setVisible(false);"; closeCommand = "MaterialEditorPreviewWindow.setVisible(false);";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Material Editor - Preview"; text = ":: Material Editor - Preview";
/*new GuiContainer(MaterialEditorPreviewPane) { /*new GuiContainer(MaterialEditorPreviewPane) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -44,7 +44,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);"; closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Material Editor - Properties"; text = ":: Material Editor - Properties";
new GuiContainer(MaterialEditorGuiContent){ // Client group new GuiContainer(MaterialEditorGuiContent){ // Client group
isContainer = "1"; isContainer = "1";

13
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -284,8 +284,9 @@ function MaterialEditorGui::maxSize(%this, %window)
%fixedWindow = MaterialEditorPreviewWindow; %fixedWindow = MaterialEditorPreviewWindow;
%fluidWindow = MaterialEditorPropertiesWindow; %fluidWindow = MaterialEditorPropertiesWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------
@ -784,8 +785,8 @@ function MaterialEditorGui::isMatEditorMaterial(%this, %material)
function MaterialEditorGui::setMaterialNotDirty(%this) function MaterialEditorGui::setMaterialNotDirty(%this)
{ {
%propertyText = ":: Material Editor - Properties"; %propertyText = ":: Material Editor - Properties";
%previewText = ":: Material Editor - Preview"; %previewText = ":: Material Editor - Preview";
MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPropertiesWindow.text = %propertyText;
MaterialEditorPreviewWindow.text = %previewText; MaterialEditorPreviewWindow.text = %previewText;
@ -795,8 +796,8 @@ function MaterialEditorGui::setMaterialNotDirty(%this)
function MaterialEditorGui::setMaterialDirty(%this) function MaterialEditorGui::setMaterialDirty(%this)
{ {
%propertyText = ":: Material Editor - Properties *"; %propertyText = ":: Material Editor - Properties *";
%previewText = ":: Material Editor - Preview *"; %previewText = ":: Material Editor - Preview *";
MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPropertiesWindow.text = %propertyText;
MaterialEditorPreviewWindow.text = %previewText; MaterialEditorPreviewWindow.text = %previewText;

4
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui
View file

@ -71,7 +71,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Mesh Road Editor - Roads"; text = ":: Mesh Road Editor - Roads";
new GuiContainer(MeshRoadEditorRoadsPanel){ new GuiContainer(MeshRoadEditorRoadsPanel){
profile = "ToolsGuiDefaultProfile"; profile = "ToolsGuiDefaultProfile";
@ -267,7 +267,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Mesh Road Editor - Properties"; text = ":: Mesh Road Editor - Properties";
new GuiContainer(MeshRoadNodesPanel){ //Node Properties new GuiContainer(MeshRoadNodesPanel){ //Node Properties
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript
View file

@ -43,8 +43,9 @@ function MeshRoadEditorGui::maxSize(%this, %window)
%fixedWindow = MeshRoadEditorTreeWindow; %fixedWindow = MeshRoadEditorTreeWindow;
%fluidWindow = MeshRoadEditorOptionsWindow; %fluidWindow = MeshRoadEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

4
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui
View file

@ -67,7 +67,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup)
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Mission Area"; text = ":: Mission Area";
new GuiContainer(MissionAreaEditorTerrainPanel){ new GuiContainer(MissionAreaEditorTerrainPanel){
profile = "ToolsGuiDefaultProfile"; profile = "ToolsGuiDefaultProfile";
@ -234,7 +234,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup)
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Mission Area Editor - Properties"; text = ":: Mission Area Editor - Properties";
new GuiContainer(MissionAreaEditorPropertiesPanel){ //Mission Area Properties new GuiContainer(MissionAreaEditorPropertiesPanel){ //Mission Area Properties
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript
View file

@ -54,8 +54,9 @@ function MissionAreaEditorGui::maxSize(%this, %window)
%fixedWindow = MissionAreaEditorTerrainWindow; %fixedWindow = MissionAreaEditorTerrainWindow;
%fluidWindow = MissionAreaEditorPropertiesWindow; %fluidWindow = MissionAreaEditorPropertiesWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

4
Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui
View file

@ -66,7 +66,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Navigation Editor"; text = ":: Navigation Editor";
new GuiButtonCtrl() { new GuiButtonCtrl() {
Profile = "ToolsGuiButtonProfile"; Profile = "ToolsGuiButtonProfile";
@ -271,7 +271,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Navigation Editor - Properties"; text = ":: Navigation Editor - Properties";
new GuiContainer(NavEditorOptionsPanel){ //Actions new GuiContainer(NavEditorOptionsPanel){ //Actions
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/navEditor/navEditor.tscript
View file

@ -69,8 +69,9 @@ function NavEditorGui::maxSize(%this, %window)
%fixedWindow = NavEditorTreeWindow; %fixedWindow = NavEditorTreeWindow;
%fluidWindow = NavEditorOptionsWindow; %fluidWindow = NavEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

2
Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -50,7 +50,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
minSize = "50 50"; minSize = "50 50";
closeCommand = ""; closeCommand = "";
EdgeSnap = "0"; EdgeSnap = "0";
text = ":: Particle Editor"; text = ":: Particle Editor";
new GuiTabBookCtrl(PE_TabBook) { new GuiTabBookCtrl(PE_TabBook) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

9
Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript
View file

@ -160,7 +160,7 @@ function ParticleEditor::createParticleList( %this )
function ParticleEditor::openEmitterPane( %this ) function ParticleEditor::openEmitterPane( %this )
{ {
PE_Window.text = ":: Particle Editor - Emitters"; PE_Window.text = ":: Particle Editor - Emitters";
PE_EmitterEditor.guiSync(); PE_EmitterEditor.guiSync();
ParticleEditor.activeEditor = PE_EmitterEditor; ParticleEditor.activeEditor = PE_EmitterEditor;
@ -172,7 +172,7 @@ function ParticleEditor::openEmitterPane( %this )
function ParticleEditor::openParticlePane( %this ) function ParticleEditor::openParticlePane( %this )
{ {
PE_Window.text = ":: Particle Editor - Particles"; PE_Window.text = ":: Particle Editor - Particles";
PE_ParticleEditor.guiSync(); PE_ParticleEditor.guiSync();
ParticleEditor.activeEditor = PE_ParticleEditor; ParticleEditor.activeEditor = PE_ParticleEditor;
@ -276,8 +276,9 @@ function ParticleEditor::maxSize(%this, %window)
// prevent onResize after a resize // prevent onResize after a resize
%this.resizing = false; %this.resizing = false;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

4
Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui
View file

@ -71,7 +71,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: River Editor - Rivers"; text = ":: River Editor - Rivers";
/* /*
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -316,7 +316,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: River Editor - Properties"; text = ":: River Editor - Properties";
new GuiContainer(RiverEditorOptionsPanel){ //Node Properties new GuiContainer(RiverEditorOptionsPanel){ //Node Properties
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript
View file

@ -60,8 +60,9 @@ function RiverEditorGui::maxSize(%this, %window)
%fixedWindow = RiverEditorTreeWindow; %fixedWindow = RiverEditorTreeWindow;
%fluidWindow = RiverEditorOptionsWindow; %fluidWindow = RiverEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

4
Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui
View file

@ -73,7 +73,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Decal Road Editor - Roads & Paths"; text = ":: Decal Road Editor - Roads & Paths";
/* /*
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -317,7 +317,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Decal Road Editor - Properties"; text = ":: Decal Road Editor - Properties";
new GuiContainer(RoadEditorProperties){ //Node Properties new GuiContainer(RoadEditorProperties){ //Node Properties
isContainer = "1"; isContainer = "1";

5
Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript
View file

@ -73,8 +73,9 @@ function RoadEditorGui::maxSize(%this, %window)
%fixedWindow = RoadEditorTreeWindow; %fixedWindow = RoadEditorTreeWindow;
%fluidWindow = RoadEditorOptionsWindow; %fluidWindow = RoadEditorOptionsWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = -1; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------

6
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui
View file

@ -1,16 +1,16 @@
// Let's check if the ShapeEdAdvancedWindow can be stacked in the side panel // Let's check if the ShapeEdAdvancedWindow can be stacked in the side panel
if (getWord($pref::Video::mode, 1) > 899 && isObject(ShapeEdSelectWindow) && isObject(ShapeEdPropWindow)) if (getWord($pref::Video::mode, 1) > 899 && isObject(ShapeEdSelectWindow) && isObject(ShapeEdPropWindow))
{ {
$ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 360 SPC getWord(ShapeEdSelectWindow.extent, 1) + getWord(ShapeEdPropWindow.extent, 1) + getWord(EditorGuiToolbar.extent, 1) + 12; $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 360 SPC getWord(ShapeEdSelectWindow.extent, 1) + getWord(ShapeEdPropWindow.extent, 1) + getWord(EditorGuiToolbar.extent, 1) + 12 - 7;
} }
else else
{ {
$ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 720 SPC getWord(EditorGuiToolbar.extent, 1) + 6; $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 720 SPC getWord(EditorGuiToolbar.extent, 1) + 6 - 7;
} }
//--- OBJECT WRITE BEGIN --- //--- OBJECT WRITE BEGIN ---
$guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) { $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) {
text = ":: Shape Editor - Advanced Properties"; text = ":: Shape Editor - Advanced Properties";
resizeWidth = "0"; resizeWidth = "0";
resizeHeight = "0"; resizeHeight = "0";
canMove = "1"; canMove = "1";

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

@ -27,7 +27,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Shape Editor - Properties"; text = ":: Shape Editor - Properties";
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// Sequence and Node editors // Sequence and Node editors

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

@ -43,7 +43,7 @@ $guiContent = new GuiControl() {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Shape Editor - Select"; text = ":: Shape Editor - Select";
new GuiTabBookCtrl(ShapeEditorTabbook) { new GuiTabBookCtrl(ShapeEditorTabbook) {
internalName = "tabBook"; internalName = "tabBook";

86
Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui
View file

@ -15,7 +15,7 @@ $guiContent = new GuiControl(windowConsoleDlg) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
new GuiWindowCtrl(windowConsoleControl) { new GuiWindowCtrl(windowConsoleControl) {
text = ":: Console Log"; text = ":: Console Log";
resizeWidth = "1"; resizeWidth = "1";
resizeHeight = "1"; resizeHeight = "1";
canMove = "1"; canMove = "1";
@ -304,90 +304,6 @@ $guiContent = new GuiControl(windowConsoleDlg) {
canSave = "0"; canSave = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
}; };
new GuiButtonCtrl(windowConsole_Tab1) {
text = "Tab1 Text 1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "5 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(windowConsole_Tab2) {
text = "Tab1 Text 2";
buttonType = "PushButton";
useMouseEvents = "0";
position = "105 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(windowConsole_Tab3) {
text = "Tab Text 3";
buttonType = "PushButton";
useMouseEvents = "0";
position = "205 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(windowConsole_Tab4) {
text = "Tab Text 3";
buttonType = "PushButton";
useMouseEvents = "0";
position = "305 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(windowConsole_UnDockBtn) { new GuiBitmapButtonCtrl(windowConsole_UnDockBtn) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = ""; internalName = "";

58
Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript
View file

@ -102,46 +102,24 @@ function windowConsoleDlg::hideWindow(%this)
function windowConsoleDlg::showWindow(%this) function windowConsoleDlg::showWindow(%this)
{ {
$WindowConsole::Open = true; if($WindowConsole::Open)
Canvas.pushDialog(%this);
%this-->Scroll.setVisible(true);
// Add a tab to the asset browser
if($AssetBrowser::Open)
{ {
%text = "Asset Browser"; // close the window when it's already opened
%command = "AssetBrowser.putToFront();"; windowConsoleDlg.hideWindow();
}
AssetBrowserWindow.text = ""; else
windowConsoleControl.text = ""; {
// open the console window
windowConsoleControl.setTab(windowConsole_Tab1, "Console Log", ""); $WindowConsole::Open = true;
windowConsole_Tab1.setHidden(false); Canvas.pushDialog(%this);
windowConsole_Tab1.setActive(false); %this-->Scroll.setVisible(true);
// update all the windows (position and size)
if(windowConsole_Tab2.text $= %text || windowConsole_Tab3.text $= %text || windowConsole_Tab4.text $= %text) EditorGui.updateSideBar();
{
// we have a tab, don't do anything
}
else if(windowConsole_Tab2.hidden == true)
{
windowConsoleControl.setTab(windowConsole_Tab2, %text, %command);
}
else if(windowConsole_Tab3.hidden == true)
{
windowConsoleControl.setTab(windowConsole_Tab3, %text, %command);
}
else if(windowConsole_Tab4.hidden == true)
{
windowConsoleControl.setTab(windowConsole_Tab4, %text, %command);
}
else
{
warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()");
}
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
function windowConsoleControl::setTab(%this, %tab, %text, %command) function windowConsoleControl::setTab(%this, %tab, %text, %command)
@ -274,6 +252,10 @@ function windowConsoleDlg::incFont()
{ {
switch ($Con::font) switch ($Con::font)
{ {
case 16:
windowConsoleMessageLogView.setProfile(ToolsGuiConsoleXLProfile);
$Con::font = 18;
windowConsoleMessageLogView.refresh();
case 14: case 14:
windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile); windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile);
$Con::font = 16; $Con::font = 16;
@ -297,6 +279,10 @@ function windowConsoleDlg::decFont()
windowConsoleMessageLogView.setProfile(ToolsGuiConsoleMediumProfile); windowConsoleMessageLogView.setProfile(ToolsGuiConsoleMediumProfile);
$Con::font = 14; $Con::font = 14;
windowConsoleMessageLogView.refresh(); windowConsoleMessageLogView.refresh();
case 18:
windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile);
$Con::font = 16;
windowConsoleMessageLogView.refresh();
} }
} }

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

@ -19,6 +19,19 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
AnchorLeft = "1"; AnchorLeft = "1";
AnchorRight = "0"; AnchorRight = "0";
new GuiDecoyCtrl(EditorGuiMainTabBookBG) {
profile = "GuiDarkFillProfile";
horizSizing = "width";
vertSizing = "bottom";
position = "0 5";
extent = "800 24";
minExtent = "8 8";
visible = "1";
helpTag = "0";
useMouseEvents = "0";
isDecoy = "1";
};
new GuiTabBookCtrl(EditorGuiMainTabBook) { new GuiTabBookCtrl(EditorGuiMainTabBook) {
tabHeight = "20"; tabHeight = "20";
selectedPage = "0"; selectedPage = "0";
@ -261,7 +274,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
HorizSizing = "width"; HorizSizing = "width";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "0 0"; Position = "0 0";
Extent = "800 37"; Extent = "800 40";
MinExtent = "8 8"; MinExtent = "8 8";
Margin = "0 0 0 0"; Margin = "0 0 0 0";
Padding = "0 0 0 0"; Padding = "0 0 0 0";

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui
View file

@ -23,7 +23,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
canMaximize = "0"; canMaximize = "0";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Editor Settings"; text = ":: Editor Settings";
closeCommand = "ESettingsWindow.hideDialog();"; closeCommand = "ESettingsWindow.hideDialog();";
Margin = "0 0 0 0"; Margin = "0 0 0 0";
Padding = "0 0 0 0"; Padding = "0 0 0 0";

2
Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui
View file

@ -29,7 +29,7 @@ $guiContent = new GuiControl(ManageBookmarksContainer, EditorGuiGroup) {
position = "50 90"; position = "50 90";
extent = "180 306"; extent = "180 306";
MinExtent = "120 130"; MinExtent = "120 130";
text = ":: Camera Bookmark Manager"; text = ":: Camera Bookmark Manager";
closeCommand = "EManageBookmarks.hideDialog();"; closeCommand = "EManageBookmarks.hideDialog();";
EdgeSnap = "0"; EdgeSnap = "0";
canCollapse = "0"; canCollapse = "0";

2
Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui
View file

@ -27,7 +27,7 @@ $guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EManageSFXParameters.setVisible( false );"; closeCommand = "EManageSFXParameters.setVisible( false );";
EdgeSnap = "0"; EdgeSnap = "0";
text = ":: Audio Parameters"; text = ":: Audio Parameters";
Margin = "5 5 5 5"; Margin = "5 5 5 5";
Padding = "5 5 5 5"; Padding = "5 5 5 5";
AnchorTop = "1"; AnchorTop = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui
View file

@ -30,7 +30,7 @@ $guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) {
position = "400 31"; position = "400 31";
extent =" 175 267"; extent =" 175 267";
MinExtent = "175 130"; MinExtent = "175 130";
text = ":: Snap Options"; text = ":: Snap Options";
closeCommand = "ESnapOptions.hideDialog();"; closeCommand = "ESnapOptions.hideDialog();";
EdgeSnap = "0"; EdgeSnap = "0";
canCollapse = "0"; canCollapse = "0";

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

@ -47,7 +47,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) {
minSize = "300 160"; minSize = "300 160";
closeCommand = "EPainter.parentGroup.setVisible(false);"; closeCommand = "EPainter.parentGroup.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Terrain Painter - Preview"; text = ":: Terrain Painter - Preview";
new GuiContainer(EPainterPreviewCont){ new GuiContainer(EPainterPreviewCont){
Docking = "Client"; Docking = "Client";
@ -293,7 +293,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) {
minSize = "152 300"; minSize = "152 300";
closeCommand = "EPainter.parentGroup.setVisible(false);"; closeCommand = "EPainter.parentGroup.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: Terrain Painter - Selector"; text = ":: Terrain Painter - Selector";
new GuiScrollCtrl( EPainterScroll ) { new GuiScrollCtrl( EPainterScroll ) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

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

@ -9,13 +9,26 @@ $guiContent = new GuiContainer(EWToolsToolbar) {
VertSizing = "bottom"; VertSizing = "bottom";
Position = "0 38"; Position = "0 38";
Extent = "0 33"; Extent = "0 33";
MinExtent = "8 2"; MinExtent = "8 34";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
isClosed = "0"; isClosed = "0";
isDynamic = "0"; isDynamic = "0";
new GuiDecoyCtrl(EWToolsToolbarSpacer) {
profile = "ToolsMenubarProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "0 3";
extent = "4 33";
minExtent = "8 8";
visible = "1";
helpTag = "0";
useMouseEvents = "0";
isDecoy = "1";
};
new GuiDynamicCtrlArrayControl(ToolsToolbarArray) { new GuiDynamicCtrlArrayControl(ToolsToolbarArray) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
Enabled = "1"; Enabled = "1";
@ -24,15 +37,15 @@ $guiContent = new GuiContainer(EWToolsToolbar) {
HorizSizing = "width"; HorizSizing = "width";
VertSizing = "bottom"; VertSizing = "bottom";
position = "4 3"; position = "4 3";
Extent = "264 32"; Extent = "264 33";
MinExtent = "1024 32"; MinExtent = "1024 33";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
colCount = "1"; colCount = "1";
colSize = "29"; colSize = "29";
RowSize = "27"; RowSize = "27";
rowSpacing = "2"; rowSpacing = "1";
colSpacing = "4"; colSpacing = "4";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -61,7 +74,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) {
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
position = "1 1"; position = "1 1";
extent = "35 31"; extent = "35 33";
minExtent = "8 8"; minExtent = "8 8";
visible = "0"; visible = "0";
helpTag = "0"; helpTag = "0";

2
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui
View file

@ -44,7 +44,7 @@ $guiContent = new GuiControl() {
closeCommand = "EWInspectorWindow.setVisible(false);"; closeCommand = "EWInspectorWindow.setVisible(false);";
minSize = "50 50"; minSize = "50 50";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: World Editor - Inspector"; text = ":: World Editor - Inspector";
new GuiContainer(EWInspectorContainer) { new GuiContainer(EWInspectorContainer) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

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

@ -44,7 +44,7 @@ $guiContent = new GuiControl() {
minSize = "50 50"; minSize = "50 50";
closeCommand = "EWTreeWindow.setVisible(false);"; closeCommand = "EWTreeWindow.setVisible(false);";
EdgeSnap = "1"; EdgeSnap = "1";
text = ":: World Edior - Scene Tree"; text = ":: World Editor - Scene Tree";
new GuiTabBookCtrl(EditorTreeTabBook) { new GuiTabBookCtrl(EditorTreeTabBook) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

2
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui
View file

@ -46,7 +46,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) {
minSize = "4 4"; minSize = "4 4";
closeCommand = "Canvas.popDialog( TerrainImportGui );"; closeCommand = "Canvas.popDialog( TerrainImportGui );";
EdgeSnap = "0"; EdgeSnap = "0";
text = ":: Import Terrain Height Map"; text = ":: Import Terrain Height Map";
new GuiTextEditCtrl() { new GuiTextEditCtrl() {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

2
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
View file

@ -7,7 +7,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
new GuiWindowCtrl() { new GuiWindowCtrl() {
text = ":: Terrain Materials Editor"; text = ":: Terrain Materials Editor";
resizeWidth = "0"; resizeWidth = "0";
canMinimize = "0"; canMinimize = "0";
canMaximize = "0"; canMaximize = "0";

32
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -628,6 +628,7 @@ function EditorGui::updateSideBar(%this)
{ {
if(GuiEditorIsActive()) if(GuiEditorIsActive())
{ {
// Update the Asset Browser's size
if(isObject(AssetBrowserWindow) && isObject(GuiEditorSidebar)) if(isObject(AssetBrowserWindow) && isObject(GuiEditorSidebar))
{ {
if(AssetBrowserWindow.docked == true) if(AssetBrowserWindow.docked == true)
@ -639,6 +640,19 @@ function EditorGui::updateSideBar(%this)
AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight);
} }
} }
// Update the Windowed Console's size
if(isObject(windowConsoleControl) && isObject(GuiEditorSidebar))
{
if(windowConsoleControl.docked == true)
{
// The width is relative to the sidepanel
%consoleWidth = Canvas.extent.x - GuiEditorSidebar.extent.x;
%consoleHeight = windowConsoleControl.extent.y;
%consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33;
windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight);
}
}
return; return;
} }
@ -1019,6 +1033,10 @@ function WorldEditorPlugin::onActivated( %this )
ETransformSelection.setVisible(true); ETransformSelection.setVisible(true);
} }
EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
ESnapOptions-->GridSnapButton.setStateOn( EWorldEditor.UseGridSnap );
SnapToBar-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
Parent::onActivated(%this); Parent::onActivated(%this);
} }
@ -1616,9 +1634,10 @@ function EWorldEditor::maxSize(%this, %window)
%fixedWindow = EWTreeWindow; %fixedWindow = EWTreeWindow;
%fluidWindow = EWInspectorWindow; %fluidWindow = EWInspectorWindow;
%top = EditorGuiToolbar.extent.y + 6; %offset = 25; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%maxHeight = Canvas.extent.y - %top - %bottom; %bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom + 12;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------
// put it back if it moved // put it back if it moved
@ -2495,7 +2514,8 @@ function EWorldEditor::syncGui( %this )
ESnapOptions-->SnapSize.setText( EWorldEditor.getSoftSnapSize() ); ESnapOptions-->SnapSize.setText( EWorldEditor.getSoftSnapSize() );
ESnapOptions-->GridSize.setText( EWorldEditor.getGridSize() ); ESnapOptions-->GridSize.setText( EWorldEditor.getGridSize() );
ESnapOptions-->GridSnapButton.setStateOn( %this.getGridSnap() ); %this.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
ESnapOptions-->GridSnapButton.setStateOn( %this.UseGridSnap );
%this.UseGroupCenter = EditorSettings.value("WorldEditor/Tools/UseGroupCenter"); %this.UseGroupCenter = EditorSettings.value("WorldEditor/Tools/UseGroupCenter");
@ -2840,7 +2860,9 @@ function toggleSnappingOptions( %var )
} }
else if( %var $= "grid" ) else if( %var $= "grid" )
{ {
EWorldEditor.setGridSnap( !EWorldEditor.getGridSnap() ); EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap;
EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap );
EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
} }
else if( %var $= "byGroup" ) else if( %var $= "byGroup" )
{ {

7
Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript
View file

@ -596,8 +596,9 @@ function TerrainPainterContainer::maxSize(%this, %window)
%fixedWindow = EPainterPreview; %fixedWindow = EPainterPreview;
%fluidWindow = EPainter; %fluidWindow = EPainter;
%top = EditorGuiToolbar.extent.y + 6; %offset = 23; // tweak the vertical offset so that it aligns neatly
%bottom = %top + 65 - 6; %top = EditorGuiToolbar.extent.y + %offset;
%bottom = %top + 59;
%maxHeight = Canvas.extent.y - %top - %bottom; %maxHeight = Canvas.extent.y - %top - %bottom;
// --- Fixed window (top) ------------------------------------------------ // --- Fixed window (top) ------------------------------------------------
@ -635,7 +636,7 @@ function TerrainPainterContainer::maxSize(%this, %window)
// --- Windowed Console -------------------------------------------------- // --- Windowed Console --------------------------------------------------
if(isObject(windowConsoleControl)) if(isObject(windowConsoleControl))
{ {
// Only resize the AssetBrowser if it's docked // Only resize the console if it's docked
if(windowConsoleControl.docked == true) if(windowConsoleControl.docked == true)
{ {
// The width is relative to the sidepanel // The width is relative to the sidepanel

37
Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript
View file

@ -1,31 +1,9 @@
singleton GFXStateBlockData( Viz_DefaultVisualizeState ) singleton GFXStateBlockData( Viz_DefaultVisualizeState )
{ {
/*alphaDefined = true; blendDefined = false;
alphaTestEnable = true; blendEnable = false;
alphaTestRef = 1;
alphaTestFunc = GFXCmpGreaterEqual;
// Do a one to one blend.
blendDefined = true;
blendEnable = true;
blendSrc = GFXBlendOne; blendSrc = GFXBlendOne;
blendDest = GFXBlendOne; blendDest = GFXBlendZero;
zDefined = true;
zEnable = false;
zWriteEnable = false;
samplersDefined = true;
samplerStates[0] = SamplerClampPoint;
samplerStates[1] = SamplerClampPoint;
samplerStates[2] = SamplerClampPoint;
samplerStates[3] = SamplerClampPoint;
samplerStates[4] = SamplerClampLinear;
samplerStates[5] = SamplerClampLinear;*/
blendDefined = true;
blendEnable = true;
blendSrc = GFXBlendSrcAlpha;
blendDest = GFXBlendInvSrcAlpha;
zDefined = true; zDefined = true;
zEnable = false; zEnable = false;
@ -36,7 +14,6 @@ singleton GFXStateBlockData( Viz_DefaultVisualizeState )
samplerStates[1] = SamplerClampPoint; samplerStates[1] = SamplerClampPoint;
samplerStates[2] = SamplerClampPoint; samplerStates[2] = SamplerClampPoint;
samplerStates[3] = SamplerClampLinear; // depthviz samplerStates[3] = SamplerClampLinear; // depthviz
samplerStates[4] = SamplerClampLinear; // depthviz
}; };
singleton shaderData( Viz_TexelDensity ) singleton shaderData( Viz_TexelDensity )
@ -92,7 +69,6 @@ singleton shaderData( Viz_SurfaceProperties )
samplerNames[2] = "$matInfoBuffer"; samplerNames[2] = "$matInfoBuffer";
samplerNames[3] = "$ssaoMaskTex"; samplerNames[3] = "$ssaoMaskTex";
samplerNames[4] = "$backbufferTex"; samplerNames[4] = "$backbufferTex";
samplerNames[5] = "$glowBuffer";
pixVersion = 2.0; pixVersion = 2.0;
}; };
@ -106,7 +82,6 @@ singleton PostEffect( Viz_SurfacePropertiesPFX )
texture[2] = "#matinfo"; texture[2] = "#matinfo";
texture[3] = "#ssaoMask"; texture[3] = "#ssaoMask";
texture[4] = "$backBuffer"; texture[4] = "$backBuffer";
texture[5] = "#glowbuffer";
target = "$backBuffer"; target = "$backBuffer";
renderPriority = 9999; renderPriority = 9999;
@ -186,8 +161,6 @@ function toggleSurfacePropertiesViz( %mode )
$Viz_SurfacePropertiesModeVar = "12"; $Viz_SurfacePropertiesModeVar = "12";
case "Backbuffer": case "Backbuffer":
$Viz_SurfacePropertiesModeVar = "13"; $Viz_SurfacePropertiesModeVar = "13";
case "Glow":
$Viz_SurfacePropertiesModeVar = "14";
default: default:
$Viz_SurfacePropertiesModeVar = "-1"; $Viz_SurfacePropertiesModeVar = "-1";
} }
@ -269,8 +242,8 @@ singleton PostEffect( Viz_ColorBlindnessPFX )
{ {
isEnabled = false; isEnabled = false;
allowReflectPass = false; allowReflectPass = false;
renderTime = "PFXAfterBin"; renderTime = "PFXBeforeBin";
renderBin = "GlowBin"; renderBin = "EditorBin";
shader = Viz_ColorBlindness; shader = Viz_ColorBlindness;
stateBlock = PFX_DefaultStateBlock; stateBlock = PFX_DefaultStateBlock;

3
Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.glsl
View file

@ -32,7 +32,6 @@ uniform sampler2D colorBuffer;
uniform sampler2D matInfoBuffer; uniform sampler2D matInfoBuffer;
uniform sampler2D ssaoMaskTex; uniform sampler2D ssaoMaskTex;
uniform sampler2D backbufferTex; uniform sampler2D backbufferTex;
uniform sampler2D glowBuffer;
uniform float mode; uniform float mode;
uniform vec3 eyePosWorld; uniform vec3 eyePosWorld;
@ -78,6 +77,4 @@ void main()
OUT_col = vec4(texture( ssaoMaskTex, IN_uv0 ).rgb, 1.0); OUT_col = vec4(texture( ssaoMaskTex, IN_uv0 ).rgb, 1.0);
else if(mode == 13) else if(mode == 13)
OUT_col = vec4(texture( backbufferTex, IN_uv0 ).rgb, 1.0); OUT_col = vec4(texture( backbufferTex, IN_uv0 ).rgb, 1.0);
else if(mode == 14)
OUT_col = vec4(texture( glowBuffer, IN_uv0 ).rgb, 1.0);
} }

3
Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl
View file

@ -30,7 +30,6 @@ TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 1);
TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 2); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 2);
TORQUE_UNIFORM_SAMPLER2D(ssaoMaskTex, 3); TORQUE_UNIFORM_SAMPLER2D(ssaoMaskTex, 3);
TORQUE_UNIFORM_SAMPLER2D(backbufferTex, 4); TORQUE_UNIFORM_SAMPLER2D(backbufferTex, 4);
TORQUE_UNIFORM_SAMPLER2D(glowBuffer, 5);
uniform float mode; uniform float mode;
uniform float4x4 cameraToWorld; uniform float4x4 cameraToWorld;
@ -76,8 +75,6 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0
float4(TORQUE_TEX2D( ssaoMaskTex, IN.uv0 ).rgb, 1.0); float4(TORQUE_TEX2D( ssaoMaskTex, IN.uv0 ).rgb, 1.0);
else if(mode == 13) else if(mode == 13)
float4(TORQUE_TEX2D( backbufferTex, IN.uv0 ).rgb, 1.0); float4(TORQUE_TEX2D( backbufferTex, IN.uv0 ).rgb, 1.0);
else if(mode == 14)
float4(TORQUE_TEX2D( glowBuffer, IN.uv0 ).rgb, 1.0);
return float4(0,0,0,1); return float4(0,0,0,1);
} }

3
Tools/CMake/modules/tools.cmake
View file

@ -16,3 +16,6 @@ if(TORQUE_TOOLS)
source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/environment/editors/" PREFIX "Modules/TOOLS/environment" FILES ${TORQUE_TOOLS_SOURCES2}) source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/environment/editors/" PREFIX "Modules/TOOLS/environment" FILES ${TORQUE_TOOLS_SOURCES2})
source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/forest/editor/" PREFIX "Modules/TOOLS/forest" FILES ${TORQUE_TOOLS_SOURCES3}) source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/forest/editor/" PREFIX "Modules/TOOLS/forest" FILES ${TORQUE_TOOLS_SOURCES3})
endif(TORQUE_TOOLS) endif(TORQUE_TOOLS)
if(TORQUE_TOOLS_EXT_COMMANDS)
set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TOOLS_EXT_COMMANDS)
endif(TORQUE_TOOLS_EXT_COMMANDS)

1
Tools/CMake/torque_configs.cmake
View file

@ -71,6 +71,7 @@ advanced_option(TORQUE_DEBUG_NET "debug network" OFF)
advanced_option(TORQUE_DEBUG_NET_MOVES "debug network moves" OFF) advanced_option(TORQUE_DEBUG_NET_MOVES "debug network moves" OFF)
advanced_option(TORQUE_ENABLE_ASSERTS "enables or disable asserts" OFF) advanced_option(TORQUE_ENABLE_ASSERTS "enables or disable asserts" OFF)
advanced_option(TORQUE_TOOLS "Enable or disable the tools" ON) advanced_option(TORQUE_TOOLS "Enable or disable the tools" ON)
advanced_option(TORQUE_TOOLS_EXT_COMMANDS "Enable or disable some extended functionality like shell commands or free write access" OFF)
advanced_option(TORQUE_ENABLE_PROFILER "Enable or disable the profiler" OFF) advanced_option(TORQUE_ENABLE_PROFILER "Enable or disable the profiler" OFF)
advanced_option(TORQUE_SHOW_LEGACY_FILE_FIELDS "If on, shows legacy direct file path fields in the inspector." OFF) advanced_option(TORQUE_SHOW_LEGACY_FILE_FIELDS "If on, shows legacy direct file path fields in the inspector." OFF)