Added groups

deni2312 · Feb 4, 2025 · 8e52a58 · 8e52a58
1 parent 6ff45dd
commit 8e52a58
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/Engine/include/GlobalData/GlobalData.h b/Engine/include/GlobalData/GlobalData.h
@@ -56,13 +56,13 @@ namespace Prisma
 
 		void defaultNormal(const Texture& defaultNormal);
 
-		void addGlobalTexture(std::pair<unsigned int, std::string> texture) {
-			m_textures.push_back(texture);
-		}
+		void transparencies(bool transparencies);
 
-		const std::vector<std::pair<unsigned int,std::string>>& globalTextures() {
-			return m_textures;
-		}
+		bool transparencies() const;
+
+		void addGlobalTexture(std::pair<unsigned int, std::string> texture);
+
+		const std::vector<std::pair<unsigned int,std::string>>& globalTextures();
 
 	private:
 		std::shared_ptr<Scene> m_currentGlobalScene;
@@ -74,5 +74,6 @@ namespace Prisma
 		Texture m_defaultBlack;
 		Texture m_defaultWhite;
 		Texture m_defaultNormal;
+		bool m_transparencies = true;
 	};
 }
diff --git a/Engine/src/GlobalData/GlobalData.cpp b/Engine/src/GlobalData/GlobalData.cpp
@@ -79,3 +79,19 @@ void Prisma::GlobalData::defaultNormal(const Texture& defaultNormal)
 {
 	m_defaultNormal = defaultNormal;
 }
+
+void Prisma::GlobalData::transparencies(bool transparencies) {
+	m_transparencies = transparencies;
+}
+
+bool Prisma::GlobalData::transparencies() const {
+	return m_transparencies;
+}
+
+void Prisma::GlobalData::addGlobalTexture(std::pair<unsigned int, std::string> texture) {
+	m_textures.push_back(texture);
+}
+
+const std::vector<std::pair<unsigned int, std::string>>& Prisma::GlobalData::globalTextures() {
+	return m_textures;
+}
diff --git a/Engine/src/SceneData/MeshIndirect.cpp b/Engine/src/SceneData/MeshIndirect.cpp
@@ -34,9 +34,11 @@ void Prisma::MeshIndirect::sort() const
 		m_shaderCopy->setInt(m_indicesCopyLocation, 1);
 		m_shaderCopy->dispatchCompute({ meshes.size(), 1, 1 });
 		m_shaderCopy->wait(GL_COMMAND_BARRIER_BIT | GL_SHADER_STORAGE_BARRIER_BIT);
-		m_shader->use();
-		m_shader->dispatchCompute({1, 1, 1});
-		m_shader->wait(GL_COMMAND_BARRIER_BIT | GL_SHADER_STORAGE_BARRIER_BIT);
+		if (Prisma::GlobalData::getInstance().transparencies()) {
+			m_shader->use();
+			m_shader->dispatchCompute({ 1, 1, 1 });
+			m_shader->wait(GL_COMMAND_BARRIER_BIT | GL_SHADER_STORAGE_BARRIER_BIT);
+		}
 		m_shaderCopy->use();
 		m_shaderCopy->setInt(m_indicesCopyLocation, 2);
 		m_shaderCopy->dispatchCompute({ meshes.size(), 1, 1 });

diff --git a/GUI/include/ImGuiTabs.h b/GUI/include/ImGuiTabs.h
@@ -22,7 +22,7 @@ namespace Prisma
 
 		unsigned int m_maxSize = 0;
 
-		const int m_nextSize = 65;
+		const int m_nextSize = 25;
 
 		int64_t m_current = -1;
 		std::shared_ptr<Prisma::Node> m_parent = nullptr;

diff --git a/GUI/src/ImGuiTabs.cpp b/GUI/src/ImGuiTabs.cpp
@@ -14,11 +14,14 @@ Prisma::ImGuiTabs::ImGuiTabs()
 
 void Prisma::ImGuiTabs::showCurrentNodes(std::shared_ptr<Node> root, int depth, ImGuiCamera& camera)
 {
-	if (root&& m_index<m_maxSize)
+	if (root)
 	{
 		// Iterate through children of the current node
 		for (const auto& child : root->children())
 		{
+			if (m_index >= m_maxSize) {
+				break;
+			}
 			m_index++;
 			// Add spacing based on depth
 			ImGui::Indent(depth * 20.0f); // Indent by 20 pixels per depth level

diff --git a/GUI/src/SettingsTab.cpp b/GUI/src/SettingsTab.cpp
@@ -61,6 +61,12 @@ void Prisma::SettingsTab::drawSettings()
 
 		ImGui::Checkbox("PHYSICS DEBUG", &debugPhysics);
 
+		bool sortTransparencies = Prisma::GlobalData::getInstance().transparencies();
+
+		ImGui::Checkbox("SORT TRANSPARENCIES", &sortTransparencies);
+
+		Prisma::GlobalData::getInstance().transparencies(sortTransparencies);
+
 		Physics::getInstance().debug(debugPhysics);
 
 		Engine::getInstance().engineSettings(settings);