diff --git a/gr2/include/gr2_render/gr2_render.h b/gr2/include/gr2_render/gr2_render.h index b30d044..9f69cec 100644 --- a/gr2/include/gr2_render/gr2_render.h +++ b/gr2/include/gr2_render/gr2_render.h @@ -73,7 +73,7 @@ public: void SetAttachmentAnimated(const std::string& bone_name, bool animated); void SetAttachmentScale(const std::string& bone_name, float sx, float sy, float sz); void SetSkin(const std::string& src_file_name, const std::string& dst_file_name); - void ClearSkins() { m_skins.clear(); } + void ClearSkins() { m_skins.clear(); ++m_skinGeneration; } const std::string& GetFilePath() const { return m_filepath; } // Build draw commands for this model and all attached components (weapons, hair, armor parts) @@ -101,6 +101,12 @@ private: float scale[3] = {1.0f, 1.0f, 1.0f}; }; std::vector m_gpuMain, m_gpuParts; + // The GPU caches hold skinned texture names; the unskinned originals are kept so a skin change + // (SetSkin/ClearSkins bump m_skinGeneration) re-resolves them once instead of every frame. + std::vector m_gpuMainBaseTex, m_gpuPartsBaseTex; + size_t m_gpuMainSkinGen = 0, m_gpuPartsSkinGen = 0, m_skinGeneration = 1; + void CacheGpuDraws(std::vector& cache, std::vector& base, size_t& gen, const std::vector& draws) const; + void RefreshGpuSkins(std::vector& cache, const std::vector& base, size_t& gen) const; const gr2::Skeleton* m_gpuPartParent = nullptr; size_t m_gpuPartPaletteSize = 0; // Part bone -> parent bone by name, and the parent bind world per part bone; both depend only diff --git a/gr2/src_render/gr2_model_instance.cpp b/gr2/src_render/gr2_model_instance.cpp index d28f7b5..acb6a35 100644 --- a/gr2/src_render/gr2_model_instance.cpp +++ b/gr2/src_render/gr2_model_instance.cpp @@ -289,6 +289,25 @@ void Gr2ModelInstance::SetAttachmentScale(const std::string& bone_name, float sx void Gr2ModelInstance::SetSkin(const std::string& src_file_name, const std::string& dst_file_name) { m_skins[SkinKey(src_file_name)] = dst_file_name; + ++m_skinGeneration; +} + +void Gr2ModelInstance::CacheGpuDraws(std::vector& cache, std::vector& base, size_t& gen, + const std::vector& draws) const { + cache = draws; + base.clear(); + base.reserve(cache.size()); + for (const auto& draw : cache) base.push_back(draw.texture0); + gen = 0; // skins are applied on the first cache hit +} + +void Gr2ModelInstance::RefreshGpuSkins(std::vector& cache, const std::vector& base, size_t& gen) const { + if (gen == m_skinGeneration) return; + for (size_t i = 0; i < cache.size() && i < base.size(); ++i) { + auto it = m_skins.empty() ? m_skins.end() : m_skins.find(SkinKey(base[i])); + cache[i].texture0 = it != m_skins.end() ? it->second : base[i]; + } + gen = m_skinGeneration; } void Gr2ModelInstance::ApplySkins(std::vector& draws, size_t first) const { @@ -352,7 +371,9 @@ std::vector Gr2ModelInstance::BuildDrawCommandsWithPalette(const st if(world_matrix)MultiplyMat4(R_GRANNY_TO_ENGINE,world_matrix,cachedWorld); else std::copy_n(R_GRANNY_TO_ENGINE,16,cachedWorld); if(m_gpuPartParent!=parent_skeleton || m_gpuPartPaletteSize!=part_skin_matrices.size()){m_gpuParts.clear();m_gpuPartParent=parent_skeleton;m_gpuPartPaletteSize=part_skin_matrices.size();} - if(hardwareSkinning && !m_gpuParts.empty()) { + const bool cachedParts=hardwareSkinning && !m_gpuParts.empty(); + if(cachedParts) { + RefreshGpuSkins(m_gpuParts,m_gpuPartsBaseTex,m_gpuPartsSkinGen); draws=m_gpuParts;UpdateGpuDraws(draws,cachedWorld,part_skin_matrices); } else { for (const auto& mesh : info.meshes) { @@ -549,10 +570,10 @@ std::vector Gr2ModelInstance::BuildDrawCommandsWithPalette(const st } if(hardwareSkinning) { for(auto& draw:draws){draw.gpu_skinning=!part_skin_matrices.empty();if(!draw.geometry)draw=ShareGpuMesh(std::move(draw));} - m_gpuParts=draws;UpdateGpuDraws(draws,cachedWorld,part_skin_matrices); + CacheGpuDraws(m_gpuParts,m_gpuPartsBaseTex,m_gpuPartsSkinGen,draws);UpdateGpuDraws(draws,cachedWorld,part_skin_matrices); } } - ApplySkins(draws, 0); + if(!cachedParts)ApplySkins(draws, 0); return draws; } @@ -571,7 +592,9 @@ std::vector Gr2ModelInstance::BuildDrawCommands(float animation_tim float cachedWorld[16]; if(world_matrix)MultiplyMat4(R_GRANNY_TO_ENGINE,world_matrix,cachedWorld); else std::copy_n(R_GRANNY_TO_ENGINE,16,cachedWorld); - if(hardwareSkinning && !m_gpuMain.empty()) { + const bool cachedMain=hardwareSkinning && !m_gpuMain.empty(); + if(cachedMain) { + RefreshGpuSkins(m_gpuMain,m_gpuMainBaseTex,m_gpuMainSkinGen); draws=m_gpuMain;UpdateGpuDraws(draws,cachedWorld,skin_matrices); } else { for (const auto& mesh : info.meshes) { @@ -735,10 +758,10 @@ std::vector Gr2ModelInstance::BuildDrawCommands(float animation_tim if(hardwareSkinning) { for(auto& draw:draws){draw.gpu_skinning=!skin_matrices.empty();if(!draw.geometry)draw=ShareGpuMesh(std::move(draw));} - m_gpuMain=draws;UpdateGpuDraws(draws,cachedWorld,skin_matrices); + CacheGpuDraws(m_gpuMain,m_gpuMainBaseTex,m_gpuMainSkinGen,draws);UpdateGpuDraws(draws,cachedWorld,skin_matrices); } } - ApplySkins(draws, 0); + if(!cachedMain)ApplySkins(draws, 0); // 2. Build attached skinning parts (e.g. hair, armor) using current skin matrices for (const auto& part : m_attached_parts) {