summaryrefslogtreecommitdiff
path: root/indra/newview/llmaniptranslate.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
-rw-r--r--indra/newview/llmaniptranslate.cpp106
1 files changed, 53 insertions, 53 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 331bcedff9..626de93a20 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -111,8 +111,8 @@ LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
: LLManip( std::string("Move"), composite ),
mLastHoverMouseX(-1),
mLastHoverMouseY(-1),
- mMouseOutsideSlop(FALSE),
- mCopyMadeThisDrag(FALSE),
+ mMouseOutsideSlop(false),
+ mCopyMadeThisDrag(false),
mMouseDownX(-1),
mMouseDownY(-1),
mAxisArrowLength(50),
@@ -123,7 +123,7 @@ LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
mUpdateTimer(),
mSnapOffsetMeters(0.f),
mSubdivisions(10.f),
- mInSnapRegime(FALSE),
+ mInSnapRegime(false),
mArrowScales(1.f, 1.f, 1.f),
mPlaneScales(1.f, 1.f, 1.f),
mPlaneManipPositions(1.f, 1.f, 1.f, 1.f)
@@ -309,12 +309,12 @@ bool LLManipTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
}
// Assumes that one of the arrows on an object was hit.
-BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
+bool LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
{
- BOOL can_move = canAffectSelection();
+ bool can_move = canAffectSelection();
if (!can_move)
{
- return FALSE;
+ return false;
}
highlightManipulators(x, y);
@@ -327,7 +327,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
(hit_part != LL_XZ_PLANE) &&
(hit_part != LL_XY_PLANE) )
{
- return TRUE;
+ return true;
}
mHelpTextTimer.reset();
@@ -335,7 +335,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
LLSelectMgr::getInstance()->getGrid(mGridOrigin, mGridRotation, mGridScale);
- LLSelectMgr::getInstance()->enableSilhouette(FALSE);
+ LLSelectMgr::getInstance()->enableSilhouette(false);
// we just started a drag, so save initial object positions
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_MOVE);
@@ -343,17 +343,17 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
mManipPart = (EManipPart)hit_part;
mMouseDownX = x;
mMouseDownY = y;
- mMouseOutsideSlop = FALSE;
+ mMouseOutsideSlop = false;
LLVector3 axis;
- LLSelectNode *selectNode = mObjectSelection->getFirstMoveableNode(TRUE);
+ LLSelectNode *selectNode = mObjectSelection->getFirstMoveableNode(true);
if (!selectNode)
{
// didn't find the object in our selection...oh well
LL_WARNS() << "Trying to translate an unselected object" << LL_ENDL;
- return TRUE;
+ return true;
}
LLViewerObject *selected_object = selectNode->getObject();
@@ -362,11 +362,11 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
// somehow we lost the object!
LL_WARNS() << "Translate manip lost the object, no selected object" << LL_ENDL;
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
- return TRUE;
+ return true;
}
// Compute unit vectors for arrow hit and a plane through that vector
- BOOL axis_exists = getManipAxis(selected_object, mManipPart, axis);
+ bool axis_exists = getManipAxis(selected_object, mManipPart, axis);
getManipNormal(selected_object, mManipPart, mManipNormal);
//LLVector3 select_center_agent = gAgent.getPosAgentFromGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal());
@@ -395,12 +395,12 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
LLVector3d object_start_global = gAgent.getPosGlobalFromAgent(getPivotPoint());
getMousePointOnPlaneGlobal(mDragCursorStartGlobal, x, y, object_start_global, mManipNormal);
mDragSelectionStartGlobal = object_start_global;
- mCopyMadeThisDrag = FALSE;
+ mCopyMadeThisDrag = false;
// Route future Mouse messages here preemptively. (Release on mouse up.)
- setMouseCapture( TRUE );
+ setMouseCapture( true );
- return TRUE;
+ return true;
}
bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
@@ -423,7 +423,7 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
const S32 ROTATE_H_MARGIN = world_rect.getWidth() / 20;
const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
- BOOL rotated = FALSE;
+ bool rotated = false;
// ...build mode moves camera about focus point
if (mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
@@ -431,12 +431,12 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
if (x < ROTATE_H_MARGIN)
{
gAgentCamera.cameraOrbitAround(rotate_angle);
- rotated = TRUE;
+ rotated = true;
}
else if (x > world_rect.getWidth() - ROTATE_H_MARGIN)
{
gAgentCamera.cameraOrbitAround(-rotate_angle);
- rotated = TRUE;
+ rotated = true;
}
}
@@ -465,13 +465,13 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
else
{
// ...just went outside the slop region
- mMouseOutsideSlop = TRUE;
+ mMouseOutsideSlop = true;
// If holding down shift, leave behind a copy.
if (mask == MASK_COPY)
{
// ...we're trying to make a copy
- LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
- mCopyMadeThisDrag = TRUE;
+ LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, false);
+ mCopyMadeThisDrag = true;
// When we make the copy, we don't want to do any other processing.
// If so, the object will also be moved, and the copy will be offset.
@@ -488,7 +488,7 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
// pick the first object to constrain to grid w/ common origin
// this is so we don't screw up groups
- LLSelectNode* selectNode = mObjectSelection->getFirstMoveableNode(TRUE);
+ LLSelectNode* selectNode = mObjectSelection->getFirstMoveableNode(true);
if (!selectNode)
{
// somehow we lost the object!
@@ -507,7 +507,7 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
}
// Compute unit vectors for arrow hit and a plane through that vector
- BOOL axis_exists = getManipAxis(object, mManipPart, axis_f); // TODO: move this
+ bool axis_exists = getManipAxis(object, mManipPart, axis_f); // TODO: move this
axis_d.setVec(axis_f);
@@ -546,7 +546,7 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
{
if (off_axis_magnitude > mSnapOffsetMeters)
{
- mInSnapRegime = TRUE;
+ mInSnapRegime = true;
LLVector3 cursor_snap_agent = gAgent.getPosAgentFromGlobal(cursor_point_snap_line);
F32 cursor_grid_dist = (cursor_snap_agent - mGridOrigin) * axis_f;
@@ -630,16 +630,16 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
}
cursor_point_agent = (cursor_point_grid * mGridRotation) + mGridOrigin;
relative_move.setVec(cursor_point_agent - gAgent.getPosAgentFromGlobal(mDragSelectionStartGlobal));
- mInSnapRegime = TRUE;
+ mInSnapRegime = true;
}
else
{
- mInSnapRegime = FALSE;
+ mInSnapRegime = false;
}
}
else
{
- mInSnapRegime = FALSE;
+ mInSnapRegime = false;
}
// Clamp to arrow direction
@@ -703,7 +703,7 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
if (selectNode->mIndividualSelection)
{
// counter-translate child objects if we are moving the root as an individual
- object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;
+ object->resetChildrenPosition(old_position_local - new_position_local, true) ;
}
}
else
@@ -750,14 +750,14 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
LLViewerObject* root_object = object->getRootEdit();
new_position_agent -= root_object->getPositionAgent();
new_position_agent = new_position_agent * ~root_object->getRotation();
- object->setPositionParent(new_position_agent, FALSE);
+ object->setPositionParent(new_position_agent, false);
rebuild(object);
}
if (selectNode->mIndividualSelection)
{
// counter-translate child objects if we are moving the root as an individual
- object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;
+ object->resetChildrenPosition(old_position_agent - new_position_agent, true) ;
}
}
selectNode->mLastPositionLocal = object->getPosition();
@@ -846,9 +846,9 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
S32 num_arrow_manips = numManips;
// planar manipulators
- BOOL planar_manip_yz_visible = FALSE;
- BOOL planar_manip_xz_visible = FALSE;
- BOOL planar_manip_xy_visible = FALSE;
+ bool planar_manip_yz_visible = false;
+ bool planar_manip_xz_visible = false;
+ bool planar_manip_xy_visible = false;
mManipulatorVertices[numManips] = LLVector4(0.f, mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 1.f);
mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
@@ -856,7 +856,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
if (llabs(relative_camera_dir.mV[VX]) > MIN_PLANE_MANIP_DOT_PRODUCT)
{
- planar_manip_yz_visible = TRUE;
+ planar_manip_yz_visible = true;
}
mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 0.f, mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 1.f);
@@ -865,7 +865,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
if (llabs(relative_camera_dir.mV[VY]) > MIN_PLANE_MANIP_DOT_PRODUCT)
{
- planar_manip_xz_visible = TRUE;
+ planar_manip_xz_visible = true;
}
mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 0.f, 1.f);
@@ -874,7 +874,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
if (llabs(relative_camera_dir.mV[VZ]) > MIN_PLANE_MANIP_DOT_PRODUCT)
{
- planar_manip_xy_visible = TRUE;
+ planar_manip_xy_visible = true;
}
// Project up to 9 manipulators to screen space 2*X, 2*Y, 2*Z, 3*planes
@@ -1031,12 +1031,12 @@ bool LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
{
// make sure arrow colors go back to normal
mManipPart = LL_NO_PART;
- LLSelectMgr::getInstance()->enableSilhouette(TRUE);
+ LLSelectMgr::getInstance()->enableSilhouette(true);
// Might have missed last update due to UPDATE_DELAY timing.
LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_POSITION );
- mInSnapRegime = FALSE;
+ mInSnapRegime = false;
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
}
@@ -1088,7 +1088,7 @@ void LLManipTranslate::renderSnapGuides()
return;
}
- LLSelectNode *first_node = mObjectSelection->getFirstMoveableNode(TRUE);
+ LLSelectNode *first_node = mObjectSelection->getFirstMoveableNode(true);
if (!first_node)
{
return;
@@ -1562,13 +1562,13 @@ void LLManipTranslate::renderSnapGuides()
switch (mManipPart)
{
case LL_YZ_PLANE:
- renderGuidelines(FALSE, TRUE, TRUE);
+ renderGuidelines(false, true, true);
break;
case LL_XZ_PLANE:
- renderGuidelines(TRUE, FALSE, TRUE);
+ renderGuidelines(true, false, true);
break;
case LL_XY_PLANE:
- renderGuidelines(TRUE, TRUE, FALSE);
+ renderGuidelines(true, true, false);
break;
default:
break;
@@ -1672,8 +1672,8 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal,
static LLStaticHashedString sClipPlane("clip_plane");
gClipProgram.uniform4fv(sClipPlane, 1, plane.v);
- BOOL particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
- BOOL clouds = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
+ bool particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
+ bool clouds = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
if (particles)
{
@@ -1689,14 +1689,14 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal,
glCullFace(GL_FRONT);
for (U32 i = 0; i < num_types; i++)
{
- gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, FALSE);
+ gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, false);
}
//glStencilOp(GL_DECR, GL_DECR, GL_DECR);
glCullFace(GL_BACK);
for (U32 i = 0; i < num_types; i++)
{
- gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, FALSE);
+ gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, false);
}
if (particles)
@@ -1759,7 +1759,7 @@ void LLManipTranslate::renderText()
}
else
{
- const BOOL children_ok = TRUE;
+ const bool children_ok = true;
LLViewerObject* objectp = mObjectSelection->getFirstRootObject(children_ok);
if (objectp)
{
@@ -1813,7 +1813,7 @@ void LLManipTranslate::renderTranslationHandles()
mPlaneManipPositions.mV[VZ] = -1.f;
}
- LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(TRUE);
+ LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(true);
if (!first_object) return;
LLVector3 selection_center = getPivotPoint();
@@ -2168,7 +2168,7 @@ void LLManipTranslate::renderTranslationHandles()
(face >= 3) ? -mConeSize : mConeSize,
(face >= 3) ? -mArrowLengthMeters : mArrowLengthMeters,
mConeSize,
- FALSE);
+ false);
}
}
}
@@ -2176,7 +2176,7 @@ void LLManipTranslate::renderTranslationHandles()
}
-void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, BOOL reverse_direction)
+void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, bool reverse_direction)
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLGLEnable gls_blend(GL_BLEND);
@@ -2278,9 +2278,9 @@ void LLManipTranslate::renderGridVert(F32 x_trans, F32 y_trans, F32 r, F32 g, F3
}
// virtual
-BOOL LLManipTranslate::canAffectSelection()
+bool LLManipTranslate::canAffectSelection()
{
- BOOL can_move = mObjectSelection->getObjectCount() != 0;
+ bool can_move = mObjectSelection->getObjectCount() != 0;
if (can_move)
{
struct f : public LLSelectedObjectFunctor
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 05:35:52 +0000