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

issue #1686:synchronized RenderTexture

This commit is contained in:
minggo 2013-02-28 16:35:42 +08:00
parent 545882cb81
commit c75e440e22
4 changed files with 206 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/misc_nodes/CCRenderTexture.cpp
View File

@ -464,7 +464,6 @@ void CCRenderTexture::end()
CCDirector *director = CCDirector::sharedDirector();
glBindFramebuffer(GL_FRAMEBUFFER, m_nOldFBO);
kmGLPopMatrix();
// restore viewport
director->setViewport();

166
samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp
View File

@ -1,34 +1,37 @@
#include "CCConfiguration.h"
#include "RenderTextureTest.h"
#include "testBasic.h"
// Test #1 by Jason Booth (slipster216)
// Test #3 by David Deaco (ddeaco)
TESTLAYER_CREATE_FUNC(RenderTextureSave);
TESTLAYER_CREATE_FUNC(RenderTextureIssue937);
TESTLAYER_CREATE_FUNC(RenderTextureZbuffer);
TESTLAYER_CREATE_FUNC(RenderTextureTestDepthStencil);
TESTLAYER_CREATE_FUNC(RenderTextureTargetNode);
TESTLAYER_CREATE_FUNC(SpriteRenderTextureBug);
static NEWTESTFUNC createFunctions[] = {
CF(RenderTextureSave),
CF(RenderTextureIssue937),
CF(RenderTextureZbuffer),
CF(RenderTextureTestDepthStencil),
CF(RenderTextureTargetNode),
CF(SpriteRenderTextureBug),
};
#define MAX_LAYER sizeof(createFunctions)/sizeof(createFunctions[0])
static int sceneIdx = -1;
#define MAX_LAYER 5
CCLayer* createTestCase(int nIndex)
{
switch(nIndex)
{
case 0: return new RenderTextureSave();
case 1: return new RenderTextureIssue937();
case 2: return new RenderTextureZbuffer();
case 3: return new RenderTextureTestDepthStencil();
case 4: return new RenderTextureTargetNode();
}
return NULL;
}
CCLayer* nextTestCase()
{
sceneIdx++;
sceneIdx = sceneIdx % MAX_LAYER;
CCLayer* pLayer = createTestCase(sceneIdx);
CCLayer* pLayer = (createFunctions[sceneIdx])();
pLayer->autorelease();
return pLayer;
@ -41,7 +44,7 @@ CCLayer* backTestCase()
if( sceneIdx < 0 )
sceneIdx += total;
CCLayer* pLayer = createTestCase(sceneIdx);
CCLayer* pLayer = (createFunctions[sceneIdx])();
pLayer->autorelease();
return pLayer;
@ -49,7 +52,7 @@ CCLayer* backTestCase()
CCLayer* restartTestCase()
{
CCLayer* pLayer = createTestCase(sceneIdx);
CCLayer* pLayer = (createFunctions[sceneIdx])();
pLayer->autorelease();
return pLayer;
@ -601,3 +604,126 @@ string RenderTextureTargetNode::subtitle()
return "Sprites should be equal and move with each frame";
}
// SpriteRenderTextureBug
SpriteRenderTextureBug::SimpleSprite::SimpleSprite() : rt(NULL) {}
SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::SimpleSprite::create(const char* filename, const CCRect &rect)
{
SimpleSprite *sprite = new SimpleSprite();
if (sprite && sprite->initWithFile(filename, rect))
{
sprite->autorelease();
}
else
{
CC_SAFE_DELETE(sprite);
}
return sprite;
}
void SpriteRenderTextureBug::SimpleSprite::draw()
{
if (rt == NULL)
{
CCSize s = CCDirector::sharedDirector()->getWinSize();
rt = new CCRenderTexture();
rt->initWithWidthAndHeight(s.width, s.height, kCCTexture2DPixelFormat_RGBA8888);
}
rt->beginWithClear(0.0f, 0.0f, 0.0f, 1.0f);
rt->end();
CC_NODE_DRAW_SETUP();
ccBlendFunc blend = getBlendFunc();
ccGLBlendFunc(blend.src, blend.dst);
ccGLBindTexture2D(getTexture()->getName());
//
// Attributes
//
ccGLEnableVertexAttribs(kCCVertexAttribFlag_PosColorTex);
#define kQuadSize sizeof(m_sQuad.bl)
long offset = (long)&m_sQuad;
// vertex
int diff = offsetof( ccV3F_C4B_T2F, vertices);
glVertexAttribPointer(kCCVertexAttrib_Position, 3, GL_FLOAT, GL_FALSE, kQuadSize, (void*) (offset + diff));
// texCoods
diff = offsetof( ccV3F_C4B_T2F, texCoords);
glVertexAttribPointer(kCCVertexAttrib_TexCoords, 2, GL_FLOAT, GL_FALSE, kQuadSize, (void*)(offset + diff));
// color
diff = offsetof( ccV3F_C4B_T2F, colors);
glVertexAttribPointer(kCCVertexAttrib_Color, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (void*)(offset + diff));
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
}
SpriteRenderTextureBug::SpriteRenderTextureBug()
{
setTouchEnabled(true);
CCSize s = CCDirector::sharedDirector()->getWinSize();
addNewSpriteWithCoords(ccp(s.width/2, s.height/2));
}
SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::addNewSpriteWithCoords(const CCPoint& p)
{
int idx = CCRANDOM_0_1() * 1400 / 100;
int x = (idx%5) * 85;
int y = (idx/5) * 121;
SpriteRenderTextureBug::SimpleSprite *sprite = SpriteRenderTextureBug::SimpleSprite::create("Images/grossini_dance_atlas.png",
CCRectMake(x,y,85,121));
addChild(sprite);
sprite->setPosition(p);
CCFiniteTimeAction *action = NULL;
float rd = CCRANDOM_0_1();
if (rd < 0.20)
action = CCScaleBy::create(3, 2);
else if (rd < 0.40)
action = CCRotateBy::create(3, 360);
else if (rd < 0.60)
action = CCBlink::create(1, 3);
else if (rd < 0.8 )
action = CCTintBy::create(2, 0, -255, -255);
else
action = CCFadeOut::create(2);
CCFiniteTimeAction *action_back = action->reverse();
CCSequence *seq = CCSequence::create(action, action_back, NULL);
sprite->runAction(CCRepeatForever::create(seq));
//return sprite;
return NULL;
}
void SpriteRenderTextureBug::ccTouchesEnded(CCSet* touches, CCEvent* event)
{
CCSetIterator iter = touches->begin();
for(; iter != touches->end(); ++iter)
{
CCPoint location = ((CCTouch*)(*iter))->getLocation();
addNewSpriteWithCoords(location);
}
}
std::string SpriteRenderTextureBug::title()
{
return "SpriteRenderTextureBug";
}
std::string SpriteRenderTextureBug::subtitle()
{
return "Touch the screen. Sprite should appear on under the touch";
}

28
samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h
View File

@ -93,7 +93,33 @@ public:
virtual std::string title();
virtual std::string subtitle();
void touched(cocos2d::CCObject* sender);
void touched(CCObject* sender);
};
class SpriteRenderTextureBug : public RenderTextureTest
{
public:
class SimpleSprite : public CCSprite
{
public:
SimpleSprite();
virtual void draw();
static SimpleSprite* create(const char* filename, const CCRect &rect);
public:
CCRenderTexture *rt;
};
public:
SpriteRenderTextureBug();
virtual void ccTouchesEnded(CCSet* touches, CCEvent* event);
virtual std::string title();
virtual std::string subtitle();
SimpleSprite* addNewSpriteWithCoords(const CCPoint& p);
};
#endif

66
samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp
View File

@ -10,39 +10,39 @@ static int sceneIdx = -1;
CCLayer* nextSchedulerTest();
CCLayer* backSchedulerTest();
CCLayer* restartSchedulerTest();
TESTLAYER_CREATE_FUNC(SchedulerTimeScale)
TESTLAYER_CREATE_FUNC(TwoSchedulers)
TESTLAYER_CREATE_FUNC(SchedulerAutoremove)
TESTLAYER_CREATE_FUNC(SchedulerPauseResume)
TESTLAYER_CREATE_FUNC(SchedulerPauseResumeAll)
TESTLAYER_CREATE_FUNC(SchedulerPauseResumeAllUser)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAll)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAllHard)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAllUserLevel)
TESTLAYER_CREATE_FUNC(SchedulerSchedulesAndRemove)
TESTLAYER_CREATE_FUNC(SchedulerUpdate)
TESTLAYER_CREATE_FUNC(SchedulerUpdateAndCustom)
TESTLAYER_CREATE_FUNC(SchedulerUpdateFromCustom)
TESTLAYER_CREATE_FUNC(RescheduleSelector)
TESTLAYER_CREATE_FUNC(SchedulerDelayAndRepeat)
static NEWTESTFUNC createFunctions[] = {
CF(SchedulerTimeScale),
CF(TwoSchedulers),
CF(SchedulerAutoremove),
CF(SchedulerPauseResume),
CF(SchedulerPauseResumeAll),
CF(SchedulerPauseResumeAllUser),
CF(SchedulerUnscheduleAll),
CF(SchedulerUnscheduleAllHard),
CF(SchedulerUnscheduleAllUserLevel),
CF(SchedulerSchedulesAndRemove),
CF(SchedulerUpdate),
CF(SchedulerUpdateAndCustom),
CF(SchedulerUpdateFromCustom),
CF(RescheduleSelector),
CF(SchedulerDelayAndRepeat)
TESTLAYER_CREATE_FUNC(SchedulerTimeScale)
TESTLAYER_CREATE_FUNC(TwoSchedulers)
TESTLAYER_CREATE_FUNC(SchedulerAutoremove)
TESTLAYER_CREATE_FUNC(SchedulerPauseResume)
TESTLAYER_CREATE_FUNC(SchedulerPauseResumeAll)
TESTLAYER_CREATE_FUNC(SchedulerPauseResumeAllUser)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAll)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAllHard)
TESTLAYER_CREATE_FUNC(SchedulerUnscheduleAllUserLevel)
TESTLAYER_CREATE_FUNC(SchedulerSchedulesAndRemove)
TESTLAYER_CREATE_FUNC(SchedulerUpdate)
TESTLAYER_CREATE_FUNC(SchedulerUpdateAndCustom)
TESTLAYER_CREATE_FUNC(SchedulerUpdateFromCustom)
TESTLAYER_CREATE_FUNC(RescheduleSelector)
TESTLAYER_CREATE_FUNC(SchedulerDelayAndRepeat)
static NEWTESTFUNC createFunctions[] = {
CF(SchedulerTimeScale),
CF(TwoSchedulers),
CF(SchedulerAutoremove),
CF(SchedulerPauseResume),
CF(SchedulerPauseResumeAll),
CF(SchedulerPauseResumeAllUser),
CF(SchedulerUnscheduleAll),
CF(SchedulerUnscheduleAllHard),
CF(SchedulerUnscheduleAllUserLevel),
CF(SchedulerSchedulesAndRemove),
CF(SchedulerUpdate),
CF(SchedulerUpdateAndCustom),
CF(SchedulerUpdateFromCustom),
CF(RescheduleSelector),
CF(SchedulerDelayAndRepeat)
};
#define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0]))