From 800d5c23c3bc95bf326e66f5615ec9ae55e1fe65 Mon Sep 17 00:00:00 2001 From: contriteobserver Date: Mon, 1 Feb 2021 23:33:55 -0800 Subject: [PATCH 1/7] implements a DefaultIOSystem that provides access to files bundled with Android Applications addresses issue #3633 --- .../port/AndroidJNI/BundledAssetIOSystem.h | 93 +++++++++++++++++++ port/AndroidJNI/BundledAssetIOSystem.cpp | 80 ++++++++++++++++ port/AndroidJNI/CMakeLists.txt | 11 ++- 3 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 include/assimp/port/AndroidJNI/BundledAssetIOSystem.h create mode 100644 port/AndroidJNI/BundledAssetIOSystem.cpp diff --git a/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h new file mode 100644 index 000000000..a61d80fd5 --- /dev/null +++ b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h @@ -0,0 +1,93 @@ +/* +Open Asset Import Library (assimp) +---------------------------------------------------------------------- + +Copyright (c) 2006-2020, 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 Android implementation of IOSystem using the standard C file functions. + * Aimed to ease the access to android assets */ + +#if __ANDROID__ and __ANDROID_API__ > 9 and defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) +#ifndef AI_BUNDLEDASSETIOSYSTEM_H_INC +#define AI_BUNDLEDASSETIOSYSTEM_H_INC + +#include + +#include +#include + +namespace Assimp { + +class BundledAssetIOSystem : public Assimp::DefaultIOSystem { + +public: + AAssetManager* mApkAssetManager; + + BundledAssetIOSystem(JNIEnv* env, jobject assetManager) { mApkAssetManager = AAssetManager_fromJava(env, assetManager); } + ~BundledAssetIOSystem() {}; + + bool Exists( const char* pFile) const; + + Assimp::IOStream* Open( const char* pFile, const char* pMode = "rb"); + + void Close( Assimp::IOStream* pFile); + +private: + + class AssetIOStream : public Assimp::IOStream { + AAsset * asset; + + public: + AssetIOStream(AAsset *asset) { this->asset = asset; }; + ~AssetIOStream() { AAsset_close(asset); } + + size_t Read(void* pvBuffer, size_t pSize, size_t pCount) { return AAsset_read(asset, pvBuffer, pSize * pCount);} + size_t Write(const void* pvBuffer, size_t pSize, size_t pCount) { return 0; }; + aiReturn Seek(size_t pOffset, aiOrigin pOrigin) { return (AAsset_seek(asset, pOffset, pOrigin) >= 0 ? aiReturn_SUCCESS : aiReturn_FAILURE); } + size_t Tell() const { return(AAsset_getLength(asset) - AAsset_getRemainingLength(asset)); }; + size_t FileSize() const { return AAsset_getLength(asset); } + void Flush() { } + }; + +}; + + +} //!ns Assimp + +#endif //AI_BUNDLEDASSETIOSYSTEM_H_INC +#endif //__ANDROID__ and __ANDROID_API__ > 9 and defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) + diff --git a/port/AndroidJNI/BundledAssetIOSystem.cpp b/port/AndroidJNI/BundledAssetIOSystem.cpp new file mode 100644 index 000000000..e280d5b90 --- /dev/null +++ b/port/AndroidJNI/BundledAssetIOSystem.cpp @@ -0,0 +1,80 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2020, 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 Android extension of DefaultIOSystem using the standard C file functions */ + +#include +#include +#include + +#if __ANDROID__ and __ANDROID_API__ > 9 and defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) + +#include + +using namespace Assimp; + +/** Tests for the existence of a file at the given path. */ +bool BundledAssetIOSystem::Exists(const char* pFile) const { + ai_assert(NULL != mApkAssetManager); + AAsset * asset = AAssetManager_open(mApkAssetManager, pFile, AASSET_MODE_UNKNOWN); + if (!asset) { return false; } + if (asset) AAsset_close(asset); + return true; +} + +// ------------------------------------------------------------------- +/** Open a new file with a given path. */ +Assimp::IOStream* BundledAssetIOSystem::Open(const char* pFile, const char* pMode) { + ai_assert(NULL != mApkAssetManager); + AAsset * asset = AAssetManager_open(mApkAssetManager, pFile, AASSET_MODE_UNKNOWN); + if (!asset) { return NULL; } + + return new AssetIOStream(asset); +} + +// ------------------------------------------------------------------- +/** Closes the given file and releases all resources associated with it. */ +void BundledAssetIOSystem::Close(Assimp::IOStream* pFile) { + delete reinterpret_cast(pFile); +} + +#endif // __ANDROID__ and __ANDROID_API__ > 9 and defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) + diff --git a/port/AndroidJNI/CMakeLists.txt b/port/AndroidJNI/CMakeLists.txt index 8f034db8b..1a88a4e2e 100644 --- a/port/AndroidJNI/CMakeLists.txt +++ b/port/AndroidJNI/CMakeLists.txt @@ -2,5 +2,14 @@ cmake_minimum_required(VERSION 3.10) include_directories(./) include_directories(./../../) -add_library(android_jniiosystem STATIC AndroidJNIIOSystem.cpp) +add_library( # Defines the name of the library. + android_jniiosystem + + # Implements a shared library. + STATIC + + # relative path to source file(s). + AndroidJNIIOSystem.cpp + BundledAssetIOSystem.cpp +) TARGET_LINK_LIBRARIES(android_jniiosystem android log) From 74b70cad7935068654d15d7ecff0bfcb7ece270a Mon Sep 17 00:00:00 2001 From: contriteobserver Date: Mon, 1 Feb 2021 23:44:57 -0800 Subject: [PATCH 2/7] fixed a typo --- port/AndroidJNI/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port/AndroidJNI/CMakeLists.txt b/port/AndroidJNI/CMakeLists.txt index 1a88a4e2e..b722b794a 100644 --- a/port/AndroidJNI/CMakeLists.txt +++ b/port/AndroidJNI/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(./../../) add_library( # Defines the name of the library. android_jniiosystem - # Implements a shared library. + # Implements a static library. STATIC # relative path to source file(s). From 2d4bc2d04ec72c4b498be8a78503f9617e687fad Mon Sep 17 00:00:00 2001 From: Guangmo Lin Date: Tue, 9 Feb 2021 14:10:44 +0800 Subject: [PATCH 3/7] Eliminate maybe-uninitialized warnings which are treated as errors when use -DCMAKE_BUILD_TYPE=Release --- code/AssetLib/M3D/m3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/AssetLib/M3D/m3d.h b/code/AssetLib/M3D/m3d.h index c25c633ba..dfc30aec3 100644 --- a/code/AssetLib/M3D/m3d.h +++ b/code/AssetLib/M3D/m3d.h @@ -1642,7 +1642,7 @@ static int _m3dstbi__expand_png_palette(_m3dstbi__png *a, unsigned char *palette static int _m3dstbi__parse_png_file(_m3dstbi__png *z, int scan, int req_comp) { unsigned char palette[1024], pal_img_n = 0; unsigned char has_trans = 0, tc[3] = {}; - _m3dstbi__uint16 tc16[3]; + _m3dstbi__uint16 tc16[3] = {}; _m3dstbi__uint32 ioff = 0, idata_limit = 0, i, pal_len = 0; int first = 1, k, interlace = 0, color = 0; _m3dstbi__context *s = z->s; From 52c66406fa37a9c3e9585342e2c4dde308ae7811 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 12 Feb 2021 20:59:45 +0100 Subject: [PATCH 4/7] Update defs.h --- include/assimp/defs.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/include/assimp/defs.h b/include/assimp/defs.h index d2077d8b4..d61fd7901 100644 --- a/include/assimp/defs.h +++ b/include/assimp/defs.h @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2021, assimp team All rights reserved. @@ -156,24 +156,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif // _WIN32 #ifdef _MSC_VER -#pragma warning(disable : 4521 4512 4714 4127 4351 4510) -#ifdef ASSIMP_BUILD_DLL_EXPORT -#pragma warning(disable : 4251) -#endif -/* Force the compiler to inline a function, if possible - */ -#define AI_FORCE_INLINE __forceinline + #pragma warning(disable : 4521 4512 4714 4127 4351 4510) + #ifdef ASSIMP_BUILD_DLL_EXPORT + #pragma warning(disable : 4251) + #endif + /* Force the compiler to inline a function, if possible */ + #define AI_FORCE_INLINE inline -/* Tells the compiler that a function never returns. Used in code analysis - * to skip dead paths (e.g. after an assertion evaluated to false). */ -#define AI_WONT_RETURN __declspec(noreturn) + /* Tells the compiler that a function never returns. Used in code analysis + * to skip dead paths (e.g. after an assertion evaluated to false). */ + #define AI_WONT_RETURN __declspec(noreturn) #elif defined(SWIG) - -/* Do nothing, the relevant defines are all in AssimpSwigPort.i */ - + /* Do nothing, the relevant defines are all in AssimpSwigPort.i */ #else -#define AI_WONT_RETURN -#define AI_FORCE_INLINE inline + #define AI_WONT_RETURN + #define AI_FORCE_INLINE inline #endif // (defined _MSC_VER) #ifdef __GNUC__ From 047b45d17269e57c5d62862ecb79bddf0867ea2d Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 15 Feb 2021 11:51:20 +0100 Subject: [PATCH 5/7] Fix apha value - The alpha value in materials using the Tr format must be inverted - closes https://github.com/assimp/assimp/issues/3645 --- code/AssetLib/Obj/ObjFileMtlImporter.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/AssetLib/Obj/ObjFileMtlImporter.cpp b/code/AssetLib/Obj/ObjFileMtlImporter.cpp index 283735912..bf1b70c90 100644 --- a/code/AssetLib/Obj/ObjFileMtlImporter.cpp +++ b/code/AssetLib/Obj/ObjFileMtlImporter.cpp @@ -122,8 +122,8 @@ void ObjFileMtlImporter::load() { { ++m_DataIt; getColorRGBA(&m_pModel->m_pCurrentMaterial->ambient); - } else if (*m_DataIt == 'd') // Diffuse color - { + } else if (*m_DataIt == 'd') { + // Diffuse color ++m_DataIt; getColorRGBA(&m_pModel->m_pCurrentMaterial->diffuse); } else if (*m_DataIt == 's') { @@ -144,7 +144,9 @@ void ObjFileMtlImporter::load() { } else if (*m_DataIt == 'r') { // Material transmission alpha value ++m_DataIt; - getFloatValue(m_pModel->m_pCurrentMaterial->alpha); + ai_real d; + getFloatValue(d); + m_pModel->m_pCurrentMaterial->alpha = static_cast(1.0) - d; } m_DataIt = skipLine(m_DataIt, m_DataItEnd, m_uiLine); } break; From dac7243b94d8889e32b712b171049ab405e591c7 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 15 Feb 2021 13:43:39 +0100 Subject: [PATCH 6/7] Update BundledAssetIOSystem.h --- include/assimp/port/AndroidJNI/BundledAssetIOSystem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h index a61d80fd5..bc1ce7878 100644 --- a/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h +++ b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2021, assimp team All rights reserved. Redistribution and use of this software in source and binary forms, From 242e9c21a935381ba9f0fff44e427d86635844ab Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 15 Feb 2021 13:44:07 +0100 Subject: [PATCH 7/7] Update BundledAssetIOSystem.cpp --- port/AndroidJNI/BundledAssetIOSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port/AndroidJNI/BundledAssetIOSystem.cpp b/port/AndroidJNI/BundledAssetIOSystem.cpp index e280d5b90..39daf991b 100644 --- a/port/AndroidJNI/BundledAssetIOSystem.cpp +++ b/port/AndroidJNI/BundledAssetIOSystem.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2021, assimp team All rights reserved.