mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 06:34:36 +00:00
Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909
This commit is contained in:
commit
dec9f54a9b
322 changed files with 10473 additions and 10241 deletions
|
|
@ -0,0 +1,485 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
$guiContent = new GuiContainer(NewEditorGui) {
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1920 1080";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
enabled = "1";
|
||||
|
||||
new GuiSplitContainer(NewEditorGuiLayout) {
|
||||
orientation = "Vertical";
|
||||
splitterSize = "2";
|
||||
splitPoint = "1661 100";
|
||||
fixedPanel = "None";
|
||||
useMinExtent="0";
|
||||
fixedSize = "260";
|
||||
docking = "None";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1921 1081";
|
||||
minExtent = "64 64";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiPanel() {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1659 1081";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "Panel1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiSplitContainer(Editor_ToolsMainSplit) {
|
||||
orientation = "Vertical";
|
||||
splitterSize = "2";
|
||||
splitPoint = "230 100";
|
||||
fixedPanel = "None";
|
||||
useMinExtent="0";
|
||||
fixedSize = "1429";
|
||||
docking = "None";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1659 1081";
|
||||
minExtent = "64 64";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiPanel(Editor_ToolSidebarPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "228 1081";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "Panel1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiWindowCtrl(Editor_ToolsSidebarWindow) {
|
||||
text = "Tool Settings";
|
||||
resizeWidth = "0";
|
||||
resizeHeight = "0";
|
||||
canMove = "0";
|
||||
canClose = "0";
|
||||
canMinimize = "0";
|
||||
canMaximize = "0";
|
||||
canCollapse = "0";
|
||||
edgeSnap = "1";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "228 1081";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiWindowProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
new GuiPanel(Editor_MainWindowPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "232 0";
|
||||
extent = "1427 1081";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "panel2";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiSplitContainer(Editor_MainViewSplit) {
|
||||
orientation = "Horizontal";
|
||||
splitterSize = "2";
|
||||
splitPoint = "182 745";
|
||||
fixedPanel = "None";
|
||||
useMinExtent="0";
|
||||
fixedSize = "273";
|
||||
docking = "None";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1427 1081";
|
||||
minExtent = "64 64";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiPanel(Editor_MainViewPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1427 743";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "Panel1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiTabBookCtrl(Editor_MainViewTabBook) {
|
||||
tabPosition = "Top";
|
||||
tabMargin = "7";
|
||||
minTabWidth = "64";
|
||||
tabHeight = "20";
|
||||
allowReorder = "0";
|
||||
defaultPage = "-1";
|
||||
selectedPage = "-1";
|
||||
frontTabPadding = "0";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "1427 743";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "ToolsGuiTabBookProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(Editor_InspectorSidebarButton) {
|
||||
bitmap = "tools/gui/images/iconAdd.png";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "-1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "1411 61";
|
||||
extent = "15 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "left";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(Editor_ToolsSidebarButton) {
|
||||
bitmap = "tools/gui/images/iconAdd.png";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "-1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "0 61";
|
||||
extent = "15 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(Editor_AssetBrowserButton) {
|
||||
bitmap = "tools/gui/images/iconAdd.png";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "-1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "1411 725";
|
||||
extent = "15 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "left";
|
||||
vertSizing = "top";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(Editor_VisibilityOptionsButton) {
|
||||
bitmap = "tools/gui/images/visible";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "-1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "16 30";
|
||||
extent = "18 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
new GuiPanel(Editor_AssetBrowserPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 747";
|
||||
extent = "1427 334";
|
||||
minExtent = "16 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "panel2";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
new GuiPanel(Editor_InspectorPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "1663 0";
|
||||
extent = "258 1081";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "panel2";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiSplitContainer() {
|
||||
orientation = "Horizontal";
|
||||
splitterSize = "2";
|
||||
splitPoint = "182 556";
|
||||
fixedPanel = "None";
|
||||
useMinExtent="0";
|
||||
fixedSize = "100";
|
||||
docking = "None";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "258 1081";
|
||||
minExtent = "64 64";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiPanel(Editor_SceneTreePanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 0";
|
||||
extent = "258 554";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "Panel1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiPanel(Editor_PropertiesPanel) {
|
||||
docking = "Client";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 558";
|
||||
extent = "258 523";
|
||||
minExtent = "0 0";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "panel2";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
// Copyright (C) - Violent Tulip
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
%paletteId = new GuiControl(VPathEditorPalette) {
|
||||
$paletteId = new GuiControl(VPathEditorPalette) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// Copyright (C) - Violent Tulip
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
%guiContent = new GuiControl(VPathEditorToolbar)
|
||||
$guiContent = new GuiControl(VPathEditorToolbar)
|
||||
{
|
||||
canSaveDynamicFields = "0";
|
||||
internalName = "VPathEditorToolbar";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(VerveEditorGui) {
|
||||
$guiContent = new GuiControl(VerveEditorGui) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
|
||||
$guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
|
||||
isContainer = "1";
|
||||
Profile = "GuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
|
||||
$guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
|
||||
isContainer = "1";
|
||||
Profile = "GuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(VerveEditorPreferenceGui) {
|
||||
$guiContent = new GuiControl(VerveEditorPreferenceGui) {
|
||||
canSaveDynamicFields = "0";
|
||||
isContainer = "1";
|
||||
Profile = "GuiDefaultProfile";
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ function VControllerPropertyList::InspectObject( %this, %object )
|
|||
}
|
||||
|
||||
%dataFieldCount = %object.getDataFieldCount();
|
||||
%dataFieldList = "";
|
||||
for ( %i = 0; %i < %dataFieldCount; %i++ )
|
||||
{
|
||||
// Add To List.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ function VDirectorGroup::PopulateBuildStack( %this, %stack )
|
|||
|
||||
function VDirectorGroup::ResolveBuildStack( %this, %stack )
|
||||
{
|
||||
Parent::ResolveBuildStack( %this, %stack, %groupObject );
|
||||
Parent::ResolveBuildStack( %this, %stack );
|
||||
|
||||
// Find the Track Toggle.
|
||||
%directorTrackCheckBox = %stack.findObjectByInternalName( "DirectorTrackToggle", true );
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack )
|
|||
|
||||
function VSceneObjectGroup::ResolveBuildStack( %this, %stack )
|
||||
{
|
||||
Parent::ResolveBuildStack( %this, %stack, %groupObject );
|
||||
Parent::ResolveBuildStack( %this, %stack );
|
||||
|
||||
// Fetch the Controller.
|
||||
%controller = %this.getRoot();
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack )
|
|||
|
||||
function VSceneObjectGroup::ResolveBuildStack( %this, %stack )
|
||||
{
|
||||
VGroup::ResolveBuildStack( %this, %stack, %groupObject );
|
||||
VGroup::ResolveBuildStack( %this, %stack );
|
||||
|
||||
// Fetch the Controller.
|
||||
%controller = %this.getRoot();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_AddModule) {
|
||||
$guiContent = new GuiControl(AssetBrowser_AddModule) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_AddPackage) {
|
||||
$guiContent = new GuiControl(AssetBrowser_AddPackage) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser) {
|
||||
$guiContent = new GuiControl(AssetBrowser) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetImportCtrl) {
|
||||
$guiContent = new GuiControl(AssetImportCtrl) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetImportConfigEditor) {
|
||||
$guiContent = new GuiControl(AssetImportConfigEditor) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowserImportLog) {
|
||||
$guiContent = new GuiControl(AssetBrowserImportLog) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
|
||||
$guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,270 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
$guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
|
||||
new GuiControl() {
|
||||
position = "0 0";
|
||||
extent = "100 124";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "ShapeAssetPreviewButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiObjectView() {
|
||||
shapeFile = "data/Blockout_Basics/Walls/DoorWall2x2.fbx";
|
||||
mountedNode = "mount0";
|
||||
lightColor = "1 1 1 1";
|
||||
lightAmbient = "0.5 0.5 0.5 1";
|
||||
lightDirection = "0 0.707 -0.707";
|
||||
orbitDiststance = "5";
|
||||
minOrbitDiststance = "141.715";
|
||||
maxOrbitDiststance = "5";
|
||||
cameraSpeed = "0.01";
|
||||
cameraRotation = "0 0 0";
|
||||
cameraZRot = "0";
|
||||
forceFOV = "0";
|
||||
reflectPriority = "0";
|
||||
renderStyle = "standard";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "7 4";
|
||||
extent = "80 80";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "shapeAssetView";
|
||||
class = "AssetPreviewControl";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiBitmapButtonCtrl() {
|
||||
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "0";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "0 0";
|
||||
extent = "80 80";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
internalName="AssetPreviewBorderButton";
|
||||
};
|
||||
};
|
||||
new GuiButtonCtrl() {
|
||||
groupNum = "0";
|
||||
buttonType = "RadioButton";
|
||||
useMouseEvents = "1";
|
||||
position = "0 0";
|
||||
extent = "100 104";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiThumbHighlightButtonProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
command = "AssetBrowser.updateSelection( $ThisControl.getParent().assetName, $ThisControl.getParent().moduleName );";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
tooltip = "\n20540";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Button";
|
||||
class = "AssetPreviewButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextEditCtrl() {
|
||||
historySize = "0";
|
||||
tabComplete = "0";
|
||||
sinkAllKeyEvents = "0";
|
||||
password = "0";
|
||||
passwordMask = "*";
|
||||
text = "DoorWall2x2";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 84";
|
||||
extent = "100 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiTextEditProfile";
|
||||
visible = "1";
|
||||
active = "0";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "AssetNameLabel";
|
||||
class = "AssetNameField";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
new GuiControl() {
|
||||
position = "102 0";
|
||||
extent = "100 124";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "GeneralAssetPreviewButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiBitmapButtonCtrl() {
|
||||
bitmap = "Data/Blockout_Basics/Walls/WallGrid2x2_Albedo.png";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "0";
|
||||
masked = "0";
|
||||
groupNum = "-1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "10 4";
|
||||
extent = "80 80";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "assetPreviewImage";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiBitmapButtonCtrl() {
|
||||
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
|
||||
bitmapMode = "Stretched";
|
||||
autoFitExtents = "0";
|
||||
useModifiers = "0";
|
||||
useStates = "1";
|
||||
masked = "0";
|
||||
groupNum = "0";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "0 0";
|
||||
extent = "80 80";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
internalName="AssetPreviewBorderButton";
|
||||
};
|
||||
};
|
||||
new GuiButtonCtrl() {
|
||||
groupNum = "0";
|
||||
buttonType = "RadioButton";
|
||||
useMouseEvents = "1";
|
||||
position = "0 0";
|
||||
extent = "100 104";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiThumbHighlightButtonProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
command = "AssetBrowser.updateSelection( $ThisControl.getParent().assetName, $ThisControl.getParent().moduleName );";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
tooltip = "\n20550";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Button";
|
||||
class = "AssetPreviewButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextEditCtrl() {
|
||||
historySize = "0";
|
||||
tabComplete = "0";
|
||||
sinkAllKeyEvents = "0";
|
||||
password = "0";
|
||||
passwordMask = "*";
|
||||
text = "WallGrid2x2";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "0 84";
|
||||
extent = "100 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiTextEditProfile";
|
||||
visible = "1";
|
||||
active = "0";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
internalName = "AssetNameLabel";
|
||||
class = "AssetNameField";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
|
||||
$guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_editAsset) {
|
||||
$guiContent = new GuiControl(AssetBrowser_editAsset) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_editModule) {
|
||||
$guiContent = new GuiControl(AssetBrowser_editModule) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(GameObjectCreator) {
|
||||
$guiContent = new GuiControl(GameObjectCreator) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(LooseFileAudit) {
|
||||
$guiContent = new GuiControl(LooseFileAudit) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_newAsset) {
|
||||
$guiContent = new GuiControl(AssetBrowser_newAsset) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
|
||||
$guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_newFolder) {
|
||||
$guiContent = new GuiControl(AssetBrowser_newFolder) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_SelectModule) {
|
||||
$guiContent = new GuiControl(AssetBrowser_SelectModule) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssetBrowser_SelectPackage) {
|
||||
$guiContent = new GuiControl(AssetBrowser_SelectPackage) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(SelectAssetPath) {
|
||||
$guiContent = new GuiControl(SelectAssetPath) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -263,6 +263,8 @@ function AssetBrowser::selectAsset( %this, %asset )
|
|||
//eval("materialEd_previewMaterial." @ %propertyField @ " = " @ %value @ ";");
|
||||
if( AssetBrowser.returnType $= "name" )
|
||||
{
|
||||
// TODO!
|
||||
%name = "";
|
||||
eval( "" @ AssetBrowser.selectCallback @ "(" @ %name @ ");");
|
||||
}
|
||||
else
|
||||
|
|
@ -689,6 +691,7 @@ function AssetBrowser::loadDirectories( %this )
|
|||
//Remove any modules that have no assets if we have that filter on
|
||||
if(%this.onlyShowModulesWithAssets)
|
||||
{
|
||||
%modulesList = ModuleDatabase.findModules();
|
||||
for(%i=0; %i < getWordCount(%modulesList); %i++)
|
||||
{
|
||||
%moduleName = getWord(%modulesList, %i).ModuleId;
|
||||
|
|
@ -943,6 +946,13 @@ function AssetBrowser::toggleTagFilterPopup(%this)
|
|||
//now, add the asset's category
|
||||
%assetType = AssetDatabase.getAssetCategory(%assetId);
|
||||
|
||||
// TODO?
|
||||
%text = "";
|
||||
%var = "";
|
||||
%cmd = "";
|
||||
%textLength = strlen(%text);
|
||||
// end todo
|
||||
|
||||
%checkBox = new GuiCheckBoxCtrl()
|
||||
{
|
||||
canSaveDynamicFields = "0";
|
||||
|
|
@ -1003,6 +1013,9 @@ function AssetBrowser::reImportAsset(%this)
|
|||
//if(%assetType $= "ImageAsset")
|
||||
// %filters = "";
|
||||
|
||||
//TODO
|
||||
%currentFile = "";
|
||||
|
||||
%dlg = new OpenFileDialog()
|
||||
{
|
||||
Filters = "(All Files (*.*)|*.*|";
|
||||
|
|
@ -1047,7 +1060,7 @@ function AssetBrowserPreviewButton::onRightClick(%this)
|
|||
EditAssetPopup.enableItem(7, true);
|
||||
|
||||
//Is it an editable type?
|
||||
if(%assetType $= "ImageAsset" /*|| %assetType $= "GameObjectAsset"*/ || %assetType $= "CppAsset" || %assetType $= "SoundAsset")
|
||||
if(%assetType $= "ImageAsset" /*|| %assetType $= "GameObjectAsset"*/ || %assetType $= "CppAsset")
|
||||
{
|
||||
EditAssetPopup.enableItem(0, false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,6 +277,9 @@ function AssetBrowser::onDropFolder(%this, %filePath)
|
|||
//First, we wanna scan to see if we have modules to contend with. If we do, we'll just plunk them in wholesale
|
||||
//and not process their contents.
|
||||
|
||||
// TODO
|
||||
%fileExt = "";
|
||||
|
||||
//If not modules, it's likely an art pack or other mixed files, so we'll import them as normal
|
||||
if( (%fileExt $= ".png") || (%fileExt $= ".jpg") || (%fileExt $= ".bmp") || (%fileExt $= ".dds") )
|
||||
%this.importAssetListArray.add("ImageAsset", %filePath);
|
||||
|
|
|
|||
|
|
@ -142,6 +142,7 @@ function ImportAssetOptionsWindow::editImportSettings(%this, %assetItem)
|
|||
%filePath = %assetItem.filePath;
|
||||
%assetName = %assetItem.assetName;
|
||||
%assetConfigObj = %assetItem.importConfig;
|
||||
%optionsObj = %assetItem.optionsObj; // TODO IS THIS RIGHT
|
||||
|
||||
ImportOptionsList.startGroup("Asset");
|
||||
ImportOptionsList.addField("AssetName", "Asset Name", "string", "", "NewAsset", "", %assetItem);
|
||||
|
|
@ -405,6 +406,7 @@ function ImportAssetConfigEditorWindow::editConfig(%this)
|
|||
|
||||
function ImportAssetConfigEditorWindow::deleteConfig(%this)
|
||||
{
|
||||
%configList = ImportAssetConfigSettingsList;
|
||||
for(%i=0; %i < %configList.count(); %i++)
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ function AssetBrowser::renameComponentAsset(%this, %assetDef, %newAssetId, %orig
|
|||
%line = %file.readLine();
|
||||
%line = trim( %line );
|
||||
|
||||
%editedFileContents = %editedFileContents @ strreplace(%line, %originalAssetName, %newName) @ "\n";
|
||||
%editedFileContents = %editedFileContents @ strreplace(%line, %originalName, %newName) @ "\n";
|
||||
}
|
||||
|
||||
%file.close();
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ function AssetBrowser::createCpp(%this)
|
|||
|
||||
TamlWrite(%asset, %tamlpath);*/
|
||||
|
||||
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
|
||||
|
||||
%moduleDef = ModuleDatabase.findModule(%moduleName, 1);
|
||||
AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath);
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ function AssetBrowser::buildLevelAssetPreview(%this, %assetDef, %previewData)
|
|||
%previewData.assetPath = %assetDef.getLevelPath();
|
||||
%previewData.doubleClickCommand = "schedule( 1, 0, \"EditorOpenMission\", "@%assetDef@");";
|
||||
|
||||
%levelPreviewImage = %assetDesc.PreviewImage;
|
||||
%levelPreviewImage = %assetDef.PreviewImage;
|
||||
|
||||
if(isFile(%levelPreviewImage))
|
||||
%previewData.previewImage = %levelPreviewImage;
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@ function AssetBrowser::importScriptAsset(%this, %assetId)
|
|||
|
||||
function AssetBrowser::onScriptAssetEditorDropped(%this, %assetDef, %position)
|
||||
{
|
||||
if(!isObject(%dropTarget))
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
//Renames the asset
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ function AssetBrowser::editShapeAsset(%this, %assetDef)
|
|||
ShapeEditorPlugin.openShapeAsset(%assetDef);
|
||||
}
|
||||
|
||||
function AssetBrowser::onShapeAssetChanged(%this, %assetDef)
|
||||
{
|
||||
}
|
||||
|
||||
function AssetBrowser::deleteShapeAsset(%this, %assetDef)
|
||||
{
|
||||
|
||||
|
|
@ -340,7 +344,7 @@ function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position)
|
|||
|
||||
%newStatic = new TSStatic()
|
||||
{
|
||||
position = %pos;
|
||||
position = %position;
|
||||
shapeAsset = %assetId;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,36 @@
|
|||
function AssetBrowser::editSoundAsset(%this, %assetDef)
|
||||
{
|
||||
if (isObject($PreviewSoundSource))
|
||||
sfxStop($PreviewSoundSource);
|
||||
$PreviewSoundSource = %assetDef.playSound();
|
||||
}
|
||||
|
||||
function AssetBrowser::onSoundAssetChanged(%this, %assetDef)
|
||||
{
|
||||
if (isObject($PreviewSoundSource))
|
||||
sfxStop($PreviewSoundSource);
|
||||
}
|
||||
|
||||
function AssetBrowser::buildSoundAssetPreview(%this, %assetDef, %previewData)
|
||||
{
|
||||
%previewData.assetName = %assetDef.assetName;
|
||||
%previewData.assetPath = %assetDef.soundFilePath;
|
||||
//%previewData.doubleClickCommand = "EditorOpenFileInTorsion( "@%previewData.assetPath@", 0 );";
|
||||
|
||||
if(%this.selectMode)
|
||||
{
|
||||
%previewData.doubleClickCommand = "AssetBrowser.selectAsset( AssetBrowser.selectedAsset );";
|
||||
}
|
||||
else
|
||||
{
|
||||
if(EditorSettings.value("Assets/Browser/doubleClickAction", "Edit Asset") $= "Edit Asset")
|
||||
{
|
||||
%previewData.doubleClickCommand = "AssetBrowser.editAsset( "@%assetDef@" );";
|
||||
}
|
||||
else
|
||||
{
|
||||
%previewData.doubleClickCommand = "AssetBrowser.onSoundAssetEditorDropped( "@%assetDef@" );";
|
||||
}
|
||||
}
|
||||
|
||||
%previewData.previewImage = "ToolsModule:soundIcon_image";
|
||||
|
||||
|
|
@ -38,7 +61,7 @@ function AssetBrowser::onSoundAssetEditorDropped(%this, %assetDef, %position)
|
|||
%newSFXEmitter = new SFXEmitter()
|
||||
{
|
||||
position = %pos;
|
||||
fileName = %assetDef.getSoundPath();
|
||||
soundAsset = %assetDef.getAssetId();
|
||||
pitch = %assetDef.pitchAdjust;
|
||||
volume = %assetDef.volumeAdjust;
|
||||
};
|
||||
|
|
@ -50,4 +73,28 @@ function AssetBrowser::onSoundAssetEditorDropped(%this, %assetDef, %position)
|
|||
|
||||
EWorldEditor.isDirty = true;
|
||||
|
||||
}
|
||||
|
||||
function GuiInspectorTypeShapeAssetPtr::onControlDropped( %this, %payload, %position )
|
||||
{
|
||||
Canvas.popDialog(EditorDragAndDropLayer);
|
||||
|
||||
// Make sure this is a color swatch drag operation.
|
||||
if( !%payload.parentGroup.isInNamespaceHierarchy( "AssetPreviewControlType_AssetDrop" ) )
|
||||
return;
|
||||
|
||||
%assetType = %payload.assetType;
|
||||
|
||||
if(%assetType $= "SoundAsset")
|
||||
{
|
||||
%module = %payload.moduleName;
|
||||
%asset = %payload.assetName;
|
||||
|
||||
%targetComponent = %this.targetObject;
|
||||
%targetComponent.soundAsset = %module @ ":" @ %asset;
|
||||
|
||||
//Inspector.refresh();
|
||||
}
|
||||
|
||||
EWorldEditor.isDirty = true;
|
||||
}
|
||||
|
|
@ -86,6 +86,9 @@ function AssetBrowser::editStateMachineAsset(%this, %assetDef)
|
|||
|
||||
function AssetBrowser::duplicateStateMachineAsset(%this, %assetDef)
|
||||
{
|
||||
// TODO:
|
||||
%targetModule = "";
|
||||
|
||||
//Check if we have a target module, if not we need to select one
|
||||
if(%targetModule $= "")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ function directoryHandler::copyFolder(%this, %fromFolder, %toFolder)
|
|||
if(!%success)
|
||||
error("copyProjectFolder() - failed to copy file: " @ %file);
|
||||
|
||||
%file = findNextFileMultiExpr( %fullPath @ "/*.*" );
|
||||
%file = findNextFileMultiExpr( %fromFolder @ "/*.*" );
|
||||
}
|
||||
|
||||
//do sub directories
|
||||
|
|
|
|||
|
|
@ -3,7 +3,14 @@ function AssetBrowser_editAsset::saveAsset(%this)
|
|||
%file = AssetDatabase.getAssetFilePath(%this.editedAssetId);
|
||||
%success = TamlWrite(AssetBrowser_editAsset.editedAsset, %file);
|
||||
|
||||
AssetBrowser.loadFilters();
|
||||
AssetBrowser.reloadAsset(%this.editedAssetId);
|
||||
|
||||
AssetBrowser.refresh();
|
||||
|
||||
%assetType = AssetDatabase.getAssetType(%this.editedAssetId);
|
||||
%assetDef = AssetDatabase.acquireAsset(%this.editedAssetId);
|
||||
AssetBrowser.call("on" @ %assetType @ "Changed", %assetDef);
|
||||
AssetDatabase.releaseAsset(%this.editedAssetId);
|
||||
|
||||
Canvas.popDialog(AssetBrowser_editAsset);
|
||||
}
|
||||
|
|
@ -79,6 +86,17 @@ function AssetBrowser::editAssetInfo(%this)
|
|||
}
|
||||
|
||||
//------------------------------------------------------------
|
||||
function AssetBrowser::reloadAsset(%this, %assetId)
|
||||
{
|
||||
%moduleName = getToken(%assetId, ":", 0);
|
||||
%moduleDef = ModuleDatabase.findModule(%moduleName);
|
||||
|
||||
%assetName = getToken(%assetId, ":", 1);
|
||||
%assetFilePath = AssetDatabase.getAssetFilePath(%assetId);
|
||||
|
||||
AssetDatabase.removeDeclaredAsset(%assetId);
|
||||
AssetDatabase.addDeclaredAsset(%moduleDef, %assetFilePath);
|
||||
}
|
||||
|
||||
function AssetBrowser::refreshAsset(%this, %assetId)
|
||||
{
|
||||
|
|
@ -143,6 +161,10 @@ function AssetBrowser::performRenameAsset(%this, %originalAssetName, %newName)
|
|||
//Update the selection to immediately jump to the new asset
|
||||
AssetBrowser-->filterTree.clearSelection();
|
||||
%ModuleItem = AssetBrowser-->filterTree.findItemByName(%moduleName);
|
||||
|
||||
// TODO is this correct?
|
||||
%assetType = %ModuleItem.getClassName();
|
||||
|
||||
%assetTypeId = AssetBrowser-->filterTree.findChildItemByName(%ModuleItem, %assetType);
|
||||
|
||||
AssetBrowser-->filterTree.selectItem(%assetTypeId);
|
||||
|
|
@ -236,9 +258,9 @@ function moveAssetFile(%assetDef, %destinationPath)
|
|||
%assetPath = makeFullPath(AssetDatabase.getAssetFilePath(%assetDef.getAssetId()));
|
||||
%assetFilename = fileName(%assetPath);
|
||||
|
||||
%newAssetPath = %destination @ "/" @ %assetFilename;
|
||||
%newAssetPath = %destinationPath @ "/" @ %assetFilename;
|
||||
|
||||
%copiedSuccess = pathCopy(%assetPath, %destination @ "/" @ %assetFilename);
|
||||
%copiedSuccess = pathCopy(%assetPath, %destinationPath @ "/" @ %assetFilename);
|
||||
|
||||
if(!%copiedSuccess)
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(@@)
|
||||
$guiContent = new GuiControl(@@)
|
||||
{
|
||||
position = "0 0";
|
||||
extent = "100 100";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ singleton Material(TerrainFX_@)
|
|||
impactSoundId = "0";
|
||||
};
|
||||
|
||||
new TerrainMaterial(@)
|
||||
singleton TerrainMaterial(@)
|
||||
{
|
||||
internalName = "@";
|
||||
diffuseMap = "";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(TypeMaskFieldGui) {
|
||||
$guiContent = new GuiControl(TypeMaskFieldGui) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%guiContent = new GuiControl(SuperTooltipDlg) {
|
||||
$guiContent = new GuiControl(SuperTooltipDlg) {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "GuiTransparentProfileModeless";
|
||||
class = "SuperTooltip";
|
||||
|
|
|
|||
|
|
@ -9,6 +9,13 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
if(%currentMaterial $= "" || %currentMaterial == 0)
|
||||
%currentMaterial = %fieldDefaultVal;
|
||||
|
||||
// TODO?
|
||||
%matName = "";
|
||||
%component = "";
|
||||
%material = "";
|
||||
%accessor = "";
|
||||
%precision = "";
|
||||
|
||||
%container = new GuiControl() {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "EditorContainerProfile";
|
||||
|
|
@ -20,7 +27,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";// %tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
};
|
||||
|
||||
|
|
@ -35,7 +42,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; //%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
text = %fieldName;
|
||||
maxLength = "1024";
|
||||
|
|
@ -57,7 +64,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
text = %currentMaterial;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
%previewButton = new GuiBitmapButtonCtrl(){
|
||||
internalName = %matName;
|
||||
HorizSizing = "right";
|
||||
|
|
@ -121,7 +128,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; //%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
text = "Mapped to:" SPC %material.mapTo;
|
||||
maxLength = "1024";
|
||||
|
|
@ -140,7 +147,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";// %tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
maxLength = "1024";
|
||||
historySize = "0";
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ function stateMachineFieldList::onSelect(%this)
|
|||
%index = %this.getParent().fieldID;
|
||||
|
||||
%oldValue = %this.behavior.stateMachine.getValue(%index);
|
||||
%this.behavior.stateMachine.setValue(%fieldType SPC %oldValue.y);
|
||||
%this.behavior.stateMachine.setValue(%this.fieldType SPC %oldValue.y);
|
||||
|
||||
%this.getParent().add(%fieldCtrl);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";//%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
};
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";//%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
text = %fieldName;
|
||||
maxLength = "1024";
|
||||
|
|
|
|||
|
|
@ -159,6 +159,9 @@ function QuickEditComponentList::onHotTrackItem( %this, %itemID )
|
|||
{
|
||||
%name = getField(%componentObj.getComponentField(%i), 0);
|
||||
|
||||
// TODO:
|
||||
%description = "";
|
||||
|
||||
SuperTooltipDlg.addParam(%name, %description @ "\n");
|
||||
}
|
||||
%position = %this.getGlobalPosition();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
|
||||
$guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContnt = new GuiControl(ConvexEditorOptions)
|
||||
$guiContnt = new GuiControl(ConvexEditorOptions)
|
||||
{
|
||||
position = "0 0";
|
||||
extent = "800 600";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
|
||||
canSaveDynamicFields = "0";
|
||||
internalName = "";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl() {
|
||||
$guiContent = new GuiControl() {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl() {
|
||||
$guiContent = new GuiControl() {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ function ActionCreateDatablock::redo( %this )
|
|||
%this.editor.selectDatablock( %db );
|
||||
%this.editor.flagInspectorAsDirty( true );
|
||||
|
||||
UnlistedDatablocks.remove( %id );
|
||||
UnlistedDatablocks.remove( %db );
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------
|
||||
|
|
@ -99,7 +99,7 @@ function ActionCreateDatablock::undo( %this )
|
|||
%this.dbName = %db.name;
|
||||
%db.name = "";
|
||||
|
||||
UnlistedDatablocks.add( %this.db );
|
||||
UnlistedDatablocks.add( %db );
|
||||
}
|
||||
|
||||
//=============================================================================================
|
||||
|
|
@ -155,5 +155,5 @@ function ActionDeleteDatablock::undo( %this )
|
|||
|
||||
// Remove from unlisted.
|
||||
|
||||
UnlistedDatablocks.remove( %id );
|
||||
UnlistedDatablocks.remove( %db );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
|
||||
profile = "ToolsGuiWindowProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ function DbgRemoveBreakPoint(%file, %line)
|
|||
function DbgDeleteSelectedBreak()
|
||||
{
|
||||
%selectedBreak = DebuggerBreakPoints.getSelectedId();
|
||||
%rowNum = DebuggerBreakPoints.getRowNumById(%selectedWatch);
|
||||
%rowNum = DebuggerBreakPoints.getRowNumById(%selectedBreak);
|
||||
if (%rowNum >= 0) {
|
||||
%breakText = DebuggerBreakPoints.getRowText(%rowNum);
|
||||
%breakLine = getField(%breakText, 0);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
|
||||
$guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
@ -472,8 +472,6 @@
|
|||
Margin = "0 0 0 -3";
|
||||
DragSizable = false;
|
||||
container = true;
|
||||
parentRollout = %this.rollout;
|
||||
object = %behavior;
|
||||
|
||||
new GuiStackControl() {
|
||||
StackingType = "Vertical";
|
||||
|
|
@ -552,8 +550,6 @@
|
|||
Margin = "0 0 0 0";
|
||||
DragSizable = false;
|
||||
container = true;
|
||||
parentRollout = %this.rollout;
|
||||
object = %behavior;
|
||||
|
||||
new GuiStackControl() {
|
||||
StackingType = "Vertical";
|
||||
|
|
@ -716,8 +712,6 @@
|
|||
Margin = "0 0 0 -3";
|
||||
DragSizable = false;
|
||||
container = true;
|
||||
parentRollout = %this.rollout;
|
||||
object = %behavior;
|
||||
|
||||
new GuiStackControl() {
|
||||
StackingType = "Vertical";
|
||||
|
|
@ -796,8 +790,6 @@
|
|||
Margin = "0 0 0 0";
|
||||
DragSizable = false;
|
||||
container = true;
|
||||
parentRollout = %this.rollout;
|
||||
object = %behavior;
|
||||
|
||||
new GuiInspector(DecalInspector) {
|
||||
StackingType = "Vertical";
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
//--- OBJECT WRITE BEGIN ---
|
||||
%forestBrushesGroup = new SimGroup( ForestBrushGroup )
|
||||
$forestBrushesGroup = new SimGroup( ForestBrushGroup )
|
||||
{
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
|
||||
$guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) {
|
||||
renderMissionArea = "0";
|
||||
missionAreaFillColor = "255 0 0 20";
|
||||
missionAreaFrameColor = "255 0 0 128";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "width";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
|
||||
isContainer = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "width";
|
||||
|
|
@ -1754,8 +1754,8 @@ function convertColladaModels(%pattern)
|
|||
|
||||
function showImportDialog(%shapePath, %cmd)
|
||||
{
|
||||
%this.path = %shapePath;
|
||||
%this.cmd = %cmd;
|
||||
ColladaImportDlg.path = %shapePath;
|
||||
ColladaImportDlg.cmd = %cmd;
|
||||
|
||||
if ( fileExt(%shapePath) $= ".dts" || fileExt(%shapePath) $= ".dsq"
|
||||
|| fileExt(%shapePath) $= ".dae" || fileExt(%shapePath) $= ".kmz" )
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
|
||||
$guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
|
||||
displayMode = "Dropper"; // this makes the background visible
|
||||
actionOnMove = "1";
|
||||
position = "0 0";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%guiContent = new GuiControl(CubemapEditor) {
|
||||
$guiContent = new GuiControl(CubemapEditor) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ function GuiInspectorVariableGroup::buildOptionsSettingField(%this, %fieldName,
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";//%tooltip;
|
||||
text = %fieldDefaultVal;
|
||||
hovertime = "1000";
|
||||
ownerObject = %ownerObj;
|
||||
|
|
@ -520,6 +520,7 @@ function ESettingsWindow::getAssetEditingSettings(%this)
|
|||
SettingsInspector.addSettingsField("Assets/New/alwaysPromptModuleTarget", "Always Prompt Target Module", "bool", "If off, use the default module");
|
||||
SettingsInspector.endGroup();
|
||||
|
||||
%formattedConfigList = "";
|
||||
for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++)
|
||||
{
|
||||
%configName = ImportAssetWindow.importConfigsList.getKey(%i);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function GuiInspectorVariableGroup::buildAssetDependenciesField(%this, %fieldNam
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";// %tooltip;
|
||||
text = %fieldDefaultVal;
|
||||
hovertime = "1000";
|
||||
ownerObject = %ownerObj;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function GuiInspectorVariableGroup::buildButtonField(%this, %fieldName, %fieldLa
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
tooltip = %tooltip;
|
||||
tooltip = "";// %tooltip;
|
||||
text = %fieldName;
|
||||
hovertime = "1000";
|
||||
command = %fieldDataVals;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; ///%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
};
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
|
|||
canSave = "0";
|
||||
Visible = "1";
|
||||
hovertime = "100";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; //%tooltip;
|
||||
tooltipProfile = "EditorToolTipProfile";
|
||||
text = %fieldLabel;
|
||||
maxLength = "1024";
|
||||
|
|
@ -66,7 +66,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; //%tooltip;
|
||||
text = %fieldDefaultVal;
|
||||
hovertime = "1000";
|
||||
ownerObject = %ownerObj;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ function GuiInspectorVariableGroup::buildRangeField(%this, %fieldName, %fieldLab
|
|||
Visible = "1";
|
||||
Command = "$thisControl.onDragComplete();";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
tooltip = %tooltip;
|
||||
tooltip = ""; //%tooltip;
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
ownerObject = %ownerObj;
|
||||
|
|
|
|||
|
|
@ -255,8 +255,7 @@ function FileDialogOkButton::onClick( %this )
|
|||
|
||||
// Callback
|
||||
eval( %this.parent.SuccessCallback @ "(\"" @ %fullPath @"\");" );
|
||||
|
||||
%parent.SuccessCallback = 0;
|
||||
%this.parent.SuccessCallback = 0;
|
||||
|
||||
//error("Ok");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiWindowCollapseCtrl() {
|
||||
$guiContent = new GuiWindowCollapseCtrl() {
|
||||
collapseGroup = "-1";
|
||||
collapseGroupNum = "-1";
|
||||
resizeWidth = "1";
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ function inspectObject( %object )
|
|||
// Create a new object inspector window.
|
||||
exec( "./guiObjectInspector.ed.gui" );
|
||||
|
||||
if( !isObject( %guiContent) )
|
||||
if( !isObject( $guiContent) )
|
||||
{
|
||||
error( "InspectObject: failed to create GUI from 'guiObjectInspector.ed.gui'" );
|
||||
return;
|
||||
|
|
@ -45,9 +45,9 @@ function inspectObject( %object )
|
|||
|
||||
// Initialize the inspector.
|
||||
|
||||
%guiContent.init( %object );
|
||||
$guiContent.init( %object );
|
||||
|
||||
Canvas.getContent().add( %guiContent );
|
||||
Canvas.getContent().add( $guiContent );
|
||||
}
|
||||
|
||||
//=============================================================================================
|
||||
|
|
|
|||
|
|
@ -778,6 +778,8 @@ function MaterialSelector::buildStaticFilters( %this )
|
|||
// if you want to add any more containers to staticFilterObjects, here's
|
||||
// where to do it
|
||||
|
||||
%filterArray = MaterialSelector-->filterArray;
|
||||
|
||||
%staticFilterContainer = new GuiControl (){
|
||||
new GuiContainer(){
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
|
|
@ -1366,7 +1368,7 @@ function MaterialSelector::loadMaterialFilters( %this )
|
|||
// create category and update current material if there is one
|
||||
function MaterialSelector::createFilter( %this, %filter )
|
||||
{
|
||||
if( %filter $= %existingFilters )
|
||||
if( %filter $= "" )
|
||||
{
|
||||
toolsMessageBoxOK( "Error", "Can not create blank filter.");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(IODropdownDlg) {
|
||||
$guiContent = new GuiControl(IODropdownDlg) {
|
||||
profile = "GuiDefaultProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxOKDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxOKDlg) {
|
||||
profile = "GuiOverlayProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
|
||||
profile = "GuiOverlayProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "GuiOverlayProfile";
|
||||
HorizSizing = "width";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
|
||||
profile = "GuiOverlayProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "GuiOverlayProfile";
|
||||
HorizSizing = "width";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(MessagePopupDlg) {
|
||||
$guiContent = new GuiControl(MessagePopupDlg) {
|
||||
profile = "GuiDefaultProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(postFXEditor) {
|
||||
$guiContent = new GuiControl(postFXEditor) {
|
||||
position = "0 0";
|
||||
extent = "1920 1200";
|
||||
minExtent = "8 8";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(ProfilerGraphGui) {
|
||||
$guiContent = new GuiControl(ProfilerGraphGui) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(RenderTargetVisualizer) {
|
||||
$guiContent = new GuiControl(RenderTargetVisualizer) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "width";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
|
||||
position = "0 0";
|
||||
extent = "1024 768";
|
||||
minExtent = "8 2";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiControl(simViewDlg, EditorGuiGroup) {
|
||||
$guiContent = new GuiControl(simViewDlg, EditorGuiGroup) {
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
%guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) {
|
||||
$guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) {
|
||||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue