Merge pull request #1050 from MihailRis/fix-animation

fix animation & disable codegen trace
This commit is contained in:
MihailRis 2026-10-18 13:26:24 +03:00 • committed by GitHub
commit b985eed66a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 43 additions and 13 deletions

View file

@ -56,7 +56,7 @@ local M = {
MAX_DURATION = 1e9,
MAX_FRAMES = 1e9,
TRACE_CODEGEN = true,
TRACE_CODEGEN = false,
maths = {
bezier_interpolation = bezier_interpolation

View file

@ -259,7 +259,7 @@ end
local function codegen_rig_target(raw_track, context)
local code = "\n if target.set_matrix and target.index then\n"
for bone, lineset in pairs(raw_track.linesets) do
if lineset.target_type ~= "bone" and lineset.target_type ~= "texture" then
if lineset.target_type ~= "bone" then
goto continue
end
local lineset_code = codegen_track(raw_track, lineset, context.keysets, true, "bone")
@ -270,7 +270,7 @@ local function codegen_rig_target(raw_track, context)
end
code = code
.. "\n do" .. lineset_code .. "\n end\n"
if lineset.target_type == "bone" and context.has_tsf then
if context.has_tsf then
code = code ..
" target:set_matrix(bone_index, dst)\n"
end
@ -309,14 +309,14 @@ local function codegen_native_rig_target(raw_track, context, track_name)
end
for bone, lineset in pairs(raw_track.linesets) do
if lineset.target_type ~= "bone" and lineset.target_type ~= "texture" then
if lineset.target_type ~= "bone" then
goto continue
end
local lineset_code = codegen_track(
raw_track, lineset, context.memoised, context.keysets, false)
raw_track, lineset, context.keysets, false, "bone")
local exported = {}
local entry = {name = bone}
if lineset.target_type == "bone" then
do
local channels = {
[animation.CH_TRANSLATE] = {},
[animation.CH_ROTATE] = {},
@ -381,14 +381,30 @@ local function codegen_native_rig_target(raw_track, context, track_name)
return "\n if target.__native_rig then" .. code
end
local function codegen_object_target(raw_track, context)
local code = " local dst = mat4.idt()\n"
local lineset = raw_track.linesets[""]
if not lineset then
local function codegen_texture_target(raw_track, context)
local code = ""
for _, lineset in pairs(raw_track.linesets) do
if lineset.target_type == "texture" then
code = code .. "\n do"
.. codegen_track(raw_track, lineset, context.keysets, false, "texture")
.. "\n end\n"
end
end
if #code == 0 then
return ""
end
return "\n if target.set_texture then" .. code .. " end\n"
end
local function codegen_object_target(raw_track, context)
local code = codegen_texture_target(raw_track, context)
local lineset = raw_track.linesets[""]
if not lineset then
return code
end
local lineset_code = codegen_track(raw_track, lineset, context.keysets, true)
code = code .. "\n do" .. lineset_code .. "\n end\n"
code = code .. " local dst = mat4.idt()\n"
.. "\n do" .. lineset_code .. "\n end\n"
if context.has_tsf then
code = code .. " set_matrix(target, dst)\n"

View file

@ -224,6 +224,7 @@ void AssetsLoader::processPreloadList(AssetType tag, const dv::value& list) {
void AssetsLoader::processPreloadConfig(const io::path& file) {
auto root = io::read_json(file);
processPreloadList(AssetType::ANIMATION, root["animations"]);
processPreloadList(AssetType::ANIMATION, root["animation"]);
processPreloadList(AssetType::ATLAS, root["atlases"]);
processPreloadList(AssetType::FONT, root["fonts"]);

View file

@ -44,6 +44,18 @@ static bool load_animated_texture(
Atlas* dstAtlas
);
static io::path find_animation(const ResPaths& paths, const std::string& filename) {
auto path = paths.find(filename + ".vca");
const auto prefix = ANIMATION_FOLDER + "/";
if (io::is_regular_file(path) || filename.rfind(prefix, 0) != 0) {
return path;
}
auto alias = paths.find(
ANIMATION_FOLDER_ALIAS + "/" + filename.substr(prefix.length()) + ".vca"
);
return io::is_regular_file(alias) ? alias : path;
}
assetload::postfunc assetload::animation(
AssetsLoader& loader,
const ResPaths& paths,
@ -51,7 +63,7 @@ assetload::postfunc assetload::animation(
const std::string& name,
const std::shared_ptr<AssetCfg>&
) {
auto path = paths.find(filename + ".vca");
auto path = find_animation(paths, filename);
loader.attachToFile(path, {name, AssetType::ANIMATION});
if (io::is_regular_file(path)) {

View file

@ -75,7 +75,8 @@ inline constexpr int DEFAULT_FONT_SIZE = 16;
inline constexpr int DEFAULT_PRE_RENDER_FONT_PAGES = 1; // must be at least 1
inline const std::string ANIMATION_FOLDER = "animation";
inline const std::string ANIMATION_FOLDER = "animations";
inline const std::string ANIMATION_FOLDER_ALIAS = "animation";
inline const std::string FONTS_FOLDER = "fonts";
inline const std::string LAYOUTS_FOLDER = "layouts";
inline const std::string MODELS_FOLDER = "models";