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

viewer#1672 Crash at setDefaultFOV 

Some things can make a copy of camera, like LLViewerWindow::cubeSnapshot
so need to store and clean up the connection
master
Andrey Kleshchev 2024-06-11 09:45:54 +03:00 committed by Andrey Kleshchev
parent 14c89a62c0
commit 57ade10b70
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llviewercamera.cpp
View File

@ -94,7 +94,13 @@ LLViewerCamera::LLViewerCamera() : LLCamera()
mZoomSubregion = 1; mZoomSubregion = 1;
mAverageSpeed = 0.f; mAverageSpeed = 0.f;
mAverageAngularSpeed = 0.f; mAverageAngularSpeed = 0.f;
gSavedSettings.getControl("CameraAngle")->getCommitSignal()->connect(boost::bind(&LLViewerCamera::updateCameraAngle, this, _2));
mCameraAngleChangedSignal = gSavedSettings.getControl("CameraAngle")->getCommitSignal()->connect(boost::bind(&LLViewerCamera::updateCameraAngle, this, _2));
}
LLViewerCamera::~LLViewerCamera()
{
mCameraAngleChangedSignal.disconnect();
} }
void LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVector3 &up_direction, const LLVector3 &point_of_interest) void LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVector3 &up_direction, const LLVector3 &point_of_interest)
@ -895,10 +901,8 @@ bool LLViewerCamera::isDefaultFOVChanged()
return false; return false;
} }
// static void LLViewerCamera::updateCameraAngle(const LLSD& value)
void LLViewerCamera::updateCameraAngle( void* user_data, const LLSD& value)
{ {
LLViewerCamera* self=(LLViewerCamera*)user_data; setDefaultFOV(value.asReal());
self->setDefaultFOV(value.asReal());
} }

5
indra/newview/llviewercamera.h
View File

@ -43,6 +43,7 @@ class alignas(16) LLViewerCamera : public LLCamera, public LLSimpleton<LLViewerC
LL_ALIGN_NEW LL_ALIGN_NEW
public: public:
LLViewerCamera(); LLViewerCamera();
~LLViewerCamera();
typedef enum typedef enum
{ {
@ -65,7 +66,7 @@ public:
const LLVector3 &point_of_interest); const LLVector3 &point_of_interest);
static void updateFrustumPlanes(LLCamera& camera, bool ortho = false, bool zflip = false, bool no_hacks = false); static void updateFrustumPlanes(LLCamera& camera, bool ortho = false, bool zflip = false, bool no_hacks = false);
static void updateCameraAngle(void* user_data, const LLSD& value); void updateCameraAngle(const LLSD& value);
void setPerspective(bool for_selection, S32 x, S32 y_from_bot, S32 width, S32 height, bool limit_select_distance, F32 z_near = 0, F32 z_far = 0); void setPerspective(bool for_selection, S32 x, S32 y_from_bot, S32 width, S32 height, bool limit_select_distance, F32 z_near = 0, F32 z_far = 0);
const LLMatrix4 &getProjection() const; const LLMatrix4 &getProjection() const;
@ -125,6 +126,8 @@ protected:
F32 mZoomFactor; F32 mZoomFactor;
S16 mZoomSubregion; S16 mZoomSubregion;
boost::signals2::connection mCameraAngleChangedSignal;
public: public:
}; };