Hotfixes

- Incorporate animation interpolation.
- Fix incorrect / missing animation target.
- Update gltf2cp.
- Use `struct` in forward declarations of `Node` (instead of `class`).

Author: karnkaul

lib/ext/src.zip

@@ -34,7 +34,6 @@ endif()
 
 target_sources(${PROJECT_NAME} PRIVATE
   include/${target_prefix}/scene/animation.hpp
-  include/${target_prefix}/scene/animator.hpp
   include/${target_prefix}/scene/camera.hpp
   include/${target_prefix}/scene/fly_cam.hpp
   include/${target_prefix}/scene/gltf_loader.hpp
@@ -50,7 +49,7 @@ target_sources(${PROJECT_NAME} PRIVATE
   include/${target_prefix}/scene/scene_resources.hpp
   include/${target_prefix}/scene/scene.hpp
 
-  src/animator.cpp
+  src/animation.cpp
   src/camera.cpp
   src/gltf_loader.cpp
   src/material.cpp

lib/scene/CMakeLists.txt

@@ -1,10 +1,22 @@
 #pragma once
-#include <facade/scene/animator.hpp>
 #include <facade/scene/id.hpp>
+#include <facade/scene/interpolator.hpp>
 
 namespace facade {
+struct Node;
+
+struct TransformAnimator {
+	Interpolator<glm::vec3> translation{};
+	Interpolator<glm::quat> rotation{};
+	Interpolator<glm::vec3> scale{};
+	std::optional<Id<Node>> target{};
+
+	float elapsed{};
+
+	void update(Node& out_node, float dt);
+};
+
 struct Animation {
-	Animator animator{};
-	Id<Node> target{};
+	TransformAnimator transform{};
 };
 } // namespace facade

lib/scene/include/facade/scene/animation.hpp

@@ -1,10 +1,9 @@
-#include <facade/scene/animator.hpp>
+#include <facade/scene/animation.hpp>
 #include <facade/scene/node.hpp>
 #include <facade/util/bool.hpp>
-#include <algorithm>
 
 namespace facade {
-void Animator::update(Node& out_node, float dt) {
+void TransformAnimator::update(Node& out_node, float dt) {
 	elapsed += dt;
 	auto const duration = std::max({translation.duration(), rotation.duration(), scale.duration()});
 	if (auto const p = translation(elapsed)) { out_node.transform.set_position(*p); }

lib/scene/include/facade/scene/animator.hpp

@@ -207,12 +207,14 @@ Animation to_animation(gltf2cpp::Animation const& animation, std::span<gltf2cpp:
 	auto ret = Animation{};
 	for (auto const& channel : animation.channels) {
 		auto const& sampler = animation.samplers[channel.sampler];
+		if (sampler.interpolation == gltf2cpp::Interpolation::eCubicSpline) { continue; } // facade constraint
 		auto const& input = accessors[sampler.input];
 		assert(input.type == gltf2cpp::Accessor::Type::eScalar && input.component_type == gltf2cpp::ComponentType::eFloat);
 		auto times = std::get<gltf2cpp::Accessor::Float>(input.data).span();
 		auto const& output = accessors[sampler.output];
 		assert(output.component_type == gltf2cpp::ComponentType::eFloat);
 		auto const values = std::get<gltf2cpp::Accessor::Float>(output.data).span();
+		ret.transform.target = channel.target.node;
 		switch (channel.target.path) {
 		case Path::eTranslation:
 		case Path::eScale: {
@@ -221,9 +223,11 @@ Animation to_animation(gltf2cpp::Animation const& animation, std::span<gltf2cpp:
 			vec.resize(values.size() / 3);
 			std::memcpy(vec.data(), values.data(), values.size_bytes());
 			if (channel.target.path == Path::eScale) {
-				ret.animator.scale = make_interpolator<glm::vec3>(times, vec);
+				ret.transform.scale = make_interpolator<glm::vec3>(times, vec);
+				ret.transform.scale.interpolation = static_cast<Interpolation>(sampler.interpolation);
 			} else {
-				ret.animator.translation = make_interpolator<glm::vec3>(times, vec);
+				ret.transform.translation = make_interpolator<glm::vec3>(times, vec);
+				ret.transform.translation.interpolation = static_cast<Interpolation>(sampler.interpolation);
 			}
 			break;
 		}
@@ -232,7 +236,8 @@ Animation to_animation(gltf2cpp::Animation const& animation, std::span<gltf2cpp:
 			auto vec = std::vector<glm::quat>{};
 			vec.resize(values.size() / 4);
 			std::memcpy(vec.data(), values.data(), values.size_bytes());
-			ret.animator.rotation = make_interpolator<glm::quat>(times, vec);
+			ret.transform.rotation = make_interpolator<glm::quat>(times, vec);
+			ret.transform.rotation.interpolation = static_cast<Interpolation>(sampler.interpolation);
 			break;
 		}
 		case Path::eWeights: {

lib/scene/src/animator.cpp renamed to lib/scene/src/animation.cpp

@@ -159,8 +159,9 @@ Texture Scene::make_texture(Image::View image) const { return Texture{m_gfx, def
 
 void Scene::tick(float dt) {
 	for (auto& animation : m_storage.resources.animations.view()) {
-		assert(animation.target < m_storage.resources.nodes.size());
-		animation.animator.update(m_storage.resources.nodes[animation.target], dt);
+		if (!animation.transform.target) { continue; }
+		assert(*animation.transform.target < m_storage.resources.nodes.size());
+		animation.transform.update(m_storage.resources.nodes[*animation.transform.target], dt);
 	}
 }