#1392 GLTF Upload (#1394)

* #1392 WIP -- Functional texture upload, stubbed out .bin upload.

* #1392 GLTF Upload WIP -- Emulates successful upload

Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin

* Add missing notification

* Build fix

* #1392 Add boost::json .gltf reading support.

* #1392 boost::json GLTF writing prototype

* Create gltf/README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* #1392 Add ability to render directly from LL::GLTF::Material

* Fix for mac build

* Mac build fix

* #1392 AssetType and Inventory Type plumbing

* #1392 More sane error handling and scheduling of uploads.

* #1392 Actually attempt to upload glbin

* Mac build fix, upload nudge

* Mac build fix

* Fix glTF asset uploads to server

* Mac build fix (inline not static)

* More consistent inline

* Add glm, mac nudge.

* #1392 For consistency with spec, start using glm over glh:: and LLFoo

* Another attempt at placating Mac builds

* Another Mac nudge

* Mac build take 23

* #1392 Prune LLMatrix4a from GLTF namespace.

* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)

* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering

* #1392 Working download!

* #1394 Add support for GLTFEnabled SimulatorFeature

* #1392 Review feedback

---------

Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/gltfscenemanager.h b/indra/newview/gltfscenemanager.h
index 8f29f34c30..a6754d0484 100644
--- a/indra/newview/gltfscenemanager.h
+++ b/indra/newview/gltfscenemanager.h
@@ -54,6 +54,7 @@ namespace LL
         void save(const std::string& filename); // save selected asset to filename (suitable for use in external programs)
         void decomposeSelection(); // open file picker and choose a location to decompose to
         void decomposeSelection(const std::string& filename); // decompose selected asset into simulator-ready .gltf, .bin, and .j2c files
+        void uploadSelection(); // decompose selected asset and upload to simulator
 
         void update();
         void render(bool opaque, bool rigged = false);
@@ -77,7 +78,18 @@ namespace LL
 
         void renderDebug();
 
+        void addGLTFObject(LLViewerObject* object, LLUUID gltf_id);
+        static void onGLTFLoadComplete(const LLUUID& id, LLAssetType::EType asset_type, void* user_data, S32 status, LLExtStat ext_status);
+        static void onGLTFBinLoadComplete(const LLUUID& id, LLAssetType::EType asset_type, void* user_data, S32 status, LLExtStat ext_status);
+
         std::vector<LLPointer<LLViewerObject>> mObjects;
+
+        std::shared_ptr<GLTF::Asset> mUploadingAsset;
+        bool mGLTFUploadPending = false;
+        LLPointer<LLViewerObject> mUploadingObject;
+        U32 mPendingImageUploads = 0;
+        U32 mPendingBinaryUploads = 0;
+        U32 mPendingGLTFUploads = 0;
     };
 }