diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-28 11:20:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-28 11:20:06 -0500 |
| commit | 2752ab3b6212266047bd6b63b076d5be9b2a2d64 (patch) | |
| tree | cfae87bddb01cdf623a54b2a27c78ab2801c4a56 /indra/llprimitive/llgltfmaterial.h | |
| parent | 81553613551ffc7c8253d67a3fb3a24137d19d51 (diff) | |
| parent | 467c9f627c22dd88d9e9d058583b8279a2c5564e (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index ea7e402805..b0afb11bb5 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -118,6 +118,7 @@ public: void setRoughnessFactor(F32 roughness); void setAlphaMode(S32 mode); void setDoubleSided(bool double_sided); + void setTextureOffset(TextureInfo texture_info, const LLVector2& offset); void setTextureScale(TextureInfo texture_info, const LLVector2& scale); void setTextureRotation(TextureInfo texture_info, float rotation); @@ -189,5 +190,12 @@ public: void applyOverride(const LLGLTFMaterial& override_mat); +private: + + template<typename T> + void setFromTexture(const tinygltf::Model& model, const T& texture_info, TextureInfo texture_info_id, LLUUID& texture_id_out); + + template<typename T> + void writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, const LLUUID& texture_id, bool is_override, const LLUUID& base_texture_id) const; }; |