summaryrefslogtreecommitdiff
path: root/indra/newview/gltfscenemanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/gltfscenemanager.cpp')
-rw-r--r--indra/newview/gltfscenemanager.cpp252
1 files changed, 86 insertions, 166 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index 5413a7d021..eb11c60e43 100644
--- a/indra/newview/gltfscenemanager.cpp
+++ b/indra/newview/gltfscenemanager.cpp
@@ -107,32 +107,6 @@ void GLTFSceneManager::saveAs()
}
}
-void GLTFSceneManager::decomposeSelection()
-{
- LLViewerObject* obj = LLSelectMgr::instance().getSelection()->getFirstRootObject();
- if (obj && obj->mGLTFAsset)
- {
- LLFilePickerReplyThread::startPicker(
- [](const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter)
- {
- if (LLAppViewer::instance()->quitRequested())
- {
- return;
- }
- if (filenames.size() > 0)
- {
- GLTFSceneManager::instance().decomposeSelection(filenames[0]);
- }
- },
- LLFilePicker::FFSAVE_GLTF,
- "scene.gltf");
- }
- else
- {
- LLNotificationsUtil::add("GLTFSaveSelection");
- }
-}
-
void GLTFSceneManager::uploadSelection()
{
if (mUploadingAsset)
@@ -153,77 +127,74 @@ void GLTFSceneManager::uploadSelection()
for (auto& image : asset.mImages)
{
- if (!image.mData.empty())
+ if (image.mTexture.notNull())
{
mPendingImageUploads++;
- LLPointer<LLImageRaw> raw = new LLImageRaw(image.mWidth, image.mHeight, image.mComponent);
- U8* data = raw->allocateData();
- llassert_always(image.mData.size() == raw->getDataSize());
- memcpy(data, image.mData.data(), image.mData.size());
-
- // for GLTF native content, store image in GLTF orientation
- raw->verticalFlip();
-
- LLPointer<LLImageJ2C> j2c = LLViewerTextureList::convertToUploadFile(raw);
+ LLPointer<LLImageRaw> raw = image.mTexture->getCachedRawImage();
- std::string buffer;
- buffer.assign((const char*)j2c->getData(), j2c->getDataSize());
+ if (raw.notNull())
+ {
+ LLPointer<LLImageJ2C> j2c = LLViewerTextureList::convertToUploadFile(raw);
- LLUUID asset_id = LLUUID::generateNewID();
+ std::string buffer;
+ buffer.assign((const char*)j2c->getData(), j2c->getDataSize());
- std::string name;
- S32 idx = (S32)(&image - &asset.mImages[0]);
+ LLUUID asset_id = LLUUID::generateNewID();
- if (image.mName.empty())
- {
+ std::string name;
+ S32 idx = (S32)(&image - &asset.mImages[0]);
- name = llformat("Image_%d", idx);
- }
- else
- {
- name = image.mName;
- }
-
- LLNewBufferedResourceUploadInfo::uploadFailure_f failure = [this](LLUUID assetId, LLSD response, std::string reason)
+ if (image.mName.empty())
{
- // TODO: handle failure
- mPendingImageUploads--;
- return false;
- };
-
- LLNewBufferedResourceUploadInfo::uploadFinish_f finish = [this, idx, raw, j2c](LLUUID assetId, LLSD response)
+ name = llformat("Image_%d", idx);
+ }
+ else
{
- if (mUploadingAsset && mUploadingAsset->mImages.size() > idx)
+ name = image.mName;
+ }
+
+ LLNewBufferedResourceUploadInfo::uploadFailure_f failure = [this](LLUUID assetId, LLSD response, std::string reason)
{
- mUploadingAsset->mImages[idx].mUri = assetId.asString();
+ // TODO: handle failure
mPendingImageUploads--;
- }
- };
-
- S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(j2c);
-
- LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<LLNewBufferedResourceUploadInfo>(
- buffer,
- asset_id,
- name,
- name,
- 0,
- LLFolderType::FT_TEXTURE,
- LLInventoryType::IT_TEXTURE,
- LLAssetType::AT_TEXTURE,
- LLFloaterPerms::getNextOwnerPerms("Uploads"),
- LLFloaterPerms::getGroupPerms("Uploads"),
- LLFloaterPerms::getEveryonePerms("Uploads"),
- expected_upload_cost,
- false,
- finish,
- failure));
-
- upload_new_resource(uploadInfo);
-
- image.clearData(asset);
+ return false;
+ };
+
+
+ LLNewBufferedResourceUploadInfo::uploadFinish_f finish = [this, idx, raw, j2c](LLUUID assetId, LLSD response)
+ {
+ if (mUploadingAsset && mUploadingAsset->mImages.size() > idx)
+ {
+ mUploadingAsset->mImages[idx].mUri = assetId.asString();
+ mPendingImageUploads--;
+ }
+ };
+
+ S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(j2c);
+
+ LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<LLNewBufferedResourceUploadInfo>(
+ buffer,
+ asset_id,
+ name,
+ name,
+ 0,
+ LLFolderType::FT_TEXTURE,
+ LLInventoryType::IT_TEXTURE,
+ LLAssetType::AT_TEXTURE,
+ LLFloaterPerms::getNextOwnerPerms("Uploads"),
+ LLFloaterPerms::getGroupPerms("Uploads"),
+ LLFloaterPerms::getEveryonePerms("Uploads"),
+ expected_upload_cost,
+ false,
+ finish,
+ failure));
+
+ upload_new_resource(uploadInfo);
+
+ image.clearData(asset);
+ }
}
}
@@ -297,62 +268,45 @@ void GLTFSceneManager::uploadSelection()
}
}
-void GLTFSceneManager::decomposeSelection(const std::string& filename)
-{
- LLViewerObject* obj = LLSelectMgr::instance().getSelection()->getFirstRootObject();
- if (obj && obj->mGLTFAsset)
- {
- // copy asset out for decomposition
- Asset asset = *obj->mGLTFAsset;
-
- // decompose the asset into component parts
- asset.decompose(filename);
-
- // copy decomposed asset into tinygltf for serialization
- tinygltf::Model model;
- asset.save(model);
-
- LLTinyGLTFHelper::saveModel(filename, model);
- }
-}
-
void GLTFSceneManager::save(const std::string& filename)
{
LLViewerObject* obj = LLSelectMgr::instance().getSelection()->getFirstRootObject();
if (obj && obj->mGLTFAsset)
{
Asset* asset = obj->mGLTFAsset.get();
- tinygltf::Model model;
- asset->save(model);
-
- LLTinyGLTFHelper::saveModel(filename, model);
+ if (!asset->save(filename))
+ {
+ LLNotificationsUtil::add("GLTFSaveFailed");
+ }
}
}
void GLTFSceneManager::load(const std::string& filename)
{
- tinygltf::Model model;
- LLTinyGLTFHelper::loadModel(filename, model);
-
std::shared_ptr<Asset> asset = std::make_shared<Asset>();
- *asset = model;
- gDebugProgram.bind(); // bind a shader to satisfy LLVertexBuffer assertions
- asset->allocateGLResources(filename, model);
- asset->updateTransforms();
+ if (asset->load(filename))
+ {
+ gDebugProgram.bind(); // bind a shader to satisfy LLVertexBuffer assertions
+ asset->updateTransforms();
- // hang the asset off the currently selected object, or off of the avatar if no object is selected
- LLViewerObject* obj = LLSelectMgr::instance().getSelection()->getFirstRootObject();
+ // hang the asset off the currently selected object, or off of the avatar if no object is selected
+ LLViewerObject* obj = LLSelectMgr::instance().getSelection()->getFirstRootObject();
- if (obj)
- { // assign to self avatar
- obj->mGLTFAsset = asset;
- obj->markForUpdate();
- if (std::find(mObjects.begin(), mObjects.end(), obj) == mObjects.end())
- {
- mObjects.push_back(obj);
+ if (obj)
+ { // assign to self avatar
+ obj->mGLTFAsset = asset;
+ obj->markForUpdate();
+ if (std::find(mObjects.begin(), mObjects.end(), obj) == mObjects.end())
+ {
+ mObjects.push_back(obj);
+ }
}
}
+ else
+ {
+ LLNotificationsUtil::add("GLTFLoadFailed");
+ }
}
GLTFSceneManager::~GLTFSceneManager()
@@ -392,32 +346,19 @@ void GLTFSceneManager::onGLTFBinLoadComplete(const LLUUID& id, LLAssetType::ETyp
// find the Buffer with the given id in the asset
if (obj->mGLTFAsset)
{
- for (auto& buffer : obj->mGLTFAsset->mBuffers)
- {
- LLUUID buffer_id;
- if (LLUUID::parseUUID(buffer.mUri, &buffer_id) && buffer_id == id)
- {
- LLFileSystem file(id, asset_type, LLFileSystem::READ);
-
- buffer.mData.resize(file.getSize());
- file.read((U8*)buffer.mData.data(), buffer.mData.size());
+ obj->mGLTFAsset->mPendingBuffers--;
- obj->mGLTFAsset->mPendingBuffers--;
- if (obj->mGLTFAsset->mPendingBuffers == 0)
- {
- obj->mGLTFAsset->allocateGLResources();
- GLTFSceneManager& mgr = GLTFSceneManager::instance();
- if (std::find(mgr.mObjects.begin(), mgr.mObjects.end(), obj) == mgr.mObjects.end())
- {
- GLTFSceneManager::instance().mObjects.push_back(obj);
- }
- }
+ if (obj->mGLTFAsset->mPendingBuffers == 0)
+ {
+ obj->mGLTFAsset->prep();
+ GLTFSceneManager& mgr = GLTFSceneManager::instance();
+ if (std::find(mgr.mObjects.begin(), mgr.mObjects.end(), obj) == mgr.mObjects.end())
+ {
+ GLTFSceneManager::instance().mObjects.push_back(obj);
}
}
}
-
-
}
}
else
@@ -492,30 +433,9 @@ void GLTFSceneManager::update()
{
if (mPendingImageUploads == 0 && mPendingBinaryUploads == 0)
{
- std::string filename(gDirUtilp->getTempDir() + "/upload.gltf");
-#if 0
- tinygltf::Model model;
- mUploadingAsset->save(model);
-
- tinygltf::TinyGLTF writer;
-
- writer.WriteGltfSceneToFile(&model, filename, false, false, true, false);
-#else
boost::json::object obj;
mUploadingAsset->serialize(obj);
- std::string json = boost::json::serialize(obj, {});
-
- {
- std::ofstream o(filename);
- o << json;
- }
-#endif
-
- std::ifstream t(filename);
- std::stringstream str;
- str << t.rdbuf();
-
- std::string buffer = str.str();
+ std::string buffer = boost::json::serialize(obj, {});
LLNewBufferedResourceUploadInfo::uploadFailure_f failure = [this](LLUUID assetId, LLSD response, std::string reason)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-30 09:09:22 +0000