diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-19 14:41:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-19 14:41:17 -0500 |
| commit | de4c018499ddaebbe466fb5a8938554a2d4a3b19 (patch) | |
| tree | c2571311bb27190bc2ef9ff03c071169748ef7a2 /indra/newview/llviewerobject.h | |
| parent | d0c2c862efe2ce684b48092465cc753b3ab64da9 (diff) | |
SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 9d80f095c9..5d72f7f3c3 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -371,12 +371,6 @@ public: LLViewerTexture *getTENormalMap(const U8 te) const; LLViewerTexture *getTESpecularMap(const U8 te) const; - LLViewerTexture* getGLTFBaseColorMap(U8 te) const { return mGLTFBaseColorMaps[te]; } - LLViewerTexture* getGLTFNormalMap(U8 te) const { return mGLTFNormalMaps[te]; } - LLViewerTexture* getGLTFEmissiveMap(U8 te) const { return mGLTFEmissiveMaps[te]; } - LLViewerTexture* getGLTFMetallicRoughnessMap(U8 te) const { return mGLTFMetallicRoughnessMaps[te]; } - - bool isImageAlphaBlended(const U8 te) const; void fitFaceTexture(const U8 face); @@ -693,13 +687,6 @@ public: LLPointer<LLViewerTexture> *mTENormalMaps; LLPointer<LLViewerTexture> *mTESpecularMaps; - std::vector<LLPointer<LLViewerTexture> > mGLTFBaseColorMaps; - std::vector<LLPointer<LLViewerTexture> > mGLTFNormalMaps; - std::vector<LLPointer<LLViewerTexture> > mGLTFMetallicRoughnessMaps; - std::vector<LLPointer<LLViewerTexture> > mGLTFEmissiveMaps; - - - // true if user can select this object by clicking under any circumstances (even if pick_unselectable is true) // can likely be factored out BOOL mbCanSelect; |