Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android asset path fix + debug mem Ref include fix for gcc + Linux multisampling support #804

Merged
merged 8 commits into from
Jan 25, 2013
Merged

Android asset path fix + debug mem Ref include fix for gcc + Linux multisampling support #804

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d4f7f1
Fixed Android bug with hardcoded asset path
marcinjakubowski Nov 16, 2012
0f6ade8
Removed additional package name
Nov 16, 2012
9562b43
Merge pull request #788 from blackberry/master
seanpaultaylor Jan 23, 2013
d92dc03
Merge pull request #791 from blackberry/master
seanpaultaylor Jan 23, 2013
a06bf3b
Merge branch 'next' of github.com:blackberry/GamePlay into next
marcinjakubowski Jan 24, 2013
bdc4fa3
Fixes compile error with DebugMem on Linux
marcinjakubowski Jan 24, 2013
f2037a2
Added multisampling support on Linux
marcinjakubowski Jan 25, 2013
73dc8cc
Moved #include <typeinfo> to Base.h
marcinjakubowski Jan 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions gameplay/src/PlatformAndroid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,22 +974,35 @@ int Platform::enterMessagePump()
}
GP_ASSERT(env);

// Get the package name for this app from Java.
jclass clazz = env->GetObjectClass(activity->clazz);
jmethodID methodID = env->GetMethodID(clazz, "getPackageName", "()Ljava/lang/String;");
jobject result = env->CallObjectMethod(activity->clazz, methodID);

const char* packageName;
/* Get external files directory on Android; this will result in a directory where all app files
* should be stored, like /mnt/sdcard/android/<package-name>/files/
*/
jboolean isCopy;
packageName = env->GetStringUTFChars((jstring)result, &isCopy);
jvm->DetachCurrentThread();

jclass clazz = env->GetObjectClass(activity->clazz);
jmethodID methodGetExternalStorage = env->GetMethodID(clazz, "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");

jclass clazzFile = env->FindClass("java/io/File");
jmethodID methodGetPath = env->GetMethodID(clazzFile, "getPath", "()Ljava/lang/String;");

// Now has java.io.File object pointing to directory
jobject objectFile = env->CallObjectMethod(activity->clazz, methodGetExternalStorage, NULL);

// Now has String object containing path to directory
jstring stringExternalPath = static_cast<jstring>(env->CallObjectMethod(objectFile, methodGetPath));
const char* externalPath = env->GetStringUTFChars(stringExternalPath, &isCopy);

// Set the default path to store the resources.
std::string assetsPath = "/mnt/sdcard/android/data/";
assetsPath += packageName;
assetsPath += "/";
std::string assetsPath(externalPath);
if (externalPath[strlen(externalPath)-1] != '/')
assetsPath += "/";

FileSystem::setResourcePath(assetsPath.c_str());


// Release string data
env->ReleaseStringUTFChars(stringExternalPath, externalPath);
jvm->DetachCurrentThread();

// Get the asset manager to get the resources from the .apk file.
__assetManager = activity->assetManager;

Expand Down