Added progress bar

deni2312 · May 4, 2024 · c12e7d4 · c12e7d4
1 parent 23709f3
commit c12e7d4
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 12 deletions.
diff --git a/Engine/include/SceneData/Animation.h b/Engine/include/SceneData/Animation.h
@@ -38,8 +38,10 @@ namespace Prisma {
 		float GetDuration() { return m_Duration; }
 		const AssimpNodeData& GetRootNode() { return m_RootNode; }
 		const std::map<std::string, Prisma::BoneInfo>& GetBoneIDMap() const;
+		std::string name() const;
 
 	private:
+		std::string m_animationPath;
 		void ReadMissingBones(const aiAnimation* animation, std::shared_ptr<Prisma::AnimatedMesh> model);
 		glm::mat4 m_inverseTransform;
 		void ReadHierarchyData(AssimpNodeData& dest, const aiNode* src);

diff --git a/Engine/include/SceneData/Animator.h b/Engine/include/SceneData/Animator.h
@@ -21,6 +21,10 @@ namespace Prisma {
 
 		void mesh(Prisma::Node* mesh);
 
+		std::shared_ptr<Animation> animation();
+
+		float currentTime() const;
+
 	private:
 		std::shared_ptr<Animation> m_CurrentAnimation;
 

diff --git a/Engine/src/Handlers/AnimationHandler.cpp b/Engine/src/Handlers/AnimationHandler.cpp
@@ -25,13 +25,17 @@ std::vector<Prisma::AnimationHandler::SSBOAnimation>& Prisma::AnimationHandler::
 
 Prisma::AnimationHandler::AnimationHandler()
 {
-
 	m_ssboAnimation = std::make_shared<SSBO>(8);
 	m_ssboAnimation->resize(sizeof(SSBOAnimation)*MAX_ANIMATION_MESHES);
 	m_animations.resize(MAX_ANIMATION_MESHES);
+	for (int i = 0; i < m_animations.size(); i++) {
+		for (int j = 0; j < MAX_BONES; j++) {
+			m_animations[i].animations[j] = glm::mat4(1.0f);
+		}
+	}
 }
 
-inline void Prisma::AnimationHandler::copyMatrices(SSBOAnimation& animation, std::vector<glm::mat4>& animationsData) {
+void Prisma::AnimationHandler::copyMatrices(SSBOAnimation& animation, std::vector<glm::mat4>& animationsData) {
 	for (int i = 0; i < animationsData.size(); i++) {
 		animation.animations[i] = animationsData[i];
 	}

diff --git a/Engine/src/SceneData/Animation.cpp b/Engine/src/SceneData/Animation.cpp
@@ -1,6 +1,6 @@
 #include "../../include/SceneData/Animation.h"
 
-Prisma::Animation::Animation(const std::string& animationPath, std::shared_ptr<Prisma::AnimatedMesh> model)
+Prisma::Animation::Animation(const std::string& animationPath, std::shared_ptr<Prisma::AnimatedMesh> model):m_animationPath{animationPath}
 {
 	Assimp::Importer importer;
 	const aiScene* scene = importer.ReadFile(animationPath, aiProcess_Triangulate);
@@ -27,6 +27,10 @@ const std::map<std::string, Prisma::BoneInfo>& Prisma::Animation::GetBoneIDMap()
 	return m_BoneInfoMap;
 }
 
+std::string Prisma::Animation::name() const {
+	return m_animationPath;
+}
+
 void Prisma::Animation::ReadMissingBones(const aiAnimation* animation, std::shared_ptr<Prisma::AnimatedMesh> model)
 {
 	int size = animation->mNumChannels;

diff --git a/Engine/src/SceneData/Animator.cpp b/Engine/src/SceneData/Animator.cpp
@@ -56,6 +56,14 @@ void Prisma::Animator::mesh(Node* mesh) {
 	m_mesh = mesh;
 }
 
+std::shared_ptr<Prisma::Animation> Prisma::Animator::animation() {
+	return m_CurrentAnimation;
+}
+
+float Prisma::Animator::currentTime() const {
+	return m_CurrentTime;
+}
+
 int Prisma::Animator::findUUID()
 {
 	auto meshes = currentGlobalScene->animateMeshes;

diff --git a/GUI/include/ImGuiStyle.h b/GUI/include/ImGuiStyle.h
@@ -51,7 +51,7 @@ namespace Prisma {
 			//colors[ImGuiCol_DockingEmptyBg] = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
 			colors[ImGuiCol_PlotLines] = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
 			colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
-			colors[ImGuiCol_PlotHistogram] = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
+			colors[ImGuiCol_PlotHistogram] = ImVec4(0.4f, 1.00f, 0.4f, 1.00f);
 			colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
 			colors[ImGuiCol_TableHeaderBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.52f);
 			colors[ImGuiCol_TableBorderStrong] = ImVec4(0.00f, 0.00f, 0.00f, 0.52f);

diff --git a/GUI/src/MeshInfo.cpp b/GUI/src/MeshInfo.cpp
@@ -38,7 +38,7 @@ void Prisma::MeshInfo::drawGizmo(Prisma::MeshInfo::MeshData meshData) {
 }
 
 void Prisma::MeshInfo::showSelected(Prisma::MeshInfo::MeshData meshData) {
-    if(meshData.mesh) {
+    if (meshData.mesh) {
 
         float windowWidth = meshData.translate * meshData.width / 2.0f;
         auto nextRight = [&](float pos) {
@@ -64,9 +64,9 @@ void Prisma::MeshInfo::showSelected(Prisma::MeshInfo::MeshData meshData) {
 
 
 
-        ImGui::InputFloat3("Translation",glm::value_ptr(m_translation),"%.3f", ImGuiInputTextFlags_ReadOnly);
+        ImGui::InputFloat3("Translation", glm::value_ptr(m_translation), "%.3f", ImGuiInputTextFlags_ReadOnly);
 
-        ImGui::InputFloat3("Rotation",glm::value_ptr(m_rotation), "%.3f", ImGuiInputTextFlags_ReadOnly);
+        ImGui::InputFloat3("Rotation", glm::value_ptr(m_rotation), "%.3f", ImGuiInputTextFlags_ReadOnly);
 
         ImGui::InputFloat3("Scale", glm::value_ptr(m_scale), "%.3f", ImGuiInputTextFlags_ReadOnly);
 
@@ -80,10 +80,22 @@ void Prisma::MeshInfo::showSelected(Prisma::MeshInfo::MeshData meshData) {
         if (mass <= 0.0) {
             drawGizmo(meshData);
         }
-
+        auto isAnimate = dynamic_cast<AnimatedMesh*>(meshData.mesh);
+        if (isAnimate) {
+            auto animator = isAnimate->animator();
+            auto animation = animator->animation();
+            auto getLast = [](std::string s) {
+                size_t found = s.find_last_of('/');
+                return found != std::string::npos ? s.substr(found + 1) : s;
+            };
+            auto name = getLast(animation->name());
+            ImGui::Text("%s", name.c_str());
+            float current = animator->currentTime()/animation->GetDuration()*100;
+            //ImGui::ProgressBar(current);
+            ImGui::SliderFloat("Slider", &current, 0.0f, 100.0f); // Slider for float value between 0 and 1
+        }
         ImGui::Dummy(ImVec2(0.0f, 10.0f));
         showComponents(meshData);
-
         ImGui::End();
     }
 }

diff --git a/UserEngine/src/UserEngine.cpp b/UserEngine/src/UserEngine.cpp
@@ -94,9 +94,6 @@ bool UserEngine::update()
         light->type(type);
     }
 
-    animator->UpdateAnimation(deltaTime);
-    animator1->UpdateAnimation(deltaTime);
-
 
     return false;
 }