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

Merge pull request #1374 from walzer/gles20 

revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
This commit is contained in:
Walzer 2012-09-24 06:15:49 -07:00
parent ea9c183473 609c4b12f9
commit 583b01f218
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/HelloCpp/Resources/iphonehd/HelloWorld.png.REMOVED.git-id
View File

@ -1 +1 @@
e35126a63c774b4967e6b0e31082d7a32f58ed02 6b7a2544be32ce26e75737865743649598d83bdf

6
samples/SimpleGame/Classes/AppDelegate.cpp
View File

@ -31,17 +31,15 @@ bool AppDelegate::applicationDidFinishLaunching() {
} }
else if (target == kTargetIphone) else if (target == kTargetIphone)
{ {
if (CCEGLView::sharedOpenGLView()->enableRetina()) if (CCDirector::sharedDirector()->enableRetinaDisplay(true))
{ {
// well, it's a iPhone 4 and above, with 960x480 Retina resolution // well, it's a iPhone 4, iPhone 4S or iPhone 5
CCFileUtils::sharedFileUtils()->setResourceDirectory("hd"); CCFileUtils::sharedFileUtils()->setResourceDirectory("hd");
CCEGLView::sharedOpenGLView()->setDesignResolutionSize(960, 640, kResolutionNoBorder);
} }
else else
{ {
// iPhone 3GS and before, with 480x320 resolution // iPhone 3GS and before, with 480x320 resolution
CCFileUtils::sharedFileUtils()->setResourceDirectory("sd"); CCFileUtils::sharedFileUtils()->setResourceDirectory("sd");
CCEGLView::sharedOpenGLView()->setDesignResolutionSize(480, 320, kResolutionNoBorder);
} }
} }
else else

19
samples/SimpleGame/Classes/HelloWorldScene.cpp
View File

@ -4,8 +4,6 @@
using namespace cocos2d; using namespace cocos2d;
extern float g_scaleRatio;
HelloWorld::~HelloWorld() HelloWorld::~HelloWorld()
{ {
if (_targets) if (_targets)
@ -28,18 +26,7 @@ HelloWorld::HelloWorld()
:_targets(NULL) :_targets(NULL)
,_projectiles(NULL) ,_projectiles(NULL)
,_projectilesDestroyed(0) ,_projectilesDestroyed(0)
,_scaleRatio(1.0)
{ {
if ( 0 == strcmp(CCFileUtils::sharedFileUtils()->getResourceDirectory(), "hd/") )
{
// AppDelegate.cpp used hd resource & 960x640 design resolution
_scaleRatio = 2.0;
}
else
{
// sd
_scaleRatio = 1.0;
}
} }
CCScene* HelloWorld::scene() CCScene* HelloWorld::scene()
@ -106,7 +93,7 @@ bool HelloWorld::init()
///////////////////////////// /////////////////////////////
// 2. add your codes below... // 2. add your codes below...
CCSprite *player = CCSprite::create("Player.png", CCRectMake(0, 0, 27*_scaleRatio, 40*_scaleRatio) ); CCSprite *player = CCSprite::create("Player.png", CCRectMake(0, 0, 27, 40) );
player->setPosition( ccp(origin.x + player->getContentSize().width/2, player->setPosition( ccp(origin.x + player->getContentSize().width/2,
origin.y + visibleSize.height/2) ); origin.y + visibleSize.height/2) );
@ -140,7 +127,7 @@ void HelloWorld::menuCloseCallback(CCObject* pSender)
// cpp with cocos2d-x // cpp with cocos2d-x
void HelloWorld::addTarget() void HelloWorld::addTarget()
{ {
CCSprite *target = CCSprite::create("Target.png", CCRectMake(0,0,27*_scaleRatio,40*_scaleRatio) ); CCSprite *target = CCSprite::create("Target.png", CCRectMake(0,0,27,40) );
// Determine where to spawn the target along the Y axis // Determine where to spawn the target along the Y axis
CCSize winSize = CCDirector::sharedDirector()->getVisibleSize(); CCSize winSize = CCDirector::sharedDirector()->getVisibleSize();
@ -212,7 +199,7 @@ void HelloWorld::ccTouchesEnded(CCSet* touches, CCEvent* event)
// Set up initial location of projectile // Set up initial location of projectile
CCSize winSize = CCDirector::sharedDirector()->getVisibleSize(); CCSize winSize = CCDirector::sharedDirector()->getVisibleSize();
CCSprite *projectile = CCSprite::create("Projectile.png", CCRectMake(0, 0, 20*_scaleRatio, 20*_scaleRatio)); CCSprite *projectile = CCSprite::create("Projectile.png", CCRectMake(0, 0, 20, 20));
projectile->setPosition( ccp(20, winSize.height/2) ); projectile->setPosition( ccp(20, winSize.height/2) );
// Determinie offset of location to projectile // Determinie offset of location to projectile

1
samples/SimpleGame/Classes/HelloWorldScene.h
View File

@ -38,7 +38,6 @@ protected:
cocos2d::CCArray *_targets; cocos2d::CCArray *_targets;
cocos2d::CCArray *_projectiles; cocos2d::CCArray *_projectiles;
int _projectilesDestroyed; int _projectilesDestroyed;
float _scaleRatio;
void addTarget(); void addTarget();