Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further LLControlAvatar sync with Alchemy

Browse Source
This commit is contained in:
Liru Færs
2020-01-05 15:41:22 -05:00
parent 1fbfc498bf
commit 2117c66c9a
1 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
indra/newview/llcontrolavatar.cpp
View File

@@ -372,59 +372,60 @@ void LLControlAvatar::updateDebugText()
for (auto volp : volumes) for (auto volp : volumes)
{ {
S32 verts = 0; S32 verts = 0;
total_tris += volp->getTriangleCount(&verts); total_tris += volp->getTriangleCount(&verts);
total_verts += verts; total_verts += verts;
est_tris += volp->getEstTrianglesMax(); est_tris += volp->getEstTrianglesMax();
est_streaming_tris += volp->getEstTrianglesStreamingCost(); est_streaming_tris += volp->getEstTrianglesStreamingCost();
streaming_cost += volp->getStreamingCost(); streaming_cost += volp->getStreamingCost();
lod_string += llformat("%d",volp->getLOD()); lod_string += llformat("%d", volp->getLOD());
if (volp && volp->mDrawable) if (volp->mDrawable)
{
bool is_animated_flag = volp->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
if (is_animated_flag)
{ {
animated_object_flag_string += "1"; bool is_animated_flag = volp->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
if (is_animated_flag)
{
animated_object_flag_string += "1";
}
else
{
animated_object_flag_string += "0";
}
if (volp->mDrawable->isActive())
{
active_string += "A";
}
else
{
active_string += "S";
}
if (volp->isRiggedMesh())
{
// Rigged/animatable mesh
type_string += "R";
lod_radius = volp->mLODRadius;
}
else if (volp->isMesh())
{
// Static mesh
type_string += "M";
}
else
{
// Any other prim
type_string += "P";
}
if (cam_dist_count < 4)
{
cam_dist_string += LLStringOps::getReadableNumber(volp->mLODDistance) + "/" +
LLStringOps::getReadableNumber(volp->mLODAdjustedDistance) + " ";
cam_dist_count++;
}
} }
else else
{ {
animated_object_flag_string += "0"; active_string += "-";
type_string += "-";
} }
if (volp->mDrawable->isActive())
{
active_string += "A";
}
else
{
active_string += "S";
}
if (volp->isRiggedMesh())
{
// Rigged/animatable mesh
type_string += "R";
lod_radius = volp->mLODRadius;
}
else if (volp->isMesh())
{
// Static mesh
type_string += "M";
}
else
{
// Any other prim
type_string += "P";
}
if (cam_dist_count < 4)
{
cam_dist_string += LLStringOps::getReadableNumber(volp->mLODDistance) + "/" +
LLStringOps::getReadableNumber(volp->mLODAdjustedDistance) + " ";
cam_dist_count++;
}
}
else
{
active_string += "-";
type_string += "-";
} }
} }
addDebugText(llformat("CAV obj %d anim %d active %s impost %d upprd %d strcst %f", addDebugText(llformat("CAV obj %d anim %d active %s impost %d upprd %d strcst %f",
@@ -505,9 +506,10 @@ void LLControlAvatar::updateAnimations()
{ {
LLVOVolume *volp = *vol_it; LLVOVolume *volp = *vol_it;
//LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL; //LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL;
signaled_animation_map_t& signaled_animations = LLObjectSignaledAnimationMap::instance().getMap()[volp->getID()]; auto& signaled_anim_map = LLObjectSignaledAnimationMap::instance().getMap();
for (auto anim_it = signaled_animations.begin(); signaled_animation_map_t& signaled_animations = signaled_anim_map[volp->getID()];
anim_it != signaled_animations.end(); for (auto anim_it = signaled_animations.begin(), anim_it_end = signaled_animations.end();
anim_it != anim_it_end;
++anim_it) ++anim_it)
{ {
auto found_anim_it = anims.find(anim_it->first); auto found_anim_it = anims.find(anim_it->first);