Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating file search logic for CocosDragonJS.

This commit is contained in:
James Chen 2013-01-29 18:48:19 +08:00
parent f0c2d310ee
commit e1f6c37c2f
3 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
View File

@ -38,27 +38,71 @@ bool AppDelegate::applicationDidFinishLaunching()
CCSize designSize = CCSizeMake(320, 480);
CCSize resourceSize = CCSizeMake(320, 480);
vector<string> searchPath;
std::vector<std::string> resDirOrders;
if (screenSize.height > 768)
TargetPlatform platform = CCApplication::sharedApplication()->getTargetPlatform();
if (platform == kTargetIphone || platform == kTargetIpad)
{
resourceSize = CCSizeMake(1536, 2048);
searchPath.push_back("resources-ipadhd");
if (screenSize.height > 1024)
{
resourceSize = CCSizeMake(1536, 2048);
resDirOrders.push_back("resources-ipadhd");
resDirOrders.push_back("resources-ipad");
resDirOrders.push_back("resources-iphonehd");
}
else if (screenSize.height > 960)
{
resourceSize = CCSizeMake(768, 1024);
resDirOrders.push_back("resources-ipad");
resDirOrders.push_back("resources-iphonehd");
}
else if (screenSize.height > 480)
{
resourceSize = CCSizeMake(640, 960);
resDirOrders.push_back("resources-iphonehd");
resDirOrders.push_back("resources-iphone");
}
else
{
resourceSize = CCSizeMake(320, 480);
resDirOrders.push_back("resources-iphone");
}
}
else if (screenSize.height > 640)
else if (platform == kTargetAndroid || platform == kTargetWindows)
{
resourceSize = CCSizeMake(768, 1536);
searchPath.push_back("resources-ipad");
}
else if (screenSize.height > 320)
{
resourceSize = CCSizeMake(640, 960);
searchPath.push_back("resources-iphonehd");
CCLOG("screen size [%f, %f]", screenSize.width, screenSize.height);
if (screenSize.height > 960)
{
resourceSize = CCSizeMake(1280, 1920);
resDirOrders.push_back("resources-xlarge");
resDirOrders.push_back("resources-large");
resDirOrders.push_back("resources-medium");
resDirOrders.push_back("resources-small");
}
else if (screenSize.height > 720)
{
resourceSize = CCSizeMake(640, 960);
resDirOrders.push_back("resources-large");
resDirOrders.push_back("resources-medium");
resDirOrders.push_back("resources-small");
}
else if (screenSize.height > 480)
{
resourceSize = CCSizeMake(480, 720);
resDirOrders.push_back("resources-medium");
resDirOrders.push_back("resources-small");
}
else
{
resourceSize = CCSizeMake(320, 480);
resDirOrders.push_back("resources-small");
}
}
CCFileUtils::sharedFileUtils()->setSearchPaths(searchPath);
CCFileUtils::sharedFileUtils()->setSearchResolutionsOrder(resDirOrders);
pDirector->setContentScaleFactor(resourceSize.height/designSize.height);
pDirector->setContentScaleFactor(resourceSize.width/designSize.width);
CCEGLView::sharedOpenGLView()->setDesignResolutionSize(designSize.width, designSize.height, kResolutionNoBorder);

2
samples/Javascript/CocosDragonJS/proj.android/build_native.sh
View File

@ -49,7 +49,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
COCOS2DX_ROOT="$DIR/../../../.."
APP_ROOT="$DIR/.."
APP_ANDROID_ROOT="$DIR"
RESROUCE_ROOT="$APP_ROOT/../Shared/games/CocosDragonJS/Published files iOS"
RESROUCE_ROOT="$APP_ROOT/../Shared/games/CocosDragonJS/Published files Android"
BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
echo

3
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
View File

@ -69,11 +69,14 @@ bool AppDelegate::applicationDidFinishLaunching()
{
resourceSize = CCSizeMake(640, 960);
resDirOrders.push_back("resources-large");
resDirOrders.push_back("resources-medium");
resDirOrders.push_back("resources-small");
}
else if (screenSize.height > 480)
{
resourceSize = CCSizeMake(480, 720);
resDirOrders.push_back("resources-medium");
resDirOrders.push_back("resources-small");
}
else
{