Added groups

deni2312 · Nov 10, 2024 · fecdb7a · fecdb7a
1 parent 6b1af49
commit fecdb7a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/Engine/src/Components/PhysicsMeshComponent.cpp b/Engine/src/Components/PhysicsMeshComponent.cpp
@@ -64,8 +64,6 @@ void Prisma::PhysicsMeshComponent::ui()
 
 	addGlobal(componentBend);
 
-	addGlobal(componentType);
-
 	addGlobal(componentDynamic);
 
 	addGlobal(componentSoftBody);

diff --git a/Engine/src/Handlers/ComponentsHandler.cpp b/Engine/src/Handlers/ComponentsHandler.cpp
@@ -80,7 +80,6 @@ void Prisma::ComponentsHandler::removeComponent(std::shared_ptr<Component> compo
 	// Erase the removed elements (if any)
 	if (it != m_components.end())
 	{
-		std::cout << "a" << std::endl;
 		m_components.erase(it);
 	}
 }

diff --git a/GUI/include/NodeViewer.h b/GUI/include/NodeViewer.h
@@ -33,7 +33,8 @@ namespace Prisma
 
 		void showComponents(Node* nodeData);
 
-		void showSelected(const NodeData& nodeData, bool end = true, bool showData = true);
+		void showSelected(const NodeData& nodeData, bool end = true, bool showData = true,
+		                  Node* componentAdding = nullptr);
 		// Getters for textures
 		const std::shared_ptr<Texture>& rotateTexture() const;
 

diff --git a/GUI/src/MeshInfo.cpp b/GUI/src/MeshInfo.cpp
@@ -9,6 +9,8 @@ void Prisma::MeshInfo::showSelected(const NodeViewer::NodeData& meshData)
 {
 	if (meshData.node)
 	{
+		auto parent = meshData;
+		parent.node = meshData.node->parent();
 		std::shared_ptr<PhysicsMeshComponent> physicsComponent = nullptr;
 		for (auto component : meshData.node->components())
 		{
@@ -21,9 +23,7 @@ void Prisma::MeshInfo::showSelected(const NodeViewer::NodeData& meshData)
 		auto mesh = dynamic_cast<Prisma::Mesh*>(meshData.node);
 		auto isAnimate = dynamic_cast<AnimatedMesh*>(meshData.node);
 
-		NodeViewer::getInstance().showSelected(meshData, false,
-		                                       isAnimate || (physicsComponent && !physicsComponent->collisionData().
-			                                       softBody) || !physicsComponent);
+		NodeViewer::getInstance().showSelected(parent, false, false, meshData.node);
 		ImGui::Dummy(ImVec2(0.0f, 4.0f));
 
 		if (mesh)
@@ -46,6 +46,12 @@ void Prisma::MeshInfo::showSelected(const NodeViewer::NodeData& meshData)
 		{
 			physicsComponent->updateCollisionData();
 		}
+		ImGui::Dummy(ImVec2(0, 4));
+		if (isAnimate || (physicsComponent && !physicsComponent->collisionData().
+		                                                         softBody) || !physicsComponent)
+		{
+			NodeViewer::getInstance().showComponents(meshData.node);
+		}
 
 		ImGui::Dummy(ImVec2(0, 10));
 		if (isAnimate)

diff --git a/GUI/src/NodeViewer.cpp b/GUI/src/NodeViewer.cpp
@@ -118,7 +118,8 @@ void Prisma::NodeViewer::showComponents(Node* nodeData)
 
 // Getters for textures
 
-void Prisma::NodeViewer::showSelected(const NodeData& nodeData, bool end, bool showData)
+void Prisma::NodeViewer::showSelected(const NodeData& nodeData, bool end, bool showData,
+                                      Node* componentAdding)
 {
 	if (nodeData.node)
 	{
@@ -210,7 +211,14 @@ void Prisma::NodeViewer::showSelected(const NodeData& nodeData, bool end, bool s
 		ImGui::SameLine();
 		if (ImGui::Button("Add component"))
 		{
-			nodeData.node->addComponent(Prisma::Factory::createInstance(components[m_componentSelect]));
+			if (componentAdding)
+			{
+				componentAdding->addComponent(Prisma::Factory::createInstance(components[m_componentSelect]));
+			}
+			else
+			{
+				nodeData.node->addComponent(Prisma::Factory::createInstance(components[m_componentSelect]));
+			}
 		}
 		if (showData)
 		{