v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update AndroidJNIIOSystem.cpp

pull/4142/head
Kim Kulling 2021-10-28 17:50:25 +02:00 committed by GitHub
parent 6e5600a9a5
commit e5cd5733e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 83 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
port/AndroidJNI/AndroidJNIIOSystem.cpp
View File

@ -3,7 +3,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2021, assimp team
All rights reserved. All rights reserved.
@ -67,51 +67,50 @@ AndroidJNIIOSystem::AndroidJNIIOSystem(ANativeActivity* activity)
AndroidActivityInit(activity); AndroidActivityInit(activity);
} }
AndroidJNIIOSystem::AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager) AndroidJNIIOSystem::AndroidJNIIOSystem(const char *internalPath, AAssetManager assetManager) :
{ mApkWorkspacePath(internalDataPath),
mApkWorkspacePath = internalDataPath; mApkAssetManager(assetManager) {
mApkAssetManager = assetManager; // empty
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Destructor. // Destructor.
AndroidJNIIOSystem::~AndroidJNIIOSystem() AndroidJNIIOSystem::~AndroidJNIIOSystem() {
{ // nothing to do here
// nothing to do here
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Tests for the existence of a file at the given path. // 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, FILE* file = ::fopen( (mApkWorkspacePath + getOsSeparator() + std::string(pFile)).c_str(), "rb");
AASSET_MODE_UNKNOWN);
FILE* file = ::fopen( (mApkWorkspacePath + getOsSeparator() + std::string(pFile)).c_str(), "rb"); if (!asset && !file) {
__android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset manager can not find: %s", pFile);
return false;
}
if (!asset && !file) __android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset exists");
{ if (file) {
__android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset manager can not find: %s", pFile); ::fclose( file);
return false; }
}
return true;
__android_log_print(ANDROID_LOG_ERROR, "Assimp", "Asset exists");
if (file)
::fclose( file);
return true;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Inits Android extractor // Inits Android extractor
void AndroidJNIIOSystem::AndroidActivityInit(ANativeActivity* activity) void AndroidJNIIOSystem::AndroidActivityInit(ANativeActivity* activity) {
{ if (activity == nullptr) {
mApkWorkspacePath = activity->internalDataPath; return;
mApkAssetManager = activity->assetManager; }
mApkWorkspacePath = activity->internalDataPath;
mApkAssetManager = activity->assetManager;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Create the directory for the extracted resource // 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) { if (mkdir(path.c_str(), mode) == -1) {
switch(errno) { switch(errno) {
case ENOENT: case ENOENT:
@ -131,82 +130,80 @@ static int mkpath(std::string path, mode_t mode)
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Extracts android asset // Extracts android asset
bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name) bool AndroidJNIIOSystem::AndroidExtractAsset(std::string name) {
{ std::string newPath = mApkWorkspacePath + getOsSeparator() + name;
std::string newPath = mApkWorkspacePath + getOsSeparator() + name;
DefaultIOSystem io; DefaultIOSystem io;
// Do not extract if extracted already // Do not extract if extracted already
if ( io.Exists(newPath.c_str()) ) { if ( io.Exists(newPath.c_str()) ) {
__android_log_print(ANDROID_LOG_DEFAULT, "Assimp", "Asset already extracted"); __android_log_print(ANDROID_LOG_DEFAULT, "Assimp", "Asset already extracted");
return true; return true;
} }
// Open file
AAsset* asset = AAssetManager_open(mApkAssetManager, name.c_str(), // Open file
AAsset* asset = AAssetManager_open(mApkAssetManager, name.c_str(),
AASSET_MODE_UNKNOWN); AASSET_MODE_UNKNOWN);
std::vector<char> assetContent; std::vector<char> assetContent;
if (asset != NULL) { if (asset != NULL) {
// Find size // Find size
off_t assetSize = AAsset_getLength(asset); off_t assetSize = AAsset_getLength(asset);
// Prepare input buffer // Prepare input buffer
assetContent.resize(assetSize); assetContent.resize(assetSize);
// Store input buffer // Store input buffer
AAsset_read(asset, &assetContent[0], assetSize); AAsset_read(asset, &assetContent[0], assetSize);
// Close // Close
AAsset_close(asset); AAsset_close(asset);
// Prepare directory for output buffer // Prepare directory for output buffer
std::string directoryNewPath = newPath; std::string directoryNewPath = newPath;
directoryNewPath = dirname(&directoryNewPath[0]); directoryNewPath = dirname(&directoryNewPath[0]);
if (mkpath(directoryNewPath, S_IRUSR | S_IWUSR | S_IXUSR) == -1) { 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 // 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) {
if (!assetExtracted) { __android_log_print(ANDROID_LOG_ERROR, "assimp", "Can not open output file");
__android_log_print(ANDROID_LOG_ERROR, "assimp", }
"Can not open output file");
}
// Write output buffer into a file // Write output buffer into a file
assetExtracted.write(&assetContent[0], assetContent.size()); assetExtracted.write(&assetContent[0], assetContent.size());
assetExtracted.close(); assetExtracted.close();
__android_log_print(ANDROID_LOG_DEFAULT, "Assimp", "Asset extracted"); __android_log_print(ANDROID_LOG_DEFAULT, "Assimp", "Asset extracted");
} else { } else {
__android_log_print(ANDROID_LOG_ERROR, "assimp", "Asset not found: %s", name.c_str()); __android_log_print(ANDROID_LOG_ERROR, "assimp", "Asset not found: %s", name.c_str());
return false; return false;
} }
return true;
return true;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Open a new file with a given path. // 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)); std::string fullPath(mApkWorkspacePath + getOsSeparator() + std::string(strFile));
if (Exists(strFile)) if (Exists(strFile)) {
AndroidExtractAsset(std::string(strFile)); AndroidExtractAsset(std::string(strFile));
}
FILE* file = ::fopen( fullPath.c_str(), strMode); FILE* file = ::fopen( fullPath.c_str(), strMode);
if (nullptr == file) {
return nullptr;
}
if( NULL == file) __android_log_print(ANDROID_LOG_ERROR, "assimp", "AndroidIOSystem: file %s opened", fullPath.c_str());
return NULL; return new DefaultIOStream(file, fullPath);
__android_log_print(ANDROID_LOG_ERROR, "assimp", "AndroidIOSystem: file %s opened", fullPath.c_str());
return new DefaultIOStream(file, fullPath);
} }
#undef PATHLIMIT #undef PATHLIMIT