From 9e854b697a06abed2a0917fb6120445f176764f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20N=C3=A6sbye=20Christensen?= Date: Fri, 16 Feb 2024 19:29:51 +0100 Subject: misc: BOOL to bool --- indra/newview/llviewerjoint.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewerjoint.cpp') diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index 9653e80b53..22d70d482b 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -67,7 +67,7 @@ LLViewerJoint::~LLViewerJoint() //-------------------------------------------------------------------- // render() //-------------------------------------------------------------------- -U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) +U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy ) { stop_glerror(); @@ -107,13 +107,13 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) // second pass writes to z buffer only gGL.setColorMask(false, false); { - triangle_count += drawShape( pixelArea, FALSE, is_dummy ); + triangle_count += drawShape( pixelArea, false, is_dummy ); } // third past respects z buffer and writes color gGL.setColorMask(true, false); { LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - triangle_count += drawShape( pixelArea, FALSE, is_dummy ); + triangle_count += drawShape( pixelArea, false, is_dummy ); } } else @@ -127,7 +127,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) // Render Outside (write to the Z buffer) glCullFace(GL_BACK); { - triangle_count += drawShape( pixelArea, FALSE, is_dummy ); + triangle_count += drawShape( pixelArea, false, is_dummy ); } } } @@ -149,7 +149,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) F32 jointLOD = joint->getLOD(); if (pixelArea >= jointLOD || sDisableLOD) { - triangle_count += joint->render( pixelArea, TRUE, is_dummy ); + triangle_count += joint->render( pixelArea, true, is_dummy ); if (jointLOD != DEFAULT_AVATAR_JOINT_LOD) { @@ -164,7 +164,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) //-------------------------------------------------------------------- // drawShape() //-------------------------------------------------------------------- -U32 LLViewerJoint::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) +U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) { return 0; } -- cgit v1.2.3 From 088f2f4f6545ebc2ee01945938a40ae5c87ad27a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 17 Feb 2024 00:51:13 +0100 Subject: More BOOL to bool replacements primarily in llappearance and llxml --- indra/newview/llviewerjoint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerjoint.cpp') diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index 22d70d482b..08b47d9df3 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -38,7 +38,7 @@ #include "llvoavatar.h" #include "pipeline.h" -static const S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64; +static constexpr S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64; //----------------------------------------------------------------------------- // LLViewerJoint() -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llviewerjoint.cpp | 344 ++++++++++++++++++++-------------------- 1 file changed, 172 insertions(+), 172 deletions(-) (limited to 'indra/newview/llviewerjoint.cpp') diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index f64f717975..3c5c4752df 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -1,172 +1,172 @@ -/** - * @file llviewerjoint.cpp - * @brief Implementation of LLViewerJoint class - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -//----------------------------------------------------------------------------- -// Header Files -//----------------------------------------------------------------------------- -#include "llviewerprecompiledheaders.h" - -#include "llviewerjoint.h" - -#include "llgl.h" -#include "llrender.h" -#include "llmath.h" -#include "llglheaders.h" -#include "llvoavatar.h" -#include "pipeline.h" - -static constexpr S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64; - -//----------------------------------------------------------------------------- -// LLViewerJoint() -// Class Constructors -//----------------------------------------------------------------------------- -LLViewerJoint::LLViewerJoint() : - LLAvatarJoint() -{ } - -LLViewerJoint::LLViewerJoint(S32 joint_num) : - LLAvatarJoint(joint_num) -{ } - -LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) : - LLAvatarJoint(name, parent) -{ } - -//----------------------------------------------------------------------------- -// ~LLViewerJoint() -// Class Destructor -//----------------------------------------------------------------------------- -LLViewerJoint::~LLViewerJoint() -{ -} - -//-------------------------------------------------------------------- -// render() -//-------------------------------------------------------------------- -U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy ) -{ - stop_glerror(); - - U32 triangle_count = 0; - - //---------------------------------------------------------------- - // ignore invisible objects - //---------------------------------------------------------------- - if ( mValid ) - { - - - //---------------------------------------------------------------- - // if object is transparent, defer it, otherwise - // give the joint subclass a chance to draw itself - //---------------------------------------------------------------- - if ( is_dummy ) - { - triangle_count += drawShape( pixelArea, first_pass, is_dummy ); - } - else if (LLPipeline::sShadowRender) - { - triangle_count += drawShape(pixelArea, first_pass, is_dummy ); - } - else if ( isTransparent() && !LLPipeline::sReflectionRender) - { - // Hair and Skirt - if ((pixelArea > MIN_PIXEL_AREA_3PASS_HAIR)) - { - // render all three passes - LLGLDisable cull(GL_CULL_FACE); - // first pass renders without writing to the z buffer - { - LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - triangle_count += drawShape( pixelArea, first_pass, is_dummy ); - } - // second pass writes to z buffer only - gGL.setColorMask(false, false); - { - triangle_count += drawShape( pixelArea, false, is_dummy ); - } - // third past respects z buffer and writes color - gGL.setColorMask(true, false); - { - LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - triangle_count += drawShape( pixelArea, false, is_dummy ); - } - } - else - { - // Render Inside (no Z buffer write) - glCullFace(GL_FRONT); - { - LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - triangle_count += drawShape( pixelArea, first_pass, is_dummy ); - } - // Render Outside (write to the Z buffer) - glCullFace(GL_BACK); - { - triangle_count += drawShape( pixelArea, false, is_dummy ); - } - } - } - else - { - // set up render state - triangle_count += drawShape( pixelArea, first_pass ); - } - } - - //---------------------------------------------------------------- - // render children - //---------------------------------------------------------------- - for (LLJoint* j : mChildren) - { - // LLViewerJoint is derived from LLAvatarJoint, - // all children of LLAvatarJoint are assumed to be LLAvatarJoint - LLAvatarJoint* joint = static_cast(j); - F32 jointLOD = joint->getLOD(); - if (pixelArea >= jointLOD || sDisableLOD) - { - triangle_count += joint->render( pixelArea, true, is_dummy ); - - if (jointLOD != DEFAULT_AVATAR_JOINT_LOD) - { - break; - } - } - } - - return triangle_count; -} - -//-------------------------------------------------------------------- -// drawShape() -//-------------------------------------------------------------------- -U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) -{ - return 0; -} - -// End +/** + * @file llviewerjoint.cpp + * @brief Implementation of LLViewerJoint class + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +//----------------------------------------------------------------------------- +// Header Files +//----------------------------------------------------------------------------- +#include "llviewerprecompiledheaders.h" + +#include "llviewerjoint.h" + +#include "llgl.h" +#include "llrender.h" +#include "llmath.h" +#include "llglheaders.h" +#include "llvoavatar.h" +#include "pipeline.h" + +static constexpr S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64; + +//----------------------------------------------------------------------------- +// LLViewerJoint() +// Class Constructors +//----------------------------------------------------------------------------- +LLViewerJoint::LLViewerJoint() : + LLAvatarJoint() +{ } + +LLViewerJoint::LLViewerJoint(S32 joint_num) : + LLAvatarJoint(joint_num) +{ } + +LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) : + LLAvatarJoint(name, parent) +{ } + +//----------------------------------------------------------------------------- +// ~LLViewerJoint() +// Class Destructor +//----------------------------------------------------------------------------- +LLViewerJoint::~LLViewerJoint() +{ +} + +//-------------------------------------------------------------------- +// render() +//-------------------------------------------------------------------- +U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy ) +{ + stop_glerror(); + + U32 triangle_count = 0; + + //---------------------------------------------------------------- + // ignore invisible objects + //---------------------------------------------------------------- + if ( mValid ) + { + + + //---------------------------------------------------------------- + // if object is transparent, defer it, otherwise + // give the joint subclass a chance to draw itself + //---------------------------------------------------------------- + if ( is_dummy ) + { + triangle_count += drawShape( pixelArea, first_pass, is_dummy ); + } + else if (LLPipeline::sShadowRender) + { + triangle_count += drawShape(pixelArea, first_pass, is_dummy ); + } + else if ( isTransparent() && !LLPipeline::sReflectionRender) + { + // Hair and Skirt + if ((pixelArea > MIN_PIXEL_AREA_3PASS_HAIR)) + { + // render all three passes + LLGLDisable cull(GL_CULL_FACE); + // first pass renders without writing to the z buffer + { + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); + triangle_count += drawShape( pixelArea, first_pass, is_dummy ); + } + // second pass writes to z buffer only + gGL.setColorMask(false, false); + { + triangle_count += drawShape( pixelArea, false, is_dummy ); + } + // third past respects z buffer and writes color + gGL.setColorMask(true, false); + { + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); + triangle_count += drawShape( pixelArea, false, is_dummy ); + } + } + else + { + // Render Inside (no Z buffer write) + glCullFace(GL_FRONT); + { + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); + triangle_count += drawShape( pixelArea, first_pass, is_dummy ); + } + // Render Outside (write to the Z buffer) + glCullFace(GL_BACK); + { + triangle_count += drawShape( pixelArea, false, is_dummy ); + } + } + } + else + { + // set up render state + triangle_count += drawShape( pixelArea, first_pass ); + } + } + + //---------------------------------------------------------------- + // render children + //---------------------------------------------------------------- + for (LLJoint* j : mChildren) + { + // LLViewerJoint is derived from LLAvatarJoint, + // all children of LLAvatarJoint are assumed to be LLAvatarJoint + LLAvatarJoint* joint = static_cast(j); + F32 jointLOD = joint->getLOD(); + if (pixelArea >= jointLOD || sDisableLOD) + { + triangle_count += joint->render( pixelArea, true, is_dummy ); + + if (jointLOD != DEFAULT_AVATAR_JOINT_LOD) + { + break; + } + } + } + + return triangle_count; +} + +//-------------------------------------------------------------------- +// drawShape() +//-------------------------------------------------------------------- +U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) +{ + return 0; +} + +// End -- cgit v1.2.3