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

Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20

This commit is contained in:
James Chen 2012-03-26 22:37:30 +08:00
parent 7d04254855 d36933d542
commit 4c7fe7c917
10 changed files with 1206 additions and 1276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Resources/example_Flower.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Heart.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Julia.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Mandelbrot.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Monjori.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Plasma.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

10
tests/Resources/example_Twist.vsh
View File

@ -1,10 +0,0 @@
// http://www.cocos2d-iphone.org
attribute vec4 a_position;
uniform mat4 u_MVPMatrix;
void main()
{
gl_Position = u_MVPMatrix * a_position;
}

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
eb7dd21e7b4067a99d2106e2c4713caf43cb1064 27262a27cf46748c95185438b536e5ba4b6a7a44

2
tests/tests/LabelTest/LabelTest.cpp
View File

@ -1170,7 +1170,7 @@ void BitmapFontMultiLineAlignment::ccTouchesMoved(cocos2d::CCSet *pTouches, coco
this->m_pArrowsShouldRetain->setPosition(ccp(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width), this->m_pArrowsShouldRetain->setPosition(ccp(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width),
this->m_pArrowsShouldRetain->getPosition().y)); this->m_pArrowsShouldRetain->getPosition().y));
float labelWidth = abs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2; float labelWidth = fabs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2;
this->m_pLabelShouldRetain->setWidth(labelWidth); this->m_pLabelShouldRetain->setWidth(labelWidth);
} }

2
tests/tests/Texture2dTest/Texture2dTest.cpp
View File

@ -1447,7 +1447,7 @@ void FileUtilsTest::onEnter()
} }
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if 0 // TODO:(CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
// Testint CCFileUtils API // Testint CCFileUtils API
bool ret = false; bool ret = false;
ret = CCFileUtils::iPhoneRetinaDisplayFileExistsAtPath("Images/bugs/test_issue_1179.png"); ret = CCFileUtils::iPhoneRetinaDisplayFileExistsAtPath("Images/bugs/test_issue_1179.png");