paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Forbids using more than 64 bones for GPU skinning.

Browse Source 
Commented By: Stan
Differential Revision: https://code.wildfiregames.com/D4244
This was SVN commit r26067.
This commit is contained in:
Vladislav Belov 2021-12-13 19:22:27 +00:00
parent 044346cf62
commit f28efbaa87
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/collada/PSAConvert.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2018 Wildfire Games.
/* Copyright (C) 2021 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -90,7 +90,9 @@ public:
REQUIRE(frameCount > 0, "animation must have frames");
// (TODO: sort out the timing/looping problems)
size_t boneCount = skeleton.GetBoneCount();
const size_t boneCount = skeleton.GetBoneCount();
if (boneCount > 64)
Log(LOG_ERROR, "Skeleton has too many bones %zu/64", boneCount);
std::vector<BoneTransform> boneTransforms;
@ -99,7 +101,7 @@ public:
float time = timeStart + frameLength * frame;
BoneTransform boneDefault = { { 0, 0, 0 }, { 0, 0, 0, 1 } };
std::vector<BoneTransform> frameBoneTransforms (boneCount, boneDefault);
std::vector<BoneTransform> frameBoneTransforms(boneCount, boneDefault);
// Move the model into the new animated pose
// (We can't tell exactly which nodes should be animated, so

7
source/renderer/InstancingModelRenderer.cpp
View File

@ -78,6 +78,13 @@ IModelDef::IModelDef(const CModelDefPtr& mdef, bool gpuSkinning, bool calculateT
if (gpuSkinning)
{
// We can't use a lot of bones because it costs uniform memory. Recommended
// number of bones per model is 32.
// Add 1 to NumBones because of the special 'root' bone.
if (mdef->GetNumBones() + 1 > 64)
LOGERROR("Model '%s' has too many bones %zu/64", mdef->GetName().string8().c_str(), mdef->GetNumBones() + 1);
ENSURE(mdef->GetNumBones() + 1 <= 64);
m_BlendJoints.type = GL_UNSIGNED_BYTE;
m_BlendJoints.elems = 4;
m_Array.AddAttribute(&m_BlendJoints);