mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 22:54:34 +00:00
added navmesh tester tool
Added ground work for tester tool tester tool works but needs to fill out list of acceptable datablocks and spawnclasses navpaths now share 1 navmeshquery AIControllerData now has a vector of area costs for different polyareas General cleanup
This commit is contained in:
parent
edf4d47be0
commit
6d36e17d91
17 changed files with 604 additions and 421 deletions
|
|
@ -857,7 +857,27 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
|
|||
visible = "1";
|
||||
active = "0";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
toolTip = "Can this character walk on ground?";
|
||||
toolTip = "Can this character walk on ground?";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
internalName = "LinkSwimFlag";
|
||||
class = "NavMeshTestFlagButton";
|
||||
text = " Swim";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
extent = "159 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "0";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
toolTip = "Can this character swim?";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
|
|
|
|||
|
|
@ -77,68 +77,5 @@ $guiContent = new GuiControl(NavEditorToolbar,EditorGuiGroup) {
|
|||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
text = "Mesh";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "167 1";
|
||||
extent = "50 30";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
variable = "$Nav::Editor::renderMesh";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "MeshButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
text = "Portals";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "224 1";
|
||||
extent = "54 30";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
variable = "$Nav::Editor::renderPortals";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "PortalButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
text = "BV tree";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "286 1";
|
||||
extent = "140 30";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
variable = "$Nav::Editor::renderBVTree";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "BVTreeButton";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
|
|||
|
|
@ -66,6 +66,13 @@ function initializeNavEditor()
|
|||
buttonImage = "ToolsModule:nav_link_n_image";
|
||||
};
|
||||
|
||||
new NavMeshTestTool()
|
||||
{
|
||||
internalName = "TestTool";
|
||||
toolTip = "PathFinding Test tool";
|
||||
buttonImage = "ToolsModule:3rd_person_camera_n_image";
|
||||
};
|
||||
|
||||
new TileTool()
|
||||
{
|
||||
internalName = "TileTool";
|
||||
|
|
@ -140,7 +147,7 @@ function EditorGui::SetNavPalletBar()
|
|||
EWToolsPaletteWindow.addButton("LinkMode", "ToolsModule:nav_link_n_image", "NavEditorGui.setActiveTool(NavMeshTools->LinkTool);", "", "Create off-mesh links", "2");
|
||||
// EWToolsPaletteWindow.addButton("CoverMode", "ToolsModule:nav_cover_n_image", "NavEditorGui.setMode(\"CoverMode\");", "","Edit cover", "3");
|
||||
// EWToolsPaletteWindow.addButton("TileMode", "ToolsModule:select_bounds_n_image", "NavEditorGui.setMode(\"TileMode\");", "", "View tiles", "4");
|
||||
// EWToolsPaletteWindow.addButton("TestMode", "ToolsModule:3rd_person_camera_n_image", "NavEditorGui.setMode(\"TestMode\");", "", "Test pathfinding", "5");
|
||||
EWToolsPaletteWindow.addButton("TestMode", "ToolsModule:3rd_person_camera_n_image", "NavEditorGui.setActiveTool(NavMeshTools->TestTool);", "", "Test pathfinding", "5");
|
||||
EWToolsPaletteWindow.addButton("TileMode", "ToolsModule:select_bounds_n_image", "NavEditorGui.setActiveTool(NavMeshTools->TileTool);" , "", "View and Edit Tiles", "4");
|
||||
EWToolsPaletteWindow.refresh();
|
||||
}
|
||||
|
|
@ -263,7 +270,7 @@ function NavEditorPlugin::initSettings(%this)
|
|||
EditorSettings.beginGroup("NavEditor", true);
|
||||
|
||||
EditorSettings.setDefaultValue("SpawnClass", "AIPlayer");
|
||||
EditorSettings.setDefaultValue("SpawnDatablock", "DefaultPlayerData");
|
||||
EditorSettings.setDefaultValue("SpawnDatablock", "ProtoPlayer");
|
||||
|
||||
EditorSettings.endGroup();
|
||||
}
|
||||
|
|
@ -273,9 +280,6 @@ function NavEditorPlugin::readSettings(%this)
|
|||
EditorSettings.beginGroup("NavEditor", true);
|
||||
|
||||
// Currently these are globals because of the way they are accessed in navMesh.cpp.
|
||||
$Nav::Editor::renderMesh = EditorSettings.value("RenderMesh");
|
||||
$Nav::Editor::renderPortals = EditorSettings.value("RenderPortals");
|
||||
$Nav::Editor::renderBVTree = EditorSettings.value("RenderBVTree");
|
||||
NavEditorGui.spawnClass = EditorSettings.value("SpawnClass");
|
||||
NavEditorGui.spawnDatablock = EditorSettings.value("SpawnDatablock");
|
||||
NavEditorGui.backgroundBuild = EditorSettings.value("BackgroundBuild");
|
||||
|
|
@ -295,9 +299,6 @@ function NavEditorPlugin::writeSettings(%this)
|
|||
{
|
||||
EditorSettings.beginGroup("NavEditor", true);
|
||||
|
||||
EditorSettings.setValue("RenderMesh", $Nav::Editor::renderMesh);
|
||||
EditorSettings.setValue("RenderPortals", $Nav::Editor::renderPortals);
|
||||
EditorSettings.setValue("RenderBVTree", $Nav::Editor::renderBVTree);
|
||||
EditorSettings.setValue("SpawnClass", NavEditorGui.spawnClass);
|
||||
EditorSettings.setValue("SpawnDatablock", NavEditorGui.spawnDatablock);
|
||||
EditorSettings.setValue("BackgroundBuild", NavEditorGui.backgroundBuild);
|
||||
|
|
|
|||
|
|
@ -411,6 +411,142 @@ function NavMeshLinkBiDirection::onClick(%this)
|
|||
|
||||
//------------------------------------------------------
|
||||
|
||||
function NavMeshTestTool::onActivated(%this)
|
||||
{
|
||||
NavInspector.setVisible(false);
|
||||
|
||||
%actions = NavEditorOptionsWindow->ActionsBox;
|
||||
%actions->SelectActions.setVisible(false);
|
||||
%actions->LinkActions.setVisible(false);
|
||||
%actions->CoverActions.setVisible(false);
|
||||
%actions->TileActions.setVisible(false);
|
||||
%actions->TestActions.setVisible(false);
|
||||
|
||||
%properties = NavEditorOptionsWindow->PropertiesBox;
|
||||
%properties->LinkProperties.setVisible(false);
|
||||
%properties->TileProperties.setVisible(false);
|
||||
%properties->TestProperties.setVisible(false);
|
||||
|
||||
%actions->TestActions.setVisible(true);
|
||||
%properties->TestProperties.setVisible(true);
|
||||
}
|
||||
|
||||
function NavMeshTestTool::onDeactivated(%this)
|
||||
{
|
||||
NavInspector.setVisible(false);
|
||||
|
||||
%actions = NavEditorOptionsWindow->ActionsBox;
|
||||
%actions->SelectActions.setVisible(false);
|
||||
%actions->LinkActions.setVisible(false);
|
||||
%actions->CoverActions.setVisible(false);
|
||||
%actions->TileActions.setVisible(false);
|
||||
%actions->TestActions.setVisible(false);
|
||||
|
||||
%properties = NavEditorOptionsWindow->PropertiesBox;
|
||||
%properties->LinkProperties.setVisible(false);
|
||||
%properties->TileProperties.setVisible(false);
|
||||
%properties->TestProperties.setVisible(false);
|
||||
}
|
||||
|
||||
function updateTestData(%control, %flags)
|
||||
{
|
||||
%control->LinkWalkFlag.setActive(true);
|
||||
%control->LinkSwimFlag.setActive(true);
|
||||
%control->LinkJumpFlag.setActive(true);
|
||||
%control->LinkDropFlag.setActive(true);
|
||||
%control->LinkLedgeFlag.setActive(true);
|
||||
%control->LinkClimbFlag.setActive(true);
|
||||
%control->LinkTeleportFlag.setActive(true);
|
||||
|
||||
%control->LinkWalkFlag.setStateOn(%flags & $Nav::WalkFlag);
|
||||
%control->LinkSwimFlag.setStateOn(%flags & $Nav::SwimFlag);
|
||||
%control->LinkJumpFlag.setStateOn(%flags & $Nav::JumpFlag);
|
||||
%control->LinkDropFlag.setStateOn(%flags & $Nav::DropFlag);
|
||||
%control->LinkLedgeFlag.setStateOn(%flags & $Nav::LedgeFlag);
|
||||
%control->LinkClimbFlag.setStateOn(%flags & $Nav::ClimbFlag);
|
||||
%control->LinkTeleportFlag.setStateOn(%flags & $Nav::TeleportFlag);
|
||||
}
|
||||
|
||||
function getTestFlags(%control)
|
||||
{
|
||||
return (%control->LinkWalkFlag.isStateOn() ? $Nav::WalkFlag : 0) |
|
||||
(%control->LinkSwimFlag.isStateOn() ? $Nav::SwimFlag : 0) |
|
||||
(%control->LinkJumpFlag.isStateOn() ? $Nav::JumpFlag : 0) |
|
||||
(%control->LinkDropFlag.isStateOn() ? $Nav::DropFlag : 0) |
|
||||
(%control->LinkLedgeFlag.isStateOn() ? $Nav::LedgeFlag : 0) |
|
||||
(%control->LinkClimbFlag.isStateOn() ? $Nav::ClimbFlag : 0) |
|
||||
(%control->LinkTeleportFlag.isStateOn() ? $Nav::TeleportFlag : 0);
|
||||
}
|
||||
|
||||
function disableTestData(%control)
|
||||
{
|
||||
%control->LinkWalkFlag.setActive(false);
|
||||
%control->LinkSwimFlag.setActive(false);
|
||||
%control->LinkJumpFlag.setActive(false);
|
||||
%control->LinkDropFlag.setActive(false);
|
||||
%control->LinkLedgeFlag.setActive(false);
|
||||
%control->LinkClimbFlag.setActive(false);
|
||||
%control->LinkTeleportFlag.setActive(false);
|
||||
}
|
||||
|
||||
function getControllerDataFlags(%controllerData)
|
||||
{
|
||||
return (%controllerData.allowWalk ? $Nav::WalkFlag : 0 ) |
|
||||
(%controllerData.allowSwim ? $Nav::SwimFlag : 0 ) |
|
||||
(%controllerData.allowJump ? $Nav::JumpFlag : 0 ) |
|
||||
(%controllerData.allowDrop ? $Nav::DropFlag : 0 ) |
|
||||
(%controllerData.allowLedge ? $Nav::LedgeFlag : 0) |
|
||||
(%controllerData.allowClimb ? $Nav::ClimbFlag : 0) |
|
||||
(%controllerData.allowTeleport ? $Nav::TeleportFlag : 0 );
|
||||
}
|
||||
|
||||
function NavMeshTestTool::updateTestFlags(%this)
|
||||
{
|
||||
if(isObject(%this.getPlayer()))
|
||||
{
|
||||
%properties = NavEditorOptionsWindow-->TestProperties;
|
||||
%player = %this.getPlayer();
|
||||
%controllerData = %player.getDatablock().aiControllerData;
|
||||
|
||||
%controllerData.allowWalk = %properties->LinkWalkFlag.isStateOn();
|
||||
%controllerData.allowSwim = %properties->LinkSwimFlag.isStateOn();
|
||||
%controllerData.allowJump = %properties->LinkJumpFlag.isStateOn();
|
||||
%controllerData.allowDrop = %properties->LinkDropFlag.isStateOn();
|
||||
%controllerData.allowLedge = %properties->LinkLedgeFlag.isStateOn();
|
||||
%controllerData.allowClimb = %properties->LinkClimbFlag.isStateOn();
|
||||
%controllerData.allowTeleport = %properties->LinkTeleportFlag.isStateOn();
|
||||
|
||||
%player.aiController = new AIController(){ ControllerData = %controllerData; };
|
||||
%player.setAIController(%player.aiController);
|
||||
}
|
||||
}
|
||||
|
||||
function NavMeshTestTool::onPlayerSelected(%this, %flags)
|
||||
{
|
||||
if (!isObject(%this.getPlayer().aiController) || (isObject(%this.getPlayer().aiController) && !(%this.getPlayer().isMemberOfClass("AIPlayer"))))
|
||||
{
|
||||
%this.getPlayer().aiController = new AIController(){ ControllerData = %this.getPlayer().getDatablock().aiControllerData; };
|
||||
%this.getPlayer().setAIController(%this.getPlayer().aiController);
|
||||
%flags = getControllerDataFlags(%this.getPlayer().getDatablock().aiControllerData);
|
||||
}
|
||||
NavMeshIgnore(%this.getPlayer(), true);
|
||||
%this.getPlayer().setDamageState("Enabled");
|
||||
|
||||
updateTestData(NavEditorOptionsWindow-->TestProperties, %flags);
|
||||
}
|
||||
|
||||
function NavMeshTestTool::onPlayerDeselected(%this)
|
||||
{
|
||||
disableTestData(NavEditorOptionsWindow-->TestProperties);
|
||||
}
|
||||
|
||||
function NavMeshTestFlagButton::onClick(%this)
|
||||
{
|
||||
NavMeshTools->TestTool.updateTestFlags();
|
||||
}
|
||||
|
||||
//------------------------------------------------------
|
||||
|
||||
function TileTool::onActivated(%this)
|
||||
{
|
||||
NavInspector.setVisible(false);
|
||||
|
|
@ -540,13 +676,13 @@ function NavEditorGui::deleteSelected(%this)
|
|||
toolsMessageBoxYesNo("Warning",
|
||||
"Are you sure you want to delete" SPC NavEditorGui.selectedObject.getName(),
|
||||
"NavEditorGui.deleteMesh();");
|
||||
case "TestMode":
|
||||
%this.getPlayer().delete();
|
||||
%this.onPlayerDeselected();
|
||||
case "LinkMode":
|
||||
%this.deleteLink();
|
||||
%this.isDirty = true;
|
||||
}
|
||||
// case "TestMode":
|
||||
// %this.getPlayer().delete();
|
||||
// %this.onPlayerDeselected();
|
||||
// case "LinkMode":
|
||||
// %this.deleteLink();
|
||||
// %this.isDirty = true;
|
||||
// }
|
||||
}
|
||||
|
||||
function NavEditorGui::buildSelectedMeshes(%this)
|
||||
|
|
@ -567,47 +703,6 @@ function NavEditorGui::buildLinks(%this)
|
|||
}
|
||||
}
|
||||
|
||||
function NavEditorGui::onLinkSelected(%this, %flags)
|
||||
{
|
||||
updateLinkData(NavEditorOptionsWindow-->LinkProperties, %flags);
|
||||
}
|
||||
|
||||
function NavEditorGui::onPlayerSelected(%this, %flags)
|
||||
{
|
||||
if (!isObject(%this.getPlayer().aiController) || (isObject(%this.getPlayer().aiController) && !(%this.getPlayer().isMemberOfClass("AIPlayer"))))
|
||||
{
|
||||
%this.getPlayer().aiController = new AIController(){ ControllerData = %this.getPlayer().getDatablock().aiControllerData; };
|
||||
%this.getPlayer().setAIController(%this.getPlayer().aiController);
|
||||
}
|
||||
NavMeshIgnore(%this.getPlayer(), true);
|
||||
%this.getPlayer().setDamageState("Enabled");
|
||||
|
||||
updateLinkData(NavEditorOptionsWindow-->TestProperties, %flags);
|
||||
}
|
||||
|
||||
function NavEditorGui::updateTestFlags(%this)
|
||||
{
|
||||
if(isObject(%this.getPlayer()))
|
||||
{
|
||||
%properties = NavEditorOptionsWindow-->TestProperties;
|
||||
%player = %this.getPlayer();
|
||||
|
||||
%player.allowWwalk = %properties->LinkWalkFlag.isStateOn();
|
||||
%player.allowJump = %properties->LinkJumpFlag.isStateOn();
|
||||
%player.allowDrop = %properties->LinkDropFlag.isStateOn();
|
||||
%player.allowLedge = %properties->LinkLedgeFlag.isStateOn();
|
||||
%player.allowClimb = %properties->LinkClimbFlag.isStateOn();
|
||||
%player.allowTeleport = %properties->LinkTeleportFlag.isStateOn();
|
||||
|
||||
%this.isDirty = true;
|
||||
}
|
||||
}
|
||||
|
||||
function NavEditorGui::onPlayerDeselected(%this)
|
||||
{
|
||||
disableLinkData(NavEditorOptionsWindow-->TestProperties);
|
||||
}
|
||||
|
||||
function NavEditorGui::createCoverPoints(%this)
|
||||
{
|
||||
if(isObject(%this.getMesh()))
|
||||
|
|
@ -718,11 +813,6 @@ function ENavEditorPaletteButton::onClick(%this)
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
function NavMeshTestFlagButton::onClick(%this)
|
||||
{
|
||||
NavEditorGui.updateTestFlags();
|
||||
}
|
||||
|
||||
singleton GuiControlProfile(NavEditorProfile)
|
||||
{
|
||||
canKeyFocus = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue