forked from assimp/assimp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[USD] Integrate "tinyusdz" project (assimp#5628)
* Squash development commits for PR * Fix failing build on armeabi-v7a via android NDK * Update with blendshape support * Migrate to auto-cloning and patching tinyusdz (instead of manually copying files) * Update to latest rendermesh-refactor branch commit * Remove tracked file * Update to use recent commit to "dev" branch "rendermesh-refactor" was merged to "dev" around 9 May 2024 but merge was not obvious from commit messages * Add UNUSED() macro (cherry picked from commit d89fe8f034c353cc5cc5b3ac78cd8845e006de38) * Update tinyusdz branch * Prevent per-ABI (x86, x86_64 etc) clone on android * Add verbose logging cmake option * Fix macro and patch * Address compiler warnings * Address compiler warnings * Address compiler warnings * Attempt prevent re-clone/re-patch once downloaded by any ABI build * Disable tinyusdz clone/build by default assimp github PR auto-CI checks clone/build the tinyusdz code, and reject PR due to compiler warnings in the 3rd party external tinyusdz project --------- Co-authored-by: Steve M <[email protected]>
- Loading branch information
1 parent
d3bec44
commit 0cb1693
Showing
37 changed files
with
2,167 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| --------------------------------------------------------------------------- | ||
| Open Asset Import Library (assimp) | ||
| --------------------------------------------------------------------------- | ||
| Copyright (c) 2006-2024, assimp team | ||
| All rights reserved. | ||
| Redistribution and use of this software in source and binary forms, | ||
| with or without modification, are permitted provided that the following | ||
| conditions are met: | ||
| * Redistributions of source code must retain the above | ||
| copyright notice, this list of conditions and the | ||
| following disclaimer. | ||
| * Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the | ||
| following disclaimer in the documentation and/or other | ||
| materials provided with the distribution. | ||
| * Neither the name of the assimp team, nor the names of its | ||
| contributors may be used to endorse or promote products | ||
| derived from this software without specific prior | ||
| written permission of the assimp team. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| --------------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| /** @file USDLoader.cpp | ||
| * @brief Implementation of the USD importer class | ||
| */ | ||
|
|
||
| #ifndef ASSIMP_BUILD_NO_USD_IMPORTER | ||
| #include <memory> | ||
|
|
||
| // internal headers | ||
| #include <assimp/ai_assert.h> | ||
| #include <assimp/anim.h> | ||
| #include <assimp/DefaultIOSystem.h> | ||
| #include <assimp/DefaultLogger.hpp> | ||
| #include <assimp/fast_atof.h> | ||
| #include <assimp/Importer.hpp> | ||
| #include <assimp/importerdesc.h> | ||
| #include <assimp/IOStreamBuffer.h> | ||
| #include <assimp/IOSystem.hpp> | ||
| #include <assimp/scene.h> | ||
| #include <assimp/StringUtils.h> | ||
| #include <assimp/StreamReader.h> | ||
|
|
||
| #include "USDLoader.h" | ||
| #include "USDLoaderUtil.h" | ||
| #include "USDPreprocessor.h" | ||
|
|
||
| static constexpr aiImporterDesc desc = { | ||
| "USD Object Importer", | ||
| "", | ||
| "", | ||
| "https://en.wikipedia.org/wiki/Universal_Scene_Description/", | ||
| aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 0, | ||
| "usd usda usdc usdz" | ||
| }; | ||
|
|
||
| namespace Assimp { | ||
| using namespace std; | ||
|
|
||
| // Constructor to be privately used by Importer | ||
| USDImporter::USDImporter() : | ||
| impl(USDImporterImplTinyusdz()) { | ||
| } | ||
|
|
||
| // ------------------------------------------------------------------------------------------------ | ||
|
|
||
| bool USDImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const { | ||
| UNUSED(checkSig); | ||
| // Based on token | ||
| static const uint32_t usdcTokens[] = { AI_MAKE_MAGIC("PXR-USDC") }; | ||
| bool canRead = CheckMagicToken(pIOHandler, pFile, usdcTokens, AI_COUNT_OF(usdcTokens)); | ||
| if (canRead) { | ||
| return canRead; | ||
| } | ||
|
|
||
| // Based on extension | ||
| // TODO: confirm OK to replace this w/SimpleExtensionCheck() below | ||
| canRead = isUsd(pFile) || isUsda(pFile) || isUsdc(pFile) || isUsdz(pFile); | ||
| if (canRead) { | ||
| return canRead; | ||
| } | ||
| canRead = SimpleExtensionCheck(pFile, "usd", "usda", "usdc", "usdz"); | ||
| return canRead; | ||
| } | ||
|
|
||
| const aiImporterDesc *USDImporter::GetInfo() const { | ||
| return &desc; | ||
| } | ||
|
|
||
| void USDImporter::InternReadFile( | ||
| const std::string &pFile, | ||
| aiScene *pScene, | ||
| IOSystem *pIOHandler) { | ||
| impl.InternReadFile( | ||
| pFile, | ||
| pScene, | ||
| pIOHandler); | ||
| } | ||
|
|
||
| } // namespace Assimp | ||
|
|
||
| #endif // !! ASSIMP_BUILD_NO_USD_IMPORTER |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| Open Asset Import Library (assimp) | ||
| ---------------------------------------------------------------------- | ||
| Copyright (c) 2006-2024, assimp team | ||
| All rights reserved. | ||
| Redistribution and use of this software in source and binary forms, | ||
| with or without modification, are permitted provided that the | ||
| following conditions are met: | ||
| * Redistributions of source code must retain the above | ||
| copyright notice, this list of conditions and the | ||
| following disclaimer. | ||
| * Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the | ||
| following disclaimer in the documentation and/or other | ||
| materials provided with the distribution. | ||
| * Neither the name of the assimp team, nor the names of its | ||
| contributors may be used to endorse or promote products | ||
| derived from this software without specific prior | ||
| written permission of the assimp team. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| ---------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| /** @file USDLoader.h | ||
| * @brief Declaration of the USD importer class. | ||
| */ | ||
| #pragma once | ||
| #ifndef AI_USDLOADER_H_INCLUDED | ||
| #define AI_USDLOADER_H_INCLUDED | ||
|
|
||
| #include <assimp/BaseImporter.h> | ||
| #include <assimp/types.h> | ||
| #include <vector> | ||
| #include <cstdint> | ||
|
|
||
| #include "USDLoaderImplTinyusdz.h" | ||
|
|
||
| namespace Assimp { | ||
| class USDImporter : public BaseImporter { | ||
| public: | ||
| USDImporter(); | ||
| ~USDImporter() override = default; | ||
|
|
||
| /// \brief Returns whether the class can handle the format of the given file. | ||
| /// \remark See BaseImporter::CanRead() for details. | ||
| bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const override; | ||
|
|
||
| protected: | ||
| //! \brief Appends the supported extension. | ||
| const aiImporterDesc *GetInfo() const override; | ||
|
|
||
| void InternReadFile( | ||
| const std::string &pFile, | ||
| aiScene *pScene, | ||
| IOSystem *pIOHandler) override; | ||
| private: | ||
| USDImporterImplTinyusdz impl; | ||
| }; | ||
|
|
||
| } // namespace Assimp | ||
| #endif // AI_USDLOADER_H_INCLUDED |
Oops, something went wrong.