xiaoqi
/
ModelCompiler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary params in FetchChannelKeyFrame function

This commit is contained in:
Xiao Qi 2023-03-02 15:15:03 +08:00
parent acbf67f2a8
commit 29b553ba0a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Libraries/MeshCompiler.h
View File

@ -56,7 +56,7 @@ namespace SH_COMP
static void FetchData(int accessorID, std::vector<T>& dst);
template<typename T>
static void FetchChannelKeyFrame(int targetNode, int inputAcc, int outputAcc, int nodeTarget, std::vector<T>& dst);
static void FetchChannelKeyFrame(int inputAcc, int outputAcc, std::vector<T>& dst);
public:
static inline void LoadAndCompile(AssetPath path) noexcept;
};

10
src/Libraries/MeshCompiler.hpp
View File

@ -176,7 +176,7 @@ namespace SH_COMP
}
template <typename T>
void MeshCompiler::FetchChannelKeyFrame(int targetNode, int inputAcc, int outputAcc, int nodeTarget, std::vector<T>& dst)
void MeshCompiler::FetchChannelKeyFrame(int inputAcc, int outputAcc, std::vector<T>& dst)
{
// ONLY ALLOW THIS FUNCTION TO BE USED ON KEY DATA STRUCT
static_assert(std::derived_from<T, KeyBase> == true);
@ -194,7 +194,7 @@ namespace SH_COMP
dst.begin(),
[](float const& time, SHVec4 const& value)->T
{
return { time, {value.x, value.y, value.z} };
return { time, value };
}
);
}
@ -259,11 +259,11 @@ namespace SH_COMP
anim.nodes.resize(channel.target_node + 1);
if (channel.target_path == TRANSLATION_PATH.data())
FetchChannelKeyFrame(channel.target_node, sampler.input, sampler.output, channel.target_node, anim.nodes[channel.target_node].positionKeys);
FetchChannelKeyFrame(sampler.input, sampler.output, anim.nodes[channel.target_node].positionKeys);
else if (channel.target_path == SCALE_PATH.data())
FetchChannelKeyFrame(channel.target_node, sampler.input, sampler.output, channel.target_node, anim.nodes[channel.target_node].scaleKeys);
FetchChannelKeyFrame(sampler.input, sampler.output, anim.nodes[channel.target_node].scaleKeys);
else if (channel.target_path == ROTATION_PATH.data())
FetchChannelKeyFrame(channel.target_node, sampler.input, sampler.output, channel.target_node, anim.nodes[channel.target_node].rotationKeys);
FetchChannelKeyFrame(sampler.input, sampler.output, anim.nodes[channel.target_node].rotationKeys);
anim.nodes[channel.target_node].interpolation =
sampler.interpolation == LINEAR_INTERPOLATION.data() ? AnimationInterpolation::LINEAR :