Fix crash when opening AddFunctionDialog

Author: NicusorN5

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Controls/EventControl.cpp

@@ -10,9 +10,11 @@ EventControl::EventControl(
 	HINSTANCE hInstance, 
 	int x,
 	int y, 
-	Engine3DRadSpace::Reflection::Event* event
+	Engine3DRadSpace::Reflection::Event* event,
+	Engine3DRadSpace::Objects::ObjectList* list
 ) : IControl(owner, hInstance),
-	_event(event)
+	_event(event),
+	_list(list)
 {
 	HDC hdc = GetDC(owner);
 
@@ -40,7 +42,7 @@ EventControl::EventControl(
 		x + 10,
 		y + textSize.cy + 10,
 		260 - sgnTextSize.cx,
-		480,
+		370,
 		owner,
 		nullptr,
 		hInstance,
@@ -55,8 +57,8 @@ EventControl::EventControl(
 		WS_VISIBLE | WS_CHILD,
 		btnPosX,
 		y + textSize.cy + 10,
-		textSize.cx + 5,
-		textSize.cy + 5,
+		(2 * sgnTextSize.cx) + 5,
+		sgnTextSize.cy + 5,
 		owner,
 		nullptr,
 		hInstance,
@@ -65,12 +67,12 @@ EventControl::EventControl(
 
 	_btnRemoveCall = CreateWindowExA(0,
 		"Button",
-		"-",
+		"-", 
 		WS_VISIBLE | WS_CHILD,
 		btnPosX,
 		y + textSize.cy + 10 + sgnTextSize.cy + 5,
-		textSize.cx + 5,
-		textSize.cy + 5,
+		(2 * sgnTextSize.cx) + 5,
+		sgnTextSize.cy + 5,
 		owner,
 		nullptr,
 		hInstance,
@@ -87,14 +89,15 @@ void EventControl::HandleClick(HWND clickedWindow)
 	{
 		std::thread openFnFinderWindow([this]()
 		{
-			AddFunctionDialog dialog(this->window, this->instance, nullptr);
+			AddFunctionDialog dialog(this->window, this->instance, this->_list);
 			auto event = dialog.ShowDialog();
 
 			if (event.has_value())
 			{
 
 			}
 		});
+		openFnFinderWindow.detach();
 	}
 
 	if(clickedWindow == _btnRemoveCall)

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Controls/EventControl.hpp

@@ -5,7 +5,8 @@
 class EventControl : public IControl
 {
 	Engine3DRadSpace::Reflection::Event* _event;
-	
+	Engine3DRadSpace::Objects::ObjectList* _list;
+
 	HWND _groupBox;
 	HWND _btnAddCall;
 	HWND _btnRemoveCall;
@@ -20,7 +21,8 @@ class EventControl : public IControl
 		HINSTANCE hInstance,
 		int x,
 		int y,
-		Engine3DRadSpace::Reflection::Event* event
+		Engine3DRadSpace::Reflection::Event* event,
+		Engine3DRadSpace::Objects::ObjectList* list
 	);
 
 	void HandleClick(HWND clickedWindow) override;

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Windows/AddFunctionDialog.cpp

@@ -79,13 +79,15 @@ AddFunctionDialog::AddFunctionDialog(
 	HWND owner, 
 	HINSTANCE hInstance,
 	ObjectList* list
-) : Dialog(owner, hInstance, nullptr, "Find object method"),
+) : Dialog(owner, hInstance, AddFunctionDialog_DlgProc, "Find object method"),
 	_list(list)
 {
 }
 
 std::optional<EventInvocationRepresentation> AddFunctionDialog::ShowDialog()
 {
+	Dialog::ShowDialog(this);
+
 	if (_value.FunctionID == std::numeric_limits<size_t>::max() || _value.OwnerObject == std::numeric_limits<size_t>::max())
 	{
 		return std::nullopt;

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Windows/EditObjectDialog.cpp

@@ -12,6 +12,7 @@
 #include "..\Controls\SoundControl.hpp"
 #include <Engine3DRadSpace/Projects/EventInvocationRepresentation.hpp>
 #include "../Controls/EventControl.hpp"
+#include <Engine3DRadSpace/Objects/ObjectList.hpp>
 
 using namespace Engine3DRadSpace;
 using namespace Engine3DRadSpace::Audio;
@@ -510,7 +511,9 @@ void EditObjectDialog::createForms()
 			{
 				const Event* value = reinterpret_cast<const Event*>(reinterpret_cast<const char*>(valuePtr) + fOffset);
 
-				EventControl* ctrl = new EventControl(window, hInstance, x, y, const_cast<Event*>(value));
+				auto objList = _content->GetOwner()->RequireService<Objects::ObjectList>({});
+
+				EventControl* ctrl = new EventControl(window, hInstance, x, y, const_cast<Event*>(value), objList);
 				windows.push_back(ctrl);
 
 				setMax(inc_y, ctrl->AccY() + 5 + textboxHeight);

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Windows/EditorWindow.cpp

@@ -64,7 +64,7 @@ void EditorWindow::_openProject(const std::filesystem::path& filename)
 void EditorWindow::PopulateObjectList(Engine3DRadSpace::Objects::ObjectList* list, HWND treeView)
 {
 	std::unordered_map<IObject*, HTREEITEM> objectToTreeItem;
-	for (int i = 0; auto& instance : *(list))
+	for (int i = 0; auto& instance : *list)
 	{
 		auto object = instance.Object.get();
 
@@ -185,7 +185,7 @@ void EditorWindow::_findUpdate()
 	//Check version
 	if (version == EngineVersion)
 	{
-		MessageBoxA(_mainWindow, "No new updates were found.", "Update information", MB_ICONINFORMATION | MB_OK);
+		//MessageBoxA(_mainWindow, "No new updates were found.", "Update information", MB_ICONINFORMATION | MB_OK);
 		return;
 	}
 

3DRadSpace/Data/Sprites/UV checker map.jpg

@@ -26,10 +26,9 @@ IAsset* ContentManager::AssetFactory::Create(const Reflection::UUID& uuid, const
 	return nullptr;
 }
 
-ContentManager::ContentManager(IGame* owner) :
+ContentManager::ContentManager(IGame* owner) : IService(owner),
 	_lastID(1),
-	_factory(owner),
-	_owner(owner)
+	_factory(owner)
 {
 	//We add a null asset at index 0 because reference IDs are unsigned integers.
 	_assets.emplace_back(nullptr);

3DRadSpace/Engine3DRadSpace/Content/ContentManager.cpp

@@ -121,7 +121,6 @@ namespace Engine3DRadSpace::Content
 
 		unsigned _lastID;
 		std::vector<AssetEntry> _assets;
-		IGame* _owner;
 	public:
 		/// <summary>
 		/// Constructs an instance of ContentManager.

3DRadSpace/Engine3DRadSpace/Content/ContentManager.hpp

@@ -18,8 +18,8 @@ namespace Engine3DRadSpace::Reflection
 
 			MemberFunctionInvoker() = default;
 			MemberFunctionInvoker(void* object, std::unique_ptr<IReflectedFunction> &&fn, std::type_index returnType);
-			MemberFunctionInvoker(MemberFunctionInvoker&& other) noexcept = default;
 
+			MemberFunctionInvoker(MemberFunctionInvoker&& other) noexcept = default;
 			MemberFunctionInvoker& operator=(MemberFunctionInvoker&& other) noexcept = default;
 		};