Merge branch 'master' into update_copyrights

include/assimp/defs.h

@@ -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__

include/assimp/port/AndroidJNI/BundledAssetIOSystem.h

@@ -0,0 +1,93 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2021, 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 <android/asset_manager_jni.h>
+
+#include <assimp/DefaultIOSystem.h>
+#include <assimp/IOStream.hpp>
+
+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)
+