* FIX:[LE] ShapeTool

Author: BearIvan

Source/Editors/LevelEditor/Edit/ESceneShapeTools.cpp

@@ -12,6 +12,7 @@ void ESceneShapeTool::CreateControls()
 	inherited::CreateDefaultControls(estDefault);
     AddControl		(xr_new<TUI_ControlShapeAdd>(estDefault,etaAdd,	this));
     pForm = xr_new< UIShapeTool>();
+    ((UIShapeTool*)pForm)->Tool = this;
 }
 //----------------------------------------------------
 
@@ -81,11 +82,11 @@ void ESceneShapeTool::OnEditLevelBounds(bool recalc)
 void ESceneShapeTool::OnActivate()
 {
 	inherited::OnActivate();
-	//((TfraShape*)pFrame)->ebEditLevelBoundMode->Down = false;
+	((UIShapeTool*)pForm)->EditLevelBound = false;
 }
 
 void ESceneShapeTool::OnDeactivate()
 {
 	inherited::OnDeactivate();
-	//((TfraShape*)pFrame)->ebEditLevelBoundMode->Down = false;
+    ((UIShapeTool*)pForm)->EditLevelBound = false;
 }

Source/Editors/LevelEditor/Edit/EShape.cpp

@@ -5,7 +5,7 @@
 #include "EShape.h"
 #include "du_box.h"
 #include "Scene.h"
-
+#include "UI\Tools\UIShapeTool.h"
 #define SHAPE_COLOR_TRANSP		0x3C808080
 #define SHAPE_COLOR_EDGE		0xFF202020
 
@@ -469,10 +469,9 @@ void CEditShape::OnFrame()
 	inherited::OnFrame();
     if(m_shape_type==eShapeLevelBound)
     {
-        R_ASSERT(!"Ñîðÿí çàáûë ðåëèçîâàòü");
-    /*	TfraShape* F 		= (TfraShape*)ParentTool->pFrame;
-    	BOOL bVis = F->ebEditLevelBoundMode->Down;
-    	m_RT_Flags.set(flRT_Visible, bVis);*/
+        UIShapeTool* F 		= (UIShapeTool*)FParentTools->pForm;
+    	BOOL bVis = F->EditLevelBound;
+    	m_RT_Flags.set(flRT_Visible, bVis);
     }
 }
 

Source/Editors/LevelEditor/Edit/LevelPreferences.cpp

@@ -7,11 +7,20 @@
 #include "scene.h"
 #include "ui_levelmain.h"
 #include "ui_leveltools.h"
+#include "UI\UIObjectList.h"
 //---------------------------------------------------------------------------
 
 void CLevelPreferences::Load(CInifile* I)
 {
-	inherited::Load		(I);                         
+	inherited::Load		(I);        
+    {
+        OpenObjectList = R_BOOL_SAFE("windows", "object_list", false);
+     
+    }
+    {
+        OpenProperties = R_BOOL_SAFE("windows", "properties", true);
+      
+    }
     SceneToolsMapPairIt _I 	= Scene->FirstTool();
     SceneToolsMapPairIt _E 	= Scene->LastTool();
     for (; _I!=_E; _I++)
@@ -22,6 +31,8 @@ void CLevelPreferences::Load(CInifile* I)
 void CLevelPreferences::Save(CInifile* I)
 {
 	inherited::Save		(I);
+    I->w_bool("windows", "object_list", OpenObjectList);
+    I->w_bool("windows", "properties", OpenProperties);
     SceneToolsMapPairIt _I 	= Scene->FirstTool();
     SceneToolsMapPairIt _E 	= Scene->LastTool();
     for (; _I!=_E; _I++)

Source/Editors/LevelEditor/UI/Tools/UIShapeTool.cpp

@@ -1,8 +1,10 @@
 #include "stdafx.h"
 #include "UIShapeTool.h"
 #include "EShape.h"
+#include "ESceneShapeTools.h"
 UIShapeTool::UIShapeTool()
 {
+    Tool = nullptr;
     m_AttachShape = false;
 }
 
@@ -55,4 +57,24 @@ void UIShapeTool::Draw()
         ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing());
         ImGui::TreePop();
     }
+    ImGui::SetNextItemOpen(true, ImGuiCond_FirstUseEver);
+    if (ImGui::TreeNode("Level Bound"))
+    {
+        ImGui::Unindent(ImGui::GetTreeNodeToLabelSpacing());
+        {
+            if (ImGui::Checkbox("Edit Level Bound", &EditLevelBound))
+            {
+                if (EditLevelBound)
+                    Tool->OnEditLevelBounds(false);
+            }
+            if(EditLevelBound)
+            if (ImGui::Button("Recalc", ImVec2(-1, 0)))
+            {
+                Tool->OnEditLevelBounds(true);
+            }
+        }
+        ImGui::Separator();
+        ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing());
+        ImGui::TreePop();
+    }
 }

Source/Editors/LevelEditor/UI/Tools/UIShapeTool.h

@@ -1,12 +1,15 @@
 #pragma once
+class ESceneShapeTool;
 class UIShapeTool :public UIToolCustom
 {
 public:
+	ESceneShapeTool* Tool;
 	UIShapeTool();
 	virtual ~UIShapeTool();
 	virtual void Draw();
 	IC bool IsAttachShape()const { return m_AttachShape; }
 	IC bool IsSphereMode()const { return m_SphereMode; }
+	bool EditLevelBound;
 	IC void SetSphereMode(bool mode) { m_SphereMode = mode; }
 	IC void SetAttachShape(bool mode) { m_AttachShape = mode; }
 private: