livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review fix from davep - use booling or operator and not binary one 

Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog
master
Roxie Linden 2010-12-30 22:08:25 -08:00
parent 842dcb7e42
commit ca9df698db
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llcamera.cpp
View File

@ -377,7 +377,7 @@ int LLCamera::sphereInFrustum(const LLVector3 &sphere_center, const F32 radius)
{
return 0;
}
res |= (d > -radius);
res = res || (d > -radius);
}
}

2
indra/newview/llfloatermodelpreview.cpp
View File

@ -2055,6 +2055,7 @@ U32 LLModelPreview::calcResourceCost()
F32 debug_scale = mFMP->childGetValue("import_scale").asReal();
F32 streaming_cost = 0.f;
F32 physics_cost = 0.f;
for (U32 i = 0; i < mUploadData.size(); ++i)
{
LLModelInstance& instance = mUploadData[i];
@ -2109,6 +2110,7 @@ U32 LLModelPreview::calcResourceCost()
//mFMP->childSetTextArg(info_name[LLModel::LOD_PHYSICS], "[HULLS]", llformat("%d",num_hulls));
//mFMP->childSetTextArg(info_name[LLModel::LOD_PHYSICS], "[POINTS]", llformat("%d",num_points));
mFMP->childSetTextArg("streaming cost", "[COST]", llformat("%.3f", streaming_cost));
mFMP->childSetTextArg("physics cost", "[COST]", llformat("%.3f", physics_cost));
F32 scale = mFMP->childGetValue("import_scale").asReal()*2.f;
mFMP->childSetTextArg("import_dimensions", "[X]", llformat("%.3f", mPreviewScale[0]*scale));
mFMP->childSetTextArg("import_dimensions", "[Y]", llformat("%.3f", mPreviewScale[1]*scale));

7
indra/newview/llvovolume.cpp
View File

@ -4384,12 +4384,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
LLFastTimer t(FTM_VOLUME_GEOM_PARTIAL);
LLDrawable* drawablep = *drawable_iter;
if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) )
{
continue;
}
if (drawablep->isState(LLDrawable::REBUILD_ALL))
if (!drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) )
{
LLVOVolume* vobj = drawablep->getVOVolume();
vobj->preRebuild();

2
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -69,7 +69,7 @@
Resource Cost: [COST]
</text>
<text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">
Physics Cost: Unknown
Physics Cost: [COST]
</text>
<text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">
Upload Fee: N/A