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

secondlife/jira-archive-internal#69593 Avatar is upside down when viewed from below

master
Alexander Gavriliuk 2024-03-26 03:19:06 +01:00 committed by Guru
parent 61935a13f4
commit f815b015ce
3 changed files with 72 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llagent.cpp
View File

@ -1468,23 +1468,27 @@ void LLAgent::pitch(F32 angle)
LLVector3 skyward = getReferenceUpVector();
// SL-19286 Avatar is upside down when viewed from below
// after left-clicking the mouse on the avatar and dragging down
//
// The issue is observed on angle below 10 degrees
const F32 look_down_limit = 179.f * DEG_TO_RAD;
const F32 look_up_limit = 10.f * DEG_TO_RAD;
F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
// clamp pitch to limits
if ((angle >= 0.f) && (angle_from_skyward + angle > look_down_limit))
if (angle >= 0.f)
{
angle = look_down_limit - angle_from_skyward;
const F32 look_down_limit = 179.f * DEG_TO_RAD;
F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
if (angle_from_skyward + angle > look_down_limit)
{
angle = look_down_limit - angle_from_skyward;
}
}
else if ((angle < 0.f) && (angle_from_skyward + angle < look_up_limit))
else if (angle < 0.f)
{
angle = look_up_limit - angle_from_skyward;
const F32 look_up_limit = 5.f * DEG_TO_RAD;
const LLVector3& viewer_camera_pos = LLViewerCamera::getInstance()->getOrigin();
LLVector3 agent_focus_pos = getPosAgentFromGlobal(gAgentCamera.calcFocusPositionTargetGlobal());
LLVector3 look_dir = agent_focus_pos - viewer_camera_pos;
F32 angle_from_skyward = angle_between(look_dir, skyward);
if (angle_from_skyward + angle < look_up_limit)
{
angle = look_up_limit - angle_from_skyward;
}
}
if (fabs(angle) > 1e-4)

81
indra/newview/llfloatercamera.cpp
View File

@ -248,23 +248,25 @@ void activate_camera_tool()
class LLCameraInfoPanel : public LLPanel
{
const S32 MARGIN { 10 };
const char* mTitle;
const LLCoordFrame* mCamera;
const LLFontGL* mFont;
public:
LLCameraInfoPanel(const LLView* parent, const LLCoordFrame* camera, const char* title)
: LLPanel([&]() -> LLPanel::Params
{
LLPanel::Params params;
params.rect = LLRect(parent->getLocalRect());
return params;
}())
, mTitle(title)
, mCamera(camera)
, mFont(LLFontGL::getFontSansSerifBig())
typedef std::function<LLVector3()> get_vector_t;
LLCameraInfoPanel(
const LLView* parent,
const char* title,
const LLCoordFrame& camera,
const get_vector_t get_focus
)
: LLPanel([&]() -> LLPanel::Params
{
LLPanel::Params params;
params.rect = LLRect(parent->getLocalRect());
return params;
}())
, mTitle(title)
, mCamera(camera)
, mGetFocus(get_focus)
, mFont(LLFontGL::getFontSansSerifBig())
{
}
@ -272,25 +274,44 @@ public:
{
LLPanel::draw();
static const U32 HPADDING = 10;
static const U32 VPADDING = 5;
LLVector3 focus = mGetFocus();
LLVector3 sight = focus - mCamera.mOrigin;
std::pair<const char*, const LLVector3&> const data[] =
{
{ "Origin:", mCamera.mOrigin },
{ "X Axis:", mCamera.mXAxis },
{ "Y Axis:", mCamera.mYAxis },
{ "Z Axis:", mCamera.mZAxis },
{ "Focus:", focus },
{ "Sight:", sight }
};
S32 width = getRect().getWidth();
S32 height = getRect().getHeight();
S32 top = MARGIN / 2 + (height - MARGIN) / 10 * 9;
mFont->renderUTF8(mTitle, 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
const LLVector3* const vectors[] = { &mCamera->getOrigin(), &mCamera->getXAxis(), &mCamera->getYAxis(), &mCamera->getZAxis() };
for (int row = 0; row < 4; ++row)
S32 row_count = 1 + sizeof(data) / sizeof(*data);
S32 row_height = (height - VPADDING * 2) / row_count;
S32 top = height - VPADDING - row_height / 2;
mFont->renderUTF8(mTitle, 0, HPADDING, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
for (const auto& row : data)
{
top -= (height - MARGIN) / 5;
static const char* const labels[] = { "Origin:", "X Axis:", "Y Axis:", "Z Axis:" };
mFont->renderUTF8(labels[row], 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
const LLVector3& vector = *vectors[row];
for (int col = 0; col < 3; ++col)
top -= row_height;
mFont->renderUTF8(row.first, 0, HPADDING, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
const LLVector3& vector = row.second;
for (S32 i = 0; i < 3; ++i)
{
std::string text = llformat("%.6f", vector[col]);
S32 right = width / 4 * (col + 2) - MARGIN;
std::string text = llformat("%.6f", vector[i]);
S32 right = width / 4 * (i + 2) - HPADDING;
mFont->renderUTF8(text, 0, right, top, LLColor4::white, LLFontGL::RIGHT, LLFontGL::VCENTER);
}
}
}
private:
const char* mTitle;
const LLCoordFrame& mCamera;
const get_vector_t mGetFocus;
const LLFontGL* mFont;
};
//
@ -344,8 +365,10 @@ void LLFloaterCamera::showDebugInfo(bool show)
// Initially LLPanel contains 1 child "view_border"
if (show && mViewerCameraInfo->getChildCount() < 2)
{
mViewerCameraInfo->addChild(new LLCameraInfoPanel(mViewerCameraInfo, LLViewerCamera::getInstance(), "Viewer Camera"));
mAgentCameraInfo->addChild(new LLCameraInfoPanel(mAgentCameraInfo, &gAgent.getFrameAgent(), "Agent Camera"));
mViewerCameraInfo->addChild(new LLCameraInfoPanel(mViewerCameraInfo, "Viewer Camera", *LLViewerCamera::getInstance(),
[]() { return LLViewerCamera::getInstance()->getPointOfInterest(); }));
mAgentCameraInfo->addChild(new LLCameraInfoPanel(mAgentCameraInfo, "Agent Camera", gAgent.getFrameAgent(),
[]() { return gAgent.getPosAgentFromGlobal(gAgentCamera.calcFocusPositionTargetGlobal()); }));
}
mAgentCameraInfo->setVisible(show);

6
indra/newview/skins/default/xui/en/floater_camera.xml
View File

@ -258,16 +258,16 @@
left="0"
top="135"
width="400"
height="130"
height="150"
border="true"
visible="false"
background_visible="true"/>
<panel
name="agent_camera_info"
left="0"
top="265"
top="285"
width="400"
height="130"
height="150"
border="true"
visible="false"
background_visible="true"/>