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

Fix compile bug on mobile, use Vector instead of std::vector

This commit is contained in:
Huabing.Xu 2013-12-30 15:26:01 +08:00
parent db69767faf
commit 5b420df4de
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
View File

@ -565,10 +565,7 @@ static const Color4F _planeColor[] = {
RawStencilBufferTest::~RawStencilBufferTest()
{
for(auto& element: _sprites)
{
CC_SAFE_RELEASE(element);
}
}
std::string RawStencilBufferTest::title() const
@ -588,13 +585,12 @@ void RawStencilBufferTest::setup()
CCLOGWARN("Stencil must be enabled for the current GLView.");
}
_sprites.resize(_planeCount, nullptr);
for(int i = 0; i < _planeCount; ++i)
{
_sprites[i] = Sprite::create(s_pathGrossini);
_sprites[i]->retain();
_sprites[i]->setAnchorPoint( Point(0.5, 0) );
_sprites[i]->setScale( 2.5f );
Sprite* sprite = Sprite::create(s_pathGrossini);
sprite->setAnchorPoint( Point(0.5, 0) );
sprite->setScale( 2.5f );
_sprites.pushBack(sprite);
}
Director::getInstance()->setAlphaBlending(true);
@ -630,7 +626,7 @@ void RawStencilBufferTest::draw()
auto spritePoint = planeSize * i;
spritePoint.x += planeSize.x / 2;
spritePoint.y = 0;
_sprites[i]->setPosition( spritePoint );
_sprites.at(i)->setPosition( spritePoint );
iter->init(0, _vertexZ);
iter->func = CC_CALLBACK_0(RawStencilBufferTest::onBeforeDrawClip, this, i, stencilPoint);
@ -639,7 +635,7 @@ void RawStencilBufferTest::draw()
kmGLPushMatrix();
this->transform();
_sprites[i]->visit();
_sprites.at(i)->visit();
kmGLPopMatrix();
iter->init(0, _vertexZ);
@ -649,7 +645,7 @@ void RawStencilBufferTest::draw()
kmGLPushMatrix();
this->transform();
_sprites[i]->visit();
_sprites.at(i)->visit();
kmGLPopMatrix();
}
@ -763,7 +759,11 @@ void RawStencilBufferTest4::setupStencilForClippingOnPlane(GLint plane)
auto program = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
GLint alphaValueLocation = glGetUniformLocation(program->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
program->setUniformLocationWith1f(alphaValueLocation, _alphaThreshold);
_sprite->setShaderProgram(program );
for(int i = 0; i < _planeCount; ++i)
{
_sprites.at(i)->setShaderProgram(program );
}
#endif
}
@ -796,7 +796,10 @@ void RawStencilBufferTest5::setupStencilForClippingOnPlane(GLint plane)
auto program = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
GLint alphaValueLocation = glGetUniformLocation(program->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
program->setUniformLocationWith1f(alphaValueLocation, _alphaThreshold);
_sprite->setShaderProgram( program );
for(int i = 0; i < _planeCount; ++i)
{
_sprites.at(i)->setShaderProgram(program );
}
#endif
}
@ -862,7 +865,10 @@ void RawStencilBufferTest6::setupStencilForClippingOnPlane(GLint plane)
auto program = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
GLint alphaValueLocation = glGetUniformLocation(program->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
program->setUniformLocationWith1f(alphaValueLocation, _alphaThreshold);
_sprite->setShaderProgram(program);
for(int i = 0; i < _planeCount; ++i)
{
_sprites.at(i)->setShaderProgram(program );
}
#endif
glFlush();
}

5
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
View File

@ -5,7 +5,6 @@
#include "../BaseTest.h"
#include "renderer/CCCustomCommand.h"
#include <list>
#include <vector>
class BaseClippingNodeTest : public BaseTest
{
@ -165,8 +164,8 @@ protected:
void onDisableStencil();
void onBeforeDrawClip(int planeIndex, const Point& pt);
void onBeforeDrawSprite(int planeIndex, const Point& pt);
private:
std::vector<Sprite*> _sprites;
protected:
Vector<Sprite*> _sprites;
};
class RawStencilBufferTest2 : public RawStencilBufferTest