diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:47:27 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:47:27 +0300 |
commit | b06a99f7c76950484972e25d9dbbee8660a6a6c3 (patch) | |
tree | 58fb3b7d1c95cbd2eb938a9d0f252cdb3ab3b6a8 /indra/newview/gltf | |
parent | bf1235b017b254ba989b156c73c4ce18ba4e6c23 (diff) |
Post-merge spaces fix
Diffstat (limited to 'indra/newview/gltf')
-rw-r--r-- | indra/newview/gltf/asset.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/gltf/asset.h b/indra/newview/gltf/asset.h index 6e576a1ffe..5ceac74a8a 100644 --- a/indra/newview/gltf/asset.h +++ b/indra/newview/gltf/asset.h @@ -33,7 +33,7 @@ #include "primitive.h" #include "animation.h" -extern F32SecondsImplicit gFrameTimeSeconds; +extern F32SecondsImplicit gFrameTimeSeconds; // LL GLTF Implementation namespace LL @@ -52,7 +52,7 @@ namespace LL std::string mName; const Material& operator=(const tinygltf::Material& src); - + void allocateGLResources(Asset& asset); }; @@ -64,7 +64,7 @@ namespace LL std::string mName; const Mesh& operator=(const tinygltf::Mesh& src); - + void allocateGLResources(Asset& asset); }; @@ -85,7 +85,7 @@ namespace LL // if true, translation/rotation/scale are valid and up to date bool mTRSValid = false; - + bool mNeedsApplyMatrix = false; std::vector<S32> mChildren; @@ -146,7 +146,7 @@ namespace LL std::string mName; const Scene& operator=(const tinygltf::Scene& src); - + void updateTransforms(Asset& asset); void updateRenderTransforms(Asset& asset, const LLMatrix4a& modelview); }; @@ -229,7 +229,7 @@ namespace LL // prepare the asset for rendering void allocateGLResources(const std::string& filename, const tinygltf::Model& model); - + // Called periodically (typically once per frame) // Any ongoing work (such as animations) should be handled here // NOT guaranteed to be called every frame @@ -242,7 +242,7 @@ namespace LL // update node render transforms void updateRenderTransforms(const LLMatrix4a& modelview); - + void render(bool opaque, bool rigged = false); void renderOpaque(); void renderTransparent(); @@ -256,9 +256,9 @@ namespace LL LLVector4a* tangent = nullptr, // return the surface tangent at the intersection point S32* primitive_hitp = nullptr // return the index of the primitive that was hit ); - + const Asset& operator=(const tinygltf::Model& src); - + }; } } |