From d32c247cc0bf86e3e6745cfb2b96cd54d836097e Mon Sep 17 00:00:00 2001
From: Martin Felis <martin@fysx.org>
Date: Fri, 11 Apr 2025 13:03:38 +0200
Subject: [PATCH] Cleaned up includes.

---
 src/AnimGraph/AnimGraphBlendTree.h     |  1 +
 src/AnimGraph/AnimGraphData.h          |  1 -
 src/AnimGraph/AnimGraphResource.h      |  2 ++
 src/{ => AnimGraph}/SyncTrack.cc       |  4 ----
 src/AnimGraphEditor/AnimGraphEditor.cc |  1 +
 src/SkinnedMesh.cc                     |  7 +++++--
 src/SkinnedMesh.h                      | 10 +---------
 src/SkinnedMeshResource.cc             |  1 +
 src/SkinnedMeshResource.h              |  2 +-
 tests/SyncTrackTests.cc                |  2 +-
 10 files changed, 13 insertions(+), 18 deletions(-)
 rename src/{ => AnimGraph}/SyncTrack.cc (61%)

diff --git a/src/AnimGraph/AnimGraphBlendTree.h b/src/AnimGraph/AnimGraphBlendTree.h
index a1d2f49..3d1ffa6 100644
--- a/src/AnimGraph/AnimGraphBlendTree.h
+++ b/src/AnimGraph/AnimGraphBlendTree.h
@@ -6,6 +6,7 @@
 #define ANIMTESTBED_ANIMGRAPHBLENDTREE_H
 
 #include <algorithm>
+#include <iostream>
 
 #include "AnimNode.h"
 
diff --git a/src/AnimGraph/AnimGraphData.h b/src/AnimGraph/AnimGraphData.h
index 262c000..d5bd19a 100644
--- a/src/AnimGraph/AnimGraphData.h
+++ b/src/AnimGraph/AnimGraphData.h
@@ -8,7 +8,6 @@
 #include <ozz/base/maths/soa_transform.h>
 
 #include <cstring>
-#include <iostream>
 #include <list>
 #include <map>
 #include <string>
diff --git a/src/AnimGraph/AnimGraphResource.h b/src/AnimGraph/AnimGraphResource.h
index 8215c56..ccb0308 100644
--- a/src/AnimGraph/AnimGraphResource.h
+++ b/src/AnimGraph/AnimGraphResource.h
@@ -5,6 +5,8 @@
 #ifndef ANIMTESTBED_ANIMGRAPHRESOURCE_H
 #define ANIMTESTBED_ANIMGRAPHRESOURCE_H
 
+#include <iostream>
+
 #include "3rdparty/json/json.hpp"
 #include "AnimGraphNodes.h"
 
diff --git a/src/SyncTrack.cc b/src/AnimGraph/SyncTrack.cc
similarity index 61%
rename from src/SyncTrack.cc
rename to src/AnimGraph/SyncTrack.cc
index 329b5d3..12869a4 100644
--- a/src/SyncTrack.cc
+++ b/src/AnimGraph/SyncTrack.cc
@@ -3,7 +3,3 @@
 //
 
 #include "SyncTrack.h"
-
-#include <imgui.h>
-
-#include <sstream>
diff --git a/src/AnimGraphEditor/AnimGraphEditor.cc b/src/AnimGraphEditor/AnimGraphEditor.cc
index d6e9669..817d836 100644
--- a/src/AnimGraphEditor/AnimGraphEditor.cc
+++ b/src/AnimGraphEditor/AnimGraphEditor.cc
@@ -15,6 +15,7 @@
 #include "imnodes.h"
 #include "misc/cpp/imgui_stdlib.h"
 #include "nfd.h"
+#include "ozz/base/log.h"
 #include "src/AnimGraph/AnimGraphResource.h"
 
 struct EditorState {
diff --git a/src/SkinnedMesh.cc b/src/SkinnedMesh.cc
index 03a3feb..995c369 100644
--- a/src/SkinnedMesh.cc
+++ b/src/SkinnedMesh.cc
@@ -4,9 +4,13 @@
 
 #include "SkinnedMesh.h"
 
-#include <HandmadeMath.h>
 #include <imgui.h>
 
+#include "ozz/animation/runtime/local_to_model_job.h"
+#include "ozz/base/io/archive.h"
+#include "ozz/base/io/stream.h"
+#include "ozz/base/log.h"
+
 SkinnedMesh::~SkinnedMesh() {
   while (m_animations.size() > 0) {
     ozz::animation::Animation* animation_ptr =
@@ -98,4 +102,3 @@ void SkinnedMesh::CalcModelMatrices() {
 }
 
 void SkinnedMesh::DrawSkeleton() {}
-
diff --git a/src/SkinnedMesh.h b/src/SkinnedMesh.h
index 4790a72..b502b75 100644
--- a/src/SkinnedMesh.h
+++ b/src/SkinnedMesh.h
@@ -5,21 +5,13 @@
 #ifndef ANIMTESTBED_SKINNEDMESH_H
 #define ANIMTESTBED_SKINNEDMESH_H
 
-// ozz-animation headers
-#include <cmath>   // fmodf
-#include <memory>  // std::unique_ptr, std::make_unique
+#include "AnimGraph/SyncTrack.h"
 
-#include "SyncTrack.h"
 #include "ozz/animation/runtime/animation.h"
-#include "ozz/animation/runtime/local_to_model_job.h"
 #include "ozz/animation/runtime/sampling_job.h"
 #include "ozz/animation/runtime/skeleton.h"
 #include "ozz/base/containers/vector.h"
-#include "ozz/base/io/archive.h"
-#include "ozz/base/io/stream.h"
-#include "ozz/base/log.h"
 #include "ozz/base/maths/soa_transform.h"
-#include "ozz/base/maths/vec_float.h"
 
 struct SkinnedMesh {
   SkinnedMesh() : m_sync_track_override(false), m_override_anim(0.f) {}
diff --git a/src/SkinnedMeshResource.cc b/src/SkinnedMeshResource.cc
index e9caf3f..d447e20 100644
--- a/src/SkinnedMeshResource.cc
+++ b/src/SkinnedMeshResource.cc
@@ -5,6 +5,7 @@
 #include "SkinnedMeshResource.h"
 
 #include <fstream>
+#include <iostream>
 
 #include "3rdparty/json/json.hpp"
 
diff --git a/src/SkinnedMeshResource.h b/src/SkinnedMeshResource.h
index 31d4c71..f96cbfc 100644
--- a/src/SkinnedMeshResource.h
+++ b/src/SkinnedMeshResource.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "SyncTrack.h"
+#include "AnimGraph/SyncTrack.h"
 #include "SkinnedMesh.h"
 
 struct SkinnedMeshResource {
diff --git a/tests/SyncTrackTests.cc b/tests/SyncTrackTests.cc
index 5bdee75..f3fe5c3 100644
--- a/tests/SyncTrackTests.cc
+++ b/tests/SyncTrackTests.cc
@@ -2,7 +2,7 @@
 // Created by martin on 16.11.21.
 //
 
-#include "SyncTrack.h"
+#include "AnimGraph/SyncTrack.h"
 #include "catch.hpp"
 
 TEST_CASE("Basic", "[SyncTrack]") {