diff options
Diffstat (limited to 'indra/newview/lltinygltfhelper.h')
| -rw-r--r-- | indra/newview/lltinygltfhelper.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lltinygltfhelper.h b/indra/newview/lltinygltfhelper.h index 9c2e5afc17..48a6985641 100644 --- a/indra/newview/lltinygltfhelper.h +++ b/indra/newview/lltinygltfhelper.h @@ -27,6 +27,7 @@ #pragma once #include "llgltfmaterial.h" +#include "llgltfmateriallist.h" #include "llpointer.h" #include "tinygltf/tiny_gltf.h" @@ -40,6 +41,18 @@ namespace LLTinyGLTFHelper LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index, std::string& name); LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index); + LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index); + + bool getMaterialFromFile( + const std::string& filename, + S32 mat_index, + LLPointer < LLFetchedGLTFMaterial> material, + std::string& material_name, + LLPointer<LLViewerFetchedTexture>& base_color_tex, + LLPointer<LLViewerFetchedTexture>& normal_tex, + LLPointer<LLViewerFetchedTexture>& mr_tex, + LLPointer<LLViewerFetchedTexture>& emissive_tex); + void initFetchedTextures(tinygltf::Material& material, LLPointer<LLImageRaw>& base_color_img, LLPointer<LLImageRaw>& normal_img, |