Catch the template files up and add the improved convex editor bits.

This commit is contained in:
Areloch 2019-05-19 21:30:45 -05:00
parent 3697737498
commit ebb51bb178
18 changed files with 1617 additions and 333 deletions

View file

@ -99,7 +99,7 @@ function togglePanelLayout()
}
EditorTree.open($scenesRootGroup,true);
Editor_PropertiesPanel.add(EWInspectorWindow);
EWInspectorWindow.resize(0,0, Editor_PropertiesPanel.extent.x, Editor_PropertiesPanel.extent.y);
EWInspectorWindow.horizSizing = "width";

View file

@ -22,6 +22,19 @@
function ConvexEditorGui::onWake( %this )
{
convexEditorToolbar-->gridSnapSizeEdit.setText(%this.getGridSnapSize());
if(ConvexEditorOptionssWindow-->matPreviewBtn.bitmap $= "")
{
//no active material, so set one
ConvexEditorOptionssWindow-->matPreviewBtn.setText("");
%mat = EditorSettings.Value("ConvexEditor/MaterialName");
ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]);
ConvexEditorOptionssWindow.activeMaterial = %mat;
}
}
function ConvexEditorGui::onSleep( %this )
@ -45,18 +58,159 @@ function ConvexEditorGui::onSelectionChanged( %this, %shape, %face )
ConvexEditorDeleteFaceBtn.setActive( false );
ConvexEditorDeleteFaceBtn.ToolTip = "Delete selection [Disabled] (Delete)";
if ( !isObject( %shape ) )
if ( !isObject( %shape ) )
{
ConvexEditorOptionssWindow-->defMatPreviewBtn.setText("No Brush Selected");
ConvexEditorOptionssWindow.activeShape = "";
return;
}
ConvexEditorDeleteFaceBtn.setActive( true );
ConvexEditorOptionssWindow-->defMatPreviewBtn.setText("");
ConvexEditorOptionssWindow-->defMatPreviewBtn.setBitmap(%shape.material.diffuseMap[0]);
ConvexEditorOptionssWindow.activeShape = %shape;
if ( %face == -1 )
{
ConvexEditorDeleteFaceBtn.ToolTip = "Delete selected ConvexShape (Delete)";
ConvexEditorOptionssWindow-->UOffset.setText("");
ConvexEditorOptionssWindow-->VOffset.setText("");
ConvexEditorOptionssWindow-->UScale.setText("");
ConvexEditorOptionssWindow-->VScale.setText("");
ConvexEditorOptionssWindow-->ZRotation.setText("");
}
else
{
ConvexEditorDeleteFaceBtn.ToolTip = "Delete selected Face (Delete)";
ConvexEditorSplitFaceBtn.ToolTip = "Split selected face" NL "Use Ctrl + Rotate instead for more control";
ConvexEditorSplitFaceBtn.setActive( true );
%UVOffset = %this.getSelectedFaceUVOffset();
ConvexEditorOptionssWindow-->UOffset.setText(%UVOffset.x);
ConvexEditorOptionssWindow-->VOffset.setText(%UVOffset.y);
%UVScale = %this.getSelectedFaceUVScale();
ConvexEditorOptionssWindow-->UScale.setText(%UVScale.x);
ConvexEditorOptionssWindow-->VScale.setText(%UVScale.y);
ConvexEditorOptionssWindow-->ZRotation.setText(ConvexEditorGui.getSelectedFaceZRot());
}
}
function ConvexEditorUVFld::onReturn(%this)
{
EWorldEditor.isDirty = true;
%offset = "0 0";
%offset.x = ConvexEditorOptionssWindow-->UOffset.getText();
%offset.y = ConvexEditorOptionssWindow-->VOffset.getText();
%scale = "0 0";
%scale.x = ConvexEditorOptionssWindow-->UScale.getText();
%scale.y = ConvexEditorOptionssWindow-->VScale.getText();
%rot = ConvexEditorOptionssWindow-->ZRotation.getText();
ConvexEditorGui.setSelectedFaceUVOffset(%offset);
ConvexEditorGui.setSelectedFaceUVScale(%scale);
ConvexEditorGui.setSelectedFaceZRot(%rot);
}
function ConvexEditorUVHorzFlipBtn::onClick(%this)
{
EWorldEditor.isDirty = true;
%current = ConvexEditorGui.getSelectedFaceHorzFlip();
ConvexEditorGui.setSelectedFaceHorzFlip(!%current);
}
function ConvexEditorUVVertFlipBtn::onClick(%this)
{
EWorldEditor.isDirty = true;
%current = ConvexEditorGui.getSelectedFaceVertFlip();
ConvexEditorGui.setSelectedFaceVertFlip(!%current);
}
function ConvexEditorMaterialBtn::onClick(%this)
{
%this.getMaterialName();
}
function ConvexEditorMaterialBtn::getMaterialName(%this)
{
materialSelector.showDialog(%this @ ".gotMaterialName", "name");
}
function ConvexEditorMaterialBtn::gotMaterialName(%this, %name)
{
//eval(%this.object @ "." @ %this.targetField @ " = " @ %name @ ";");
//%this.object.changeMaterial(getTrailingNumber(%this.targetField), %name);
//%this.object.inspectorApply();
%diffusemap = %name.diffuseMap[0];
ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%diffusemap);
ConvexEditorOptionssWindow.activeMaterial = %name;
}
function ConvexEditorMaterialApplyBtn::onClick(%this)
{
EWorldEditor.isDirty = true;
ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionssWindow.activeMaterial);
ConvexEditorGui.updateShape();
}
function ConvexEditorMaterialLiftBtn::onClick(%this)
{
%mat = ConvexEditorGui.getSelectedFaceMaterial();
ConvexEditorOptionssWindow.activeMaterial = %mat;
ConvexEditorOptionssWindow-->matPreviewBtn.setBitmap(%mat.diffuseMap[0]);
}
function ConvexEditorMaterialResetBtn::onClick(%this)
{
EWorldEditor.isDirty = true;
ConvexEditorGui.setSelectedFaceMaterial(ConvexEditorOptionssWindow.activeShape.material);
ConvexEditorGui.updateShape();
}
function ConvexEditorGui::toggleGridSnap(%this)
{
%this.toggleGridSnapping();
}
function ConvexEditorGridSnapSizeFld::onReturn(%this)
{
ConvexEditorGui.setGridSnapSize(%this.getText());
}
function ConvexEditorDefaultMaterialBtn::onClick(%this)
{
%this.getMaterialName();
}
function ConvexEditorDefaultMaterialBtn::getMaterialName(%this)
{
materialSelector.showDialog(%this @ ".gotMaterialName", "name");
}
function ConvexEditorDefaultMaterialBtn::gotMaterialName(%this, %name)
{
//eval(%this.object @ "." @ %this.targetField @ " = " @ %name @ ";");
//%this.object.changeMaterial(getTrailingNumber(%this.targetField), %name);
//%this.object.inspectorApply();
%diffusemap = %name.diffuseMap[0];
ConvexEditorOptionssWindow-->defMatPreviewBtn.setBitmap(%diffusemap);
ConvexEditorOptionssWindow.activeShape.material = %name;
ConvexEditorGui.updateShape();
}

View file

@ -21,6 +21,95 @@
EdgeSnap = "0";
text ="";
new GuiTextCtrl() {
profile = "ToolsGuiTextProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "15 7";
extent = "86 16";
minExtent = "8 8";
visible = "1";
text = "Sketch Tool";
maxLength = "255";
helpTag = "0";
};
new GuiBitmapCtrl() {
Profile = "ToolsGuiDefaultProfile";
position = "94 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
};
new GuiBitmapButtonCtrl(ConvexEditorCreateBoxBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "100 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.createConvexBox();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Create ConvexShape Box" NL "Use Alt + Click-Drag instead of this for more control of starting placement.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/convex-editor-btn";
text = "";
groupNum = "-1";
buttonType = "pushButton";
useMouseEvents = "0";
};
new GuiBitmapButtonCtrl(ConvexEditorSplitFaceBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "134 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.splitSelectedFace();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Split selected face" NL "Use Ctrl + Rotate instead for more control.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/split-face-btn";
text = "";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
new GuiBitmapButtonCtrl(ConvexEditorDeleteFaceBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "166 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.handleDelete();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Delete selected face" NL "(Delete)";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/delete-btn";
text = "";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
new GuiBitmapCtrl() {
Profile = "ToolsGuiDefaultProfile";
position = "190 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
};
new GuiContainer() {
canSaveDynamicFields = "0";
Enabled = "1";
@ -28,94 +117,87 @@
Profile = "menubarProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "0 0";
Extent = "800 32";
Position = "195 0";
Extent = "190 32";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "objectGridSnapBtn";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "5 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.toggleGridSnap();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggles grid snapping (G)";
hovertime = "1000";
groupNum = "-1";
buttonType = "toggleButton";
useMouseEvents = "0";
groupNum = "-1";
bitmap = "tools/gui/images/menubar/snap-grid";
textMargin = "4";
};
new GuiTextCtrl() {
profile = "ToolsGuiTextProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "15 7";
extent = "86 16";
minExtent = "8 8";
visible = "1";
text = "Sketch Tool";
maxLength = "255";
helpTag = "0";
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "39 10";
Extent = "108 10";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "Grid snap size(m)";
maxLength = "1024";
};
new GuiBitmapCtrl() {
Profile = "ToolsGuiDefaultProfile";
position = "94 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
internalName = "gridSnapSizeEdit";
isContainer = "0";
profile="ToolsGuiNumericDropSliderTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "130 6";
Extent = "42 16";
MinExtent = "8 16";
canSave = "1";
Visible = "1";
class = "ConvexEditorGridSnapSizeFld";
hovertime = "1000";
text = "1";
maxLength = "4";
historySize = "0";
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
};
new GuiBitmapButtonCtrl(ConvexEditorCreateBoxBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "100 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.createConvexBox();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Create ConvexShape Box" NL "Use Alt + Click-Drag instead of this for more control of starting placement.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/convex-editor-btn";
text = "";
groupNum = "-1";
buttonType = "pushButton";
useMouseEvents = "0";
};
new GuiBitmapButtonCtrl(ConvexEditorSplitFaceBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "134 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.splitSelectedFace();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Split selected face" NL "Use Ctrl + Rotate instead for more control.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/split-face-btn";
text = "";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
new GuiBitmapButtonCtrl(ConvexEditorDeleteFaceBtn) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "166 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "ConvexEditorGui.handleDelete();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Delete selected face" NL "(Delete)";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/delete-btn";
text = "";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
};
new GuiBitmapCtrl() {
Profile = "ToolsGuiDefaultProfile";
position = "380 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
};
};
//--- OBJECT WRITE END ---

View file

@ -28,16 +28,20 @@ function initializeConvexEditor()
exec( "./convexEditorGui.gui" );
exec( "./convexEditorToolbar.ed.gui" );
exec( "./convexEditorGui.cs" );
exec( "./convexEditorSidebarGui.gui" );
exec( "./materials.cs" );
ConvexEditorGui.setVisible( false );
ConvexEditorOptionsWindow.setVisible( false );
ConvexEditorTreeWindow.setVisible( false );
ConvexEditorToolbar.setVisible( false );
ConvexEditorOptionssWindow.setVisible( false );
EditorGui.add( ConvexEditorGui );
EditorGui.add( ConvexEditorOptionsWindow );
EditorGui.add( ConvexEditorTreeWindow );
EditorGui.add( ConvexEditorToolbar );
EditorGui.add( ConvexEditorOptionssWindow );
new ScriptObject( ConvexEditorPlugin )
{
@ -98,6 +102,7 @@ function ConvexEditorPlugin::onActivated( %this )
EditorGui.bringToFront( ConvexEditorGui );
ConvexEditorGui.setVisible( true );
ConvexEditorToolbar.setVisible( true );
ConvexEditorOptionssWindow.setVisible( true );
ConvexEditorGui.makeFirstResponder( true );
%this.map.push();
@ -132,6 +137,7 @@ function ConvexEditorPlugin::onDeactivated( %this )
ConvexEditorGui.setVisible( false );
ConvexEditorOptionsWindow.setVisible( false );
ConvexEditorTreeWindow.setVisible( false );
ConvexEditorOptionssWindow.setVisible( false );
ConvexEditorToolbar.setVisible( false );
%this.map.pop();

View file

@ -153,7 +153,6 @@ package Tools
popInstantGroup();
$instantGroup = MissionCleanup;
pushInstantGroup();
}
function startToolTime(%tool)

View file

@ -1,65 +1,45 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<EditorSettings>
<Group name="AxisGizmo">
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Group name="Grid">
<Setting name="planeDim">500</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="snapToGrid">0</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="snapToGrid">0</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="planeDim">500</Setting>
</Group>
</Group>
<Group name="WorldEditor">
<Setting name="displayType">6</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="undoLimit">40</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="displayType">6</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Group name="Grid">
<Setting name="gridSnap">0</Setting>
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
</Group>
<Group name="Docs">
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Render">
<Setting name="renderObjText">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
</Group>
<Setting name="dropType">screenCenter</Setting>
<Setting name="undoLimit">40</Setting>
<Group name="Color">
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
</Group>
<Group name="Images">
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
@ -67,17 +47,68 @@
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
</Group>
<Group name="Tools">
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="snapGround">0</Setting>
</Group>
<Group name="Render">
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
</Group>
<Group name="Grid">
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
</Group>
<Group name="Docs">
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
<Group name="GuiEditor">
<Setting name="lastPath">tools/materialEditor/gui</Setting>
<Setting name="previewResolution">1024 768</Setting>
<Group name="Snapping">
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snapToEdges">1</Setting>
<Setting name="snapToControls">1</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snap2Grid">0</Setting>
<Setting name="snapToCanvas">1</Setting>
</Group>
<Group name="Rendering">
<Setting name="drawBorderLines">1</Setting>
<Setting name="drawGuides">1</Setting>
</Group>
<Group name="Help">
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
<Group name="EngineDevelopment">
<Setting name="showEditorGuis">0</Setting>
<Setting name="showEditorProfiles">0</Setting>
<Setting name="toggleIntoEditor">0</Setting>
</Group>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
</Group>
</Group>
<Group name="LevelInformation">
<Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
@ -87,4 +118,10 @@
</Group>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
</Group>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>
</Group>
</EditorSettings>

View file

@ -877,6 +877,24 @@ function ObjectBuilderGui::buildParticleSimulation(%this)
%this.process();
}
function ObjectBuilderGui::buildReflectionProbe(%this)
{
%this.objectClassName = "ReflectionProbe";
%this.process();
%defaultPath = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/";
%this.addField("reflectionPath", "TypeFilepath", "reflectionPath", %defaultPath);
}
function ObjectBuilderGui::buildSkylight(%this)
{
%this.objectClassName = "Skylight";
%this.process();
%defaultPath = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/";
%this.addField("reflectionPath", "TypeFilepath", "reflectionPath", %defaultPath);
}
//------------------------------------------------------------------------------
// Mission
//------------------------------------------------------------------------------

View file

@ -55,6 +55,11 @@ function EWCreatorWindow::init( %this )
%this.registerMissionObject( "PointLight", "Point Light" );
%this.registerMissionObject( "SpotLight", "Spot Light" );
%this.registerMissionObject( "BoxEnvironmentProbe", "Box Environment Probe" );
%this.registerMissionObject( "SphereEnvironmentProbe", "Sphere Environment Probe" );
%this.registerMissionObject( "Skylight", "Skylight" );
%this.registerMissionObject( "GroundCover", "Ground Cover" );
%this.registerMissionObject( "TerrainBlock", "Terrain Block" );
%this.registerMissionObject( "GroundPlane", "Ground Plane" );
@ -85,6 +90,8 @@ function EWCreatorWindow::init( %this )
%this.registerMissionObject( "SFXSpace", "Sound Space" );
%this.registerMissionObject( "OcclusionVolume", "Occlusion Volume" );
%this.registerMissionObject( "AccumulationVolume", "Accumulation Volume" );
%this.registerMissionObject("NavMesh", "Navigation mesh");
%this.registerMissionObject("NavPath", "Path");
%this.registerMissionObject( "Entity", "Entity" );
%this.endGroup();

View file

@ -61,3 +61,8 @@ function EditorLightingMenu::onMenuSelect( %this )
//%selSize = EWorldEditor.getSelectionSize();
%this.enableItem( 1, true /*%selSize == 1*/ );
}
function updateReflectionProbes()
{
Canvas.pushDialog(ProbeBakeDlg);
}

View file

@ -322,6 +322,8 @@ function EditorGui::buildMenus(%this)
item[0] = "Full Relight" TAB "Alt L" TAB "Editor.lightScene(\"\", forceAlways);";
item[1] = "Toggle ShadowViz" TAB "" TAB "toggleShadowViz();";
item[2] = "-";
item[3] = "Update Reflection Probes" TAB "" TAB "updateReflectionProbes();";
item[4] = "-";
// NOTE: The light managers will be inserted as the
// last menu items in EditorLightingMenu::onAdd().