gr2: resolve skins once per skin change on the GPU draw cache
The cached GPU draws keep the skinned texture names and the unskinned originals; SetSkin/ClearSkins bump a generation so the cache re-resolves once instead of lowercasing every texture path every frame. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
9ec7fa10c0
commit
16d16de90d
@@ -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<Gr2MeshDraw>& cache, std::vector<std::string>& base, size_t& gen,
|
||||
const std::vector<Gr2MeshDraw>& 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<Gr2MeshDraw>& cache, const std::vector<std::string>& 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<Gr2MeshDraw>& draws, size_t first) const {
|
||||
@@ -352,7 +371,9 @@ std::vector<Gr2MeshDraw> 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<Gr2MeshDraw> 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<Gr2MeshDraw> 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<Gr2MeshDraw> 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) {
|
||||
|
||||
Reference in New Issue
Block a user