diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
commit | cde1174345224d33d6b45b1e3243fa39043223e5 (patch) | |
tree | 6c8db6e0499622d8c7206a11c997eb173ebd478f /indra/newview/llvowater.cpp | |
parent | 6f454ad8366ed33bbe199c3fc3ed69e6d3448cec (diff) | |
parent | 35efadf78315f9b351415930dca4fae251ef4dd0 (diff) |
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r-- | indra/newview/llvowater.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index b2af6c70d3..34040e1aca 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -56,11 +56,11 @@ LLVOWater::LLVOWater(const LLUUID &id, mRenderType(LLPipeline::RENDER_TYPE_WATER) { // Terrain must draw during selection passes so it can block objects behind it. - mbCanSelect = FALSE; + mbCanSelect = false; setScale(LLVector3(256.f, 256.f, 0.f)); // Hack for setting scale for bounding boxes/visibility. - mUseTexture = TRUE; - mIsEdgePatch = FALSE; + mUseTexture = true; + mIsEdgePatch = false; } @@ -70,9 +70,9 @@ void LLVOWater::markDead() } -BOOL LLVOWater::isActive() const +bool LLVOWater::isActive() const { - return FALSE; + return false; } @@ -96,7 +96,7 @@ void LLVOWater::idleUpdate(LLAgent &agent, const F64 &time) LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline) { pipeline->allocDrawable(this); - mDrawable->setLit(FALSE); + mDrawable->setLit(false); mDrawable->setRenderType(mRenderType); LLDrawPoolWater *pool = (LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER); @@ -113,7 +113,7 @@ LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline) return mDrawable; } -BOOL LLVOWater::updateGeometry(LLDrawable *drawable) +bool LLVOWater::updateGeometry(LLDrawable *drawable) { LL_PROFILE_ZONE_SCOPED; LLFace *face; @@ -126,7 +126,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) face = drawable->getFace(0); if (!face) { - return TRUE; + return true; } // LLVector2 uvs[4]; @@ -231,7 +231,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) mDrawable->movePartition(); LLPipeline::sCompiles++; - return TRUE; + return true; } void LLVOWater::initClass() @@ -249,12 +249,12 @@ void setVecZ(LLVector3& v) v.mV[VZ] = 1; } -void LLVOWater::setUseTexture(const BOOL use_texture) +void LLVOWater::setUseTexture(const bool use_texture) { mUseTexture = use_texture; } -void LLVOWater::setIsEdgePatch(const BOOL edge_patch) +void LLVOWater::setIsEdgePatch(const bool edge_patch) { mIsEdgePatch = edge_patch; } @@ -292,16 +292,16 @@ U32 LLVOVoidWater::getPartitionType() const } LLWaterPartition::LLWaterPartition(LLViewerRegion* regionp) -: LLSpatialPartition(0, FALSE, regionp) +: LLSpatialPartition(0, false, regionp) { - mInfiniteFarClip = TRUE; + mInfiniteFarClip = true; mDrawableType = LLPipeline::RENDER_TYPE_WATER; mPartitionType = LLViewerRegion::PARTITION_WATER; } LLVoidWaterPartition::LLVoidWaterPartition(LLViewerRegion* regionp) : LLWaterPartition(regionp) { - mOcclusionEnabled = FALSE; + mOcclusionEnabled = false; mDrawableType = LLPipeline::RENDER_TYPE_VOIDWATER; mPartitionType = LLViewerRegion::PARTITION_VOIDWATER; } |