From 3dc6c22401b3125f4605fa464ecdbab836a73882 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Thu, 24 Apr 2025 07:51:04 +1000 Subject: Implemented PBR repeats per meter --- indra/newview/llpanelface.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llpanelface.h') diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 6e0d34cbd6..9d28065934 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -250,6 +250,7 @@ protected: void onCommitGLTFRotation(); void onCommitGLTFTextureOffsetU(); void onCommitGLTFTextureOffsetV(); + void onCommitGLTFRepeatsPerMeter(); void onClickAutoFix(); void onAlignTexture(); @@ -358,6 +359,7 @@ private: LLButton* mDelMedia { nullptr }; LLSpinCtrl* mPBRScaleU { nullptr }; LLSpinCtrl* mPBRScaleV { nullptr }; + LLSpinCtrl* mPBRRepeat { nullptr }; LLSpinCtrl* mPBRRotate { nullptr }; LLSpinCtrl* mPBROffsetU { nullptr }; LLSpinCtrl* mPBROffsetV { nullptr }; @@ -551,7 +553,9 @@ private: void updateVisibilityGLTF(LLViewerObject* objectp = nullptr); void updateSelectedGLTFMaterials(std::function func); + void updateSelectedGLTFMaterialsWithScale(std::function func); void updateGLTFTextureTransform(std::function edit); + void updateGLTFTextureTransformWithScale(const LLGLTFMaterial::TextureInfo texture_info, std::function edit); void setMaterialOverridesFromSelection(); -- cgit v1.2.3 From 1970390478447364ea4b677a629233f5be820e74 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Thu, 24 Apr 2025 23:46:42 +1000 Subject: Autofit Blinn Phong normal and specular when using repeats per meter --- indra/newview/llpanelface.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelface.h') diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 9d28065934..2a2156f041 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -650,6 +650,8 @@ public: static void getMaxSpecularRepeats(F32& repeats, bool& identical); static void getMaxNormalRepeats(F32& repeats, bool& identical); static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha); + static void selectionNormalScaleAutofit(LLPanelFace* panel_face, F32 repeats_per_meter); + static void selectionSpecularScaleAutofit(LLPanelFace* panel_face, F32 repeats_per_meter); DEF_GET_MAT_STATE(LLUUID, const LLUUID&, getNormalID, LLUUID::null, false, LLUUID::null); DEF_GET_MAT_STATE(LLUUID, const LLUUID&, getSpecularID, LLUUID::null, false, LLUUID::null); -- cgit v1.2.3