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

Clean up a few harmless compiler warnings (signed/unsigned, double to float)

Browse Source
This commit is contained in:
Shyotl
2014-08-20 19:43:32 -05:00
parent 282de8c7f5
commit e59757e3e8
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llmath.h
View File

@@ -78,7 +78,7 @@ const F32 DEG_TO_RAD = 0.017453292519943295769236907684886f;
const F32 RAD_TO_DEG = 57.295779513082320876798154814105f; const F32 RAD_TO_DEG = 57.295779513082320876798154814105f;
const F32 F_APPROXIMATELY_ZERO = 0.00001f; const F32 F_APPROXIMATELY_ZERO = 0.00001f;
const F32 F_LN10 = 2.3025850929940456840179914546844f; const F32 F_LN10 = 2.3025850929940456840179914546844f;
const F32 OO_LN10 = 0.43429448190325182765112891891661; const F32 OO_LN10 = 0.43429448190325182765112891891661f;
const F32 F_LN2 = 0.69314718056f; const F32 F_LN2 = 0.69314718056f;
const F32 OO_LN2 = 1.4426950408889634073599246810019f; const F32 OO_LN2 = 1.4426950408889634073599246810019f;

2
indra/llmessage/aicurlperservice.cpp
View File

@@ -610,7 +610,7 @@ void AIPerService::purge(void)
per_service_w->mCapabilityType[i].mQueuedRequests.clear(); per_service_w->mCapabilityType[i].mQueuedRequests.clear();
if (is_approved((AICapabilityType)i)) if (is_approved((AICapabilityType)i))
{ {
llassert(total_queued_w->approved >= s); llassert(total_queued_w->approved >= (S32)s);
total_queued_w->approved -= s; total_queued_w->approved -= s;
} }
} }

2
indra/newview/lldrawpoolalpha.cpp
View File

@@ -281,7 +281,7 @@ void LLDrawPoolAlpha::render(S32 pass)
gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
} }
gGL.diffuseColor4f(0.9,0,0,0.4); gGL.diffuseColor4f(0.9f,0.f,0.f,0.4f);
LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f); LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f);
gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ; gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ;

8
indra/newview/llfloaterregionrestarting.cpp
View File

@@ -154,10 +154,10 @@ void LLFloaterRegionRestarting::draw()
if (!alchemyRegionShake || isMinimized()) // If we're minimized, leave the user alone if (!alchemyRegionShake || isMinimized()) // If we're minimized, leave the user alone
return; return;
const F32 SHAKE_INTERVAL = 0.025; const F32 SHAKE_INTERVAL = 0.025f;
const F32 SHAKE_TOTAL_DURATION = 1.8; // the length of the default alert tone for this const F32 SHAKE_TOTAL_DURATION = 1.8f; // the length of the default alert tone for this
const F32 SHAKE_INITIAL_MAGNITUDE = 1.5; const F32 SHAKE_INITIAL_MAGNITUDE = 1.5f;
const F32 SHAKE_HORIZONTAL_BIAS = 0.25; const F32 SHAKE_HORIZONTAL_BIAS = 0.25f;
F32 time_shaking; F32 time_shaking;
if (SHAKE_START == sShakeState) if (SHAKE_START == sShakeState)

2
indra/newview/llviewerjoystick.cpp
View File

@@ -579,7 +579,7 @@ void LLViewerJoystick::cursorSlide(F32 inc)
void LLViewerJoystick::cursorPush(F32 inc) void LLViewerJoystick::cursorPush(F32 inc)
{ {
static F32 prev_inc = 0.f; // Smooth a little. static F32 prev_inc = 0.f; // Smooth a little.
if (!is_approx_zero(0.001)) if (!is_approx_zero(0.001f))
{ {
S32 x, y; S32 x, y;
LLUI::getMousePositionScreen(&x, &y); LLUI::getMousePositionScreen(&x, &y);

8
indra/newview/llviewertexture.cpp
View File

@@ -757,8 +757,8 @@ void LLViewerTexture::removeFace(U32 ch, LLFace* facep)
if(mNumFaces[ch] > 1) if(mNumFaces[ch] > 1)
{ {
S32 index = facep->getIndexInTex(ch) ; S32 index = facep->getIndexInTex(ch) ;
llassert(index < mFaceList[ch].size()); llassert(index < (S32)mFaceList[ch].size());
llassert(index < mNumFaces[ch]); llassert(index < (S32)mNumFaces[ch]);
mFaceList[ch][index] = mFaceList[ch][--mNumFaces[ch]] ; mFaceList[ch][index] = mFaceList[ch][--mNumFaces[ch]] ;
mFaceList[ch][index]->setIndexInTex(ch, index) ; mFaceList[ch][index]->setIndexInTex(ch, index) ;
} }
@@ -808,8 +808,8 @@ void LLViewerTexture::removeVolume(LLVOVolume* volumep)
if(mNumVolumes > 1) if(mNumVolumes > 1)
{ {
S32 index = volumep->getIndexInTex() ; S32 index = volumep->getIndexInTex() ;
llassert(index < mVolumeList.size()); llassert(index < (S32)mVolumeList.size());
llassert(index < mNumVolumes); llassert(index < (S32)mNumVolumes);
mVolumeList[index] = mVolumeList[--mNumVolumes] ; mVolumeList[index] = mVolumeList[--mNumVolumes] ;
mVolumeList[index]->setIndexInTex(index) ; mVolumeList[index]->setIndexInTex(index) ;
} }

8
indra/newview/pipeline.cpp
View File

@@ -7324,9 +7324,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
if (!LLViewerCamera::getInstance()->cameraUnderWater()) if (!LLViewerCamera::getInstance()->cameraUnderWater())
{ {
shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2f);
} else { } else {
shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0f);
} }
shader->uniform1f(LLShaderMgr::DOF_MAX_COF, CameraMaxCoF); shader->uniform1f(LLShaderMgr::DOF_MAX_COF, CameraMaxCoF);
@@ -7362,9 +7362,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
if (!LLViewerCamera::getInstance()->cameraUnderWater()) if (!LLViewerCamera::getInstance()->cameraUnderWater())
{ {
shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2f);
} else { } else {
shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0f);
} }
drawFullScreenRect(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0); drawFullScreenRect(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0);