fix for alpha-gamma-bypass prototype #2538

AndrewMeadows · 2024-09-10T15:39:46Z

This PR fixes viewer-side problems in the "alpha-gamma-prototype".

AndrewMeadows · 2024-09-10T15:40:40Z

indra/llprimitive/llprimitive.cpp

@@ -125,6 +125,8 @@ const LLUUID SCULPT_DEFAULT_TEXTURE("be293869-d0d9-0a69-5989-ad27f1946fd4"); //
 // can't be divided by 2.   See DEV-19108
 const F32   TEXTURE_ROTATION_PACK_FACTOR = ((F32) 0x08000);

+constexpr U8 EXTRA_PROPERTY_ALPHA_GAMMA = 0x01;
+


Use EXTRA_PROPERTY_ALPHA_GAMMA for less magic.

indra/llprimitive/llprimitive.cpp

AndrewMeadows · 2024-09-10T15:59:50Z

indra/newview/llselectmgr.cpp

-    LLSelectMgrSendFunctor sendfunc;
+    // TODO: remove LLSelectMgrAlphaGammaBypassFunctor and instead
+    // use the normal LLSelectMgrSendFunctor and enhance the server to know when to allow bypass
+    LLSelectMgrAlphaGammaBypassFunctor sendfunc;
    getSelection()->applyToObjects(&sendfunc);
 }


That was the wrong place to call packAlphaGammaOverride(). By putting it there the viewer would send one message for every object face!

The correct way to do it is to first make ALL of the changes to the local object (if permission rules allow) and only when all changes made: send an update to the server. The server validates the changes and will always send a confirmation or denied update back to the viewer that tried to make the change.

Noted! Thank you!

AndrewMeadows · 2024-09-10T16:02:06Z

indra/newview/llselectmgr.cpp

+        }
+        return true;
+    }
+};


This "sendFunc" operator was created for the new message. However, I believe we should remove the new message and just use the old one while updating the sever-side permission logic to check for, and handle, the new "bypass" case.

Edit: I spoke with Rider and he wants to keep the new message. Nevermind.

To be clear - we're sticking with the new message, yes?

Yes, we're sticking with the new message.

AndrewMeadows · 2024-09-10T16:03:42Z

indra/newview/llselectmgr.h


    // Get the first ID that matches test and whether or not all ids are identical in selected objects.
    void getFirst(LLSelectGetFirstTest* test);

 public:
+    static void packAlphaGammaBypass(LLViewerObject* object);
+


This method must be public because it is called by LLSelectMgrAlphaGammaBypassFunctor.

Also reduce memory footprint for LLTEContents during pack/unpack (only allocate room for as many LLTextureEntry's the object has)

AndrewMeadows · 2024-09-17T16:21:04Z

indra/llprimitive/llprimitive.cpp

+
+    // verify we correctly computed data size
+    llassert(offset == num_bytes);
+}


LLTEContents ctor now takes an argument for the number of TEs to expect. This allows it to only allocate as much memory as it actually needs (e.g. 6 for a box) instead of the default (45, which is how many the avatar uses).

Note: we use one big data buffer and compute offsets into that buffer for the various arrays of typed data. This may seem like sketch c-style coding however we were already doing c-style casts when extracting LLUUID data, so it isn't actually "new".

AndrewMeadows · 2024-09-17T16:53:21Z

indra/llprimitive/tests/llprimitive_test.cpp

+            ensure_equals(te_A->getGlow(), te_B->getGlow());
+            ensure_equals(te_A->getAlphaGamma(), te_B->getAlphaGamma());
+        }
+    }


I'm adding this unit-test for the TextureEntry pack/unpack logic.

AndrewMeadows · 2024-09-17T16:54:38Z

indra/llprimitive/tests/lltextureentry_stub.cpp

+ */
+
+#pragma once
+


In order for the unit-test to work we need a lot of functional stubbery for LLTextureEntry.

AndrewMeadows · 2024-09-17T16:56:20Z

indra/newview/llpanelface.cpp

-            LLSelectedTE::getAlphaGamma(alpha_gamma, identical_alpha_gamma);
-            mComboAlphaGamma->getSelectionInterface()->selectByValue(alpha_gamma);
-            mComboAlphaGamma->setEnabled(true);
-        }


This moved down below so the UI could enabled even when permissions are no-mod.

AndrewMeadows · 2024-09-17T17:04:23Z

indra/newview/llviewerobject.cpp

-    LLFilenameAndTask(const LLFilenameAndTask& rhs);
-    const LLFilenameAndTask& operator=(const LLFilenameAndTask& rhs) const;
+    LLFilenameAndTask(const LLFilenameAndTask& rhs) = delete;
+    const LLFilenameAndTask& operator=(const LLFilenameAndTask& rhs) = delete;


VisualStudio was warning about these unimplemented methods. It looks like someone wanted to restrict the usage of these normally-default methods so I did it correctly using the delete keyword and the compiler did not complain.

AndrewMeadows · 2024-09-17T17:07:07Z

indra/newview/llvoavatar.cpp

@@ -243,7 +243,8 @@ struct LLTextureMaskData

 struct LLAppearanceMessageContents: public LLRefCount
 {
-    LLAppearanceMessageContents():
+    LLAppearanceMessageContents(U8 num_tes):
+        mTEContents(num_tes),


LLTEContents now requires "num_textures" argument in its ctor, so LLAppearanceMessage (which has a LLTEContents data member) also requires the same argument so it can pass it over.

AndrewMeadows · 2024-09-17T17:09:50Z

indra/llprimitive/llprimitive.cpp

-        color.mV[VALPHA]    = F32(255 - colors[i].mV[VALPHA]) / 255.f;
-
-        retval |= setTEColor(i, color);
-    }


The motivation for the DRY pass was to eliminate duplicate unpacking logic. We now have a single method where this is done.

// static S32 LLPrimitive::parseTEMessage(U8* packed_buffer, U32 data_size, LLTEContents& tec)

AndrewMeadows · 2024-09-17T17:13:00Z

indra/llprimitive/llprimitive.h

    bool packTEMessage(LLMessageSystem *mesgsys) const;
-    bool packTEMessage(LLDataPacker &dp) const;


The packTEMessage() that expected an LLDataPacker& argument has been removed: it was never called anywhere.

Geenz · 2024-09-18T01:07:01Z

This generally looks good to me - I'm willing to accept the de-crustifying of LLPrimitive's TE packing at face value unless someone would like to take up that review. It generally looks good to me on that front. If there's no objections, I'll merge into legacy-alpha-params

If there's no objections by the time I hit my next hotel tomorrow evening, I'll merge it into legacy-alpha-params

github-actions bot added c/cpp llprimitive labels Sep 10, 2024

AndrewMeadows commented Sep 10, 2024

View reviewed changes

indra/llprimitive/llprimitive.cpp Outdated Show resolved Hide resolved

AndrewMeadows commented Sep 10, 2024

View reviewed changes

indra/llprimitive/llprimitive.cpp Outdated Show resolved Hide resolved

AndrewMeadows commented Sep 10, 2024

View reviewed changes

indra/llprimitive/llprimitive.cpp Outdated Show resolved Hide resolved

AndrewMeadows commented Sep 10, 2024

View reviewed changes

AndrewMeadows requested a review from Geenz September 10, 2024 16:26

fix the alpha-gamma-bypass prototype

80776d9

AndrewMeadows force-pushed the leviathan/alpha-gamma branch from 2a5e382 to 80776d9 Compare September 10, 2024 22:45

AndrewMeadows added 2 commits September 17, 2024 09:13

enable AlphaGamma UI when modable or owned

ca6a31d

DRY pack/unpack TextureEntry message blocks

34994a6

Also reduce memory footprint for LLTEContents during pack/unpack (only allocate room for as many LLTextureEntry's the object has)

AndrewMeadows commented Sep 17, 2024

View reviewed changes

remove cruft

a7253e4

Geenz approved these changes Sep 18, 2024

View reviewed changes

AndrewMeadows merged commit 624e8da into geenz/feat/legacy-alpha-params Sep 18, 2024
11 checks passed

AndrewMeadows deleted the leviathan/alpha-gamma branch September 18, 2024 04:56

github-actions bot locked and limited conversation to collaborators Sep 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix for alpha-gamma-bypass prototype #2538

fix for alpha-gamma-bypass prototype #2538

AndrewMeadows commented Sep 10, 2024

AndrewMeadows Sep 10, 2024

AndrewMeadows Sep 10, 2024

Geenz Sep 18, 2024

AndrewMeadows Sep 10, 2024 •

edited

Loading

Geenz Sep 18, 2024

AndrewMeadows Sep 18, 2024

AndrewMeadows Sep 10, 2024

AndrewMeadows Sep 17, 2024 •

edited

Loading

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

AndrewMeadows Sep 17, 2024

Geenz commented Sep 18, 2024 •

edited

Loading

		bool packTEMessage(LLMessageSystem *mesgsys) const;
		bool packTEMessage(LLDataPacker &dp) const;

		*/

		#pragma once

fix for alpha-gamma-bypass prototype #2538

fix for alpha-gamma-bypass prototype #2538

Conversation

AndrewMeadows commented Sep 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndrewMeadows Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndrewMeadows Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Geenz commented Sep 18, 2024 • edited Loading

AndrewMeadows Sep 10, 2024 •

edited

Loading

AndrewMeadows Sep 17, 2024 •

edited

Loading

Geenz commented Sep 18, 2024 •

edited

Loading