Merge pull request #4142 from Daniel-Genkin/master

Added another constructor to avoid requiring a full ANativeActivity

include/assimp/port/AndroidJNI/AndroidJNIIOSystem.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,
@@ -54,36 +54,32 @@ namespace Assimp	{
 
 // ---------------------------------------------------------------------------
 /** Android extension to DefaultIOSystem using the standard C file functions */
-class ASSIMP_API AndroidJNIIOSystem : public DefaultIOSystem
+class ASSIMP_API AndroidJNIIOSystem : public DefaultIOSystem {
-{
 public:
-
 	/** Initialize android activity data */
 	std::string mApkWorkspacePath;
 	AAssetManager* mApkAssetManager;
 
-	/** Constructor. */
+	/// Constructor.
 	AndroidJNIIOSystem(ANativeActivity* activity);
 
-	/** Destructor. */
+    /// Class constructor with past and asset manager.
+	AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager);
+
+	/// Destructor.
 	~AndroidJNIIOSystem();
 
-	// -------------------------------------------------------------------
+	/// Tests for the existence of a file at the given path.
-	/** Tests for the existence of a file at the given path. */
 	bool Exists( const char* pFile) const;
 
-	// -------------------------------------------------------------------
+	/// Opens a file at the given path, with given mode
-	/** Opens a file at the given path, with given mode */
 	IOStream* Open( const char* strFile, const char* strMode);
 
-	// ------------------------------------------------------------------------------------------------
+	/// Inits Android extractor
-	// Inits Android extractor
 	void AndroidActivityInit(ANativeActivity* activity);
 
-	// ------------------------------------------------------------------------------------------------
+	/// Extracts android asset
-	// Extracts android asset
 	bool AndroidExtractAsset(std::string name);
-
 };
 
 } //!ns Assimp

port/AndroidJNI/AndroidJNIIOSystem.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.
 
@@ -67,45 +67,50 @@ AndroidJNIIOSystem::AndroidJNIIOSystem(ANativeActivity* activity)
 	AndroidActivityInit(activity);
 }
 
+AndroidJNIIOSystem::AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager) :
+        mApkWorkspacePath(internalDataPath),
+        mApkAssetManager(assetManager) {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Destructor.
-AndroidJNIIOSystem::~AndroidJNIIOSystem()
+AndroidJNIIOSystem::~AndroidJNIIOSystem() {
-{
     // nothing to do here
 }
 
 // ------------------------------------------------------------------------------------------------
 // Tests for the existence of a file at the given path.
-bool AndroidJNIIOSystem::Exists( const char* pFile) const
+bool AndroidJNIIOSystem::Exists( const char* pFile) const {
-{
+    AAsset* asset = AAssetManager_open(mApkAssetManager, pFile, AASSET_MODE_UNKNOWN);
-	AAsset* asset = AAssetManager_open(mApkAssetManager, pFile,
-			AASSET_MODE_UNKNOWN);
     FILE* file = ::fopen( (mApkWorkspacePath + getOsSeparator() + std::string(pFile)).c_str(), "rb");
 	
-	if (!asset && !file)
+    if (!asset && !file) {
-		{
         __android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset manager can not find: %s", pFile);
         return false;
     }
 
     __android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset exists");
-	if (file)
+    if (file) {
         ::fclose( file);
+    }
+    
     return true;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Inits Android extractor
-void AndroidJNIIOSystem::AndroidActivityInit(ANativeActivity* activity)
+void AndroidJNIIOSystem::AndroidActivityInit(ANativeActivity* activity) {
-{
+    if (activity == nullptr) {
+        return;
+    }
     mApkWorkspacePath = activity->internalDataPath;
     mApkAssetManager = activity->assetManager;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Create the directory for the extracted resource
-static int mkpath(std::string path, mode_t mode)
+static int mkpath(std::string path, mode_t mode) {
-{
     if (mkdir(path.c_str(), mode) == -1) {
         switch(errno) {
             case ENOENT:
@@ -125,8 +130,7 @@ static int mkpath(std::string path, mode_t mode)
 
 // ------------------------------------------------------------------------------------------------
 // Extracts android asset
-bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name)
+bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name) {
-{
     std::string newPath = mApkWorkspacePath + getOsSeparator() + name;
 
     DefaultIOSystem io;
@@ -136,6 +140,7 @@ bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name)
         __android_log_print(ANDROID_LOG_DEFAULT, "Assimp", "Asset already extracted");
         return true;
     }
+	
     // Open file
     AAsset* asset = AAssetManager_open(mApkAssetManager, name.c_str(),
 			AASSET_MODE_UNKNOWN);
@@ -159,16 +164,13 @@ bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name)
         directoryNewPath = dirname(&directoryNewPath[0]);
 
         if (mkpath(directoryNewPath, S_IRUSR | S_IWUSR | S_IXUSR) == -1) {
-			__android_log_print(ANDROID_LOG_ERROR, "assimp",
+             __android_log_print(ANDROID_LOG_ERROR, "assimp", "Can not create the directory for the output file");
-					"Can not create the directory for the output file");
         }
 
         // Prepare output buffer
-		std::ofstream assetExtracted(newPath.c_str(),
+        std::ofstream assetExtracted(newPath.c_str(), std::ios::out | std::ios::binary);
-				std::ios::out | std::ios::binary);
         if (!assetExtracted) {
-			__android_log_print(ANDROID_LOG_ERROR, "assimp",
+            __android_log_print(ANDROID_LOG_ERROR, "assimp", "Can not open output file");
-					"Can not open output file");
         }
 
         // Write output buffer into a file
@@ -180,24 +182,25 @@ bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name)
         __android_log_print(ANDROID_LOG_ERROR, "assimp", "Asset not found: %s", name.c_str());
         return false;
     }
+	
     return true;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Open a new file with a given path.
-IOStream* AndroidJNIIOSystem::Open( const char* strFile, const char* strMode)
+IOStream* AndroidJNIIOSystem::Open( const char* strFile, const char* strMode) {
-{
+    ai_assert(nullptr != strFile);
-	ai_assert(NULL != strFile);
+    ai_assert(nullptr != strMode);
-	ai_assert(NULL != strMode);
 
     std::string fullPath(mApkWorkspacePath + getOsSeparator() + std::string(strFile));
-	if	(Exists(strFile))
+    if (Exists(strFile)) {
 	AndroidExtractAsset(std::string(strFile));
+    }
 
     FILE* file = ::fopen( fullPath.c_str(), strMode);
-
+    if (nullptr == file) {
-	if( NULL == file)
+        return nullptr;
-		return NULL;
+    }
 
     __android_log_print(ANDROID_LOG_ERROR, "assimp", "AndroidIOSystem: file %s opened", fullPath.c_str());
     return new DefaultIOStream(file, fullPath);