Fixed an issue where NodeFactory::RegisterNodeType did not handle many edge cases; GroupComment::SetPosition now correctly moves attached nodes, previously, only non-programmatic movement worked as expected.

Author: Azzinoth

CMakeLists.txt

@@ -12,6 +12,19 @@ option(VISUAL_NODE_SYSTEM_BUILD_SHARED_LIBS "Build VisualNodeSystem as a shared
 option(VISUAL_NODE_SYSTEM_USE_STATIC_RUNTIME "Use static runtime (/MT) instead of dynamic (/MD) for VisualNodeSystem" ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+if(MSVC)
+    if(VISUAL_NODE_SYSTEM_USE_STATIC_RUNTIME)
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    else()
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+    endif()
+
+    # Always add /MP for multi-processor compilation
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
+
 # Turn on the ability to create folders to organize projects (.vcproj)
 # It creates "CMakePredefinedTargets" folder by default and adds CMake
 # defined projects like INSTALL.vcproj and ZERO_CHECK.vcproj

GroupComment.cpp

@@ -1,4 +1,5 @@
 #include "GroupComment.h"
+#include "SubSystems/VisualNodeArea/VisualNodeArea.h"
 using namespace VisNodeSys;
 
 char GroupComment::GroupCommentRename[GROUP_COMMENT_CAPTION_MAX_LENGTH] = "";
@@ -35,7 +36,15 @@ ImVec2 GroupComment::GetPosition() const
 
 void GroupComment::SetPosition(const ImVec2 NewValue)
 {
-	Position = NewValue;
+	if (ParentArea == nullptr)
+	{
+		Position = NewValue;
+		return;
+	}
+
+	ImVec2 Delta = NewValue - Position;
+	ParentArea->AttachElementsToGroupComment(this);
+	ParentArea->MoveGroupComment(this, Delta);
 }
 
 ImVec2 GroupComment::GetSize() const

SubSystems/VisualNodeArea/VisualNodeArea.h

@@ -66,6 +66,7 @@ namespace VisNodeSys
 
 	class VISUAL_NODE_SYSTEM_API NodeArea
 	{
+		friend class GroupComment;
 		friend NodeSystem;
 	public:
 		NodeArea();

SubSystems/VisualNodeArea/VisualNodeAreaInput.cpp

@@ -619,7 +619,7 @@ void NodeArea::MouseDraggingGroupCommentUpdate()
 
 void NodeArea::MoveGroupComment(GroupComment* GroupComment, ImVec2 Delta)
 {
-	GroupComment->SetPosition(GroupComment->GetPosition() + Delta);
+	GroupComment->Position += Delta;
 
 	if (!GroupComment->bMoveElementsWithComment)
 		return;

VisualNodeFactory.cpp

@@ -11,28 +11,37 @@ extern "C" __declspec(dllexport) void* GetNodeFactory()
 NodeFactory::NodeFactory() {}
 NodeFactory::~NodeFactory() {}
 
-void NodeFactory::RegisterNodeType(const std::string& Type,
+bool NodeFactory::RegisterNodeType(const std::string& Type,
                                          std::function<Node* ()> Constructor,
                                          std::function<Node* (const Node&)> CopyConstructor)
 {
+	if (Type.empty() || Constructor == nullptr || CopyConstructor == nullptr)
+		return false;
+
+	auto ConstructorIterator = Constructors.find(Type);
+    if (ConstructorIterator != Constructors.end())
+		return false;
+	
     Constructors[Type] = Constructor;
     CopyConstructors[Type] = CopyConstructor;
+
+	return true;
 }
 
 Node* NodeFactory::CreateNode(const std::string& Type) const
 {
-    auto it = Constructors.find(Type);
-    if (it == Constructors.end())
+    auto ConstructorIterator = Constructors.find(Type);
+    if (ConstructorIterator == Constructors.end())
         return nullptr;
 
-    return it->second();
+    return ConstructorIterator->second();
 }
 
 Node* NodeFactory::CopyNode(const std::string& Type, const Node& Node) const
 {
-    auto it = CopyConstructors.find(Type);
-    if (it == CopyConstructors.end())
+    auto CopyConstructorIterator = CopyConstructors.find(Type);
+    if (CopyConstructorIterator == CopyConstructors.end())
         return nullptr;
 
-    return it->second(Node);
+    return CopyConstructorIterator->second(Node);
 }

VisualNodeFactory.h

@@ -14,7 +14,7 @@ namespace VisNodeSys
     public:
         SINGLETON_PUBLIC_PART(NodeFactory)
 
-        void RegisterNodeType(const std::string& Type, std::function<Node* ()> Constructor, std::function<Node* (const Node&)> CopyConstructor);
+        bool RegisterNodeType(const std::string& Type, std::function<Node* ()> Constructor, std::function<Node* (const Node&)> CopyConstructor);
         Node* CreateNode(const std::string& Type) const;
         Node* CopyNode(const std::string& Type, const Node& Node) const;
     };