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

https://github.com/secondlife/viewer-issues/issues/23 Make the face selection for mirrors actually reflect what it does

master
Jonathan "Geenz" Goodman 2024-01-24 16:22:45 -08:00
parent 42b51bfd2c
commit a888531fd1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llheroprobemanager.cpp
View File

@ -138,7 +138,7 @@ void LLHeroProbeManager::update()
if (mNearestHero != nullptr && mNearestHero->mDrawable.notNull())
{
U8 mode = mNearestHero->mirrorPlacementMode();
U8 mode = mNearestHero->mirrorFace();
mode = llmin(mNearestHero->mDrawable->getNumFaces() - 1, mode);
mCurrentFace = mNearestHero->mDrawable->getFace(mode);

8
indra/newview/llviewerobject.cpp
View File

@ -314,8 +314,8 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
mCachedMuteListUpdateTime(0),
mCachedOwnerInMuteList(false),
mRiggedAttachedWarned(false),
mIsMirror(false),
mMirrorPlacementMode(3)
mIsMirror(false),
mMirrorFace(3)
{
if (!is_global)
{
@ -1558,7 +1558,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
std::string temp_string;
mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, temp_string, block_num );
detectMirror(temp_string, mIsMirror, mMirrorPlacementMode);
detectMirror(temp_string, mIsMirror, mMirrorFace);
LLColor4U coloru;
mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextColor, coloru.mV, 4, block_num);
@ -1946,7 +1946,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
std::string temp_string;
dp->unpackString(temp_string, "Text");
detectMirror(temp_string, mIsMirror, mMirrorPlacementMode);
detectMirror(temp_string, mIsMirror, mMirrorFace);
LLColor4U coloru;
dp->unpackBinaryDataFixed(coloru.mV, 4, "Color");

4
indra/newview/llviewerobject.h
View File

@ -258,7 +258,7 @@ public:
virtual BOOL hasLightTexture() const { return FALSE; }
virtual BOOL isReflectionProbe() const { return FALSE; }
virtual BOOL isMirror() const { return FALSE; }
virtual U8 mirrorPlacementMode() const { return 0; }
virtual U8 mirrorFace() const { return 0; }
// This method returns true if the object is over land owned by
// the agent, one of its groups, or it encroaches and
@ -881,7 +881,7 @@ protected:
F32 mLinksetPhysicsCost;
bool mIsMirror;
U8 mMirrorPlacementMode;
U8 mMirrorFace;
// If true, "shrink wrap" this volume in its spatial partition. See "shrinkWrap"
bool mShouldShrinkWrap = false;

4
indra/newview/llvovolume.cpp
View File

@ -3364,9 +3364,9 @@ BOOL LLVOVolume::isMirror() const
return mIsMirror;
}
U8 LLVOVolume::mirrorPlacementMode() const
U8 LLVOVolume::mirrorFace() const
{
return mMirrorPlacementMode;
return mMirrorFace;
}
BOOL LLVOVolume::isReflectionProbe() const

2
indra/newview/llvovolume.h
View File

@ -298,7 +298,7 @@ public:
// Mirrors
bool setIsMirror(BOOL is_mirror);
void updateMirrorDrawable();
U8 mirrorPlacementMode() const override;
U8 mirrorFace() const override;
// Reflection Probes
bool setIsReflectionProbe(BOOL is_probe);