This commit is contained in:
tangziwen 2014-12-17 13:31:35 +08:00
parent 32395f8e90
commit 73014e8be3
2 changed files with 350 additions and 226 deletions

File diff suppressed because it is too large Load Diff

View File

@ -81,6 +81,24 @@ protected:
float _shining_duraion;
GLProgramState * _state;
};
class Sprite3DFakeShadowTest : public Sprite3DTestDemo
{
public:
CREATE_FUNC(Sprite3DFakeShadowTest);
Sprite3DFakeShadowTest();
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
class Sprite3DBasicToonShaderTest : public Sprite3DTestDemo
{
public:
CREATE_FUNC(Sprite3DBasicToonShaderTest);
Sprite3DBasicToonShaderTest();
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
class EffectSprite3D;
class Effect3D : public Ref
@ -120,7 +138,7 @@ protected:
float _outlineWidth;
//weak reference
EffectSprite3D* _sprite;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
EventListenerCustom* _backToForegroundListener;
#endif
@ -268,8 +286,11 @@ public:
virtual std::string subtitle() const override;
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
void addNewSpriteWithCoords(Vec2 p);
void menuCallback_reSkin(Ref* sender);
void menuCallback_switchHair(Ref* sender);
void menuCallback_switchGlasses(Ref* sender);
void menuCallback_switchCoat(Ref* sender);
void menuCallback_switchPants(Ref* sender);
void menuCallback_switchShoes(Ref* sender);
protected:
void applyCurSkin();
@ -282,11 +303,8 @@ protected:
FACE,
HAND,
GLASSES,
MAX_TYPE,
};
std::vector<std::string> _skins[(int)SkinType::MAX_TYPE]; //all skins
int _curSkin[(int)SkinType::MAX_TYPE]; //current skin index
std::map<SkinType, std::string> _curSkin;
cocos2d::Sprite3D* _sprite;
};
class Sprite3DWithOBBPerfromanceTest : public Sprite3DTestDemo