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

fixed #3185

This commit is contained in:
chengstory 2013-11-14 13:28:42 +08:00
parent f528126d5a
commit 14d51f9f35
9 changed files with 28 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
cocos/editor-support/cocostudio/CCComAttribute.cpp
View File

@ -28,8 +28,7 @@ using namespace cocos2d;
namespace cocostudio {
ComAttribute::ComAttribute(void)
: _attributes(NULL)
, _jsonDict(NULL)
: _jsonDict(NULL)
{
_name = "ComAttribute";
}
@ -37,14 +36,10 @@ ComAttribute::ComAttribute(void)
ComAttribute::~ComAttribute(void)
{
CC_SAFE_DELETE(_jsonDict);
CC_SAFE_RELEASE(_attributes);
}
bool ComAttribute::init()
{
_attributes = Dictionary::create();
_attributes->retain();
_jsonDict = new JsonDictionary();
return true;
}
@ -63,128 +58,6 @@ ComAttribute* ComAttribute::create(void)
return pRet;
}
void ComAttribute::setInt(const char *key, int value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(Integer::create(value), key);
}
void ComAttribute::setDouble(const char *key, double value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(Double::create(value), key);
}
void ComAttribute::setFloat(const char *key, float value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(Float::create(value), key);
}
void ComAttribute::setBool(const char *key, bool value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(Bool::create(value), key);
}
void ComAttribute::setCString(const char *key, const char *value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(String::create(value), key);
}
void ComAttribute::setObject(const char *key, Object *value)
{
CCASSERT(key != NULL, "Argument must be non-nil");
_attributes->setObject(value, key);
}
int ComAttribute::getInt(const char *key) const
{
Object *ret = _attributes->objectForKey(key);
if( ret )
{
if( Integer *obj=dynamic_cast<Integer*>(ret) )
return obj->getValue();
CCASSERT(false, "Key found, type is not integer");
}
// XXX: Should it throw an exception ?
CCLOG("Key not found: '%s'", key );
return 0;
}
double ComAttribute::getDouble(const char *key) const
{
Object *ret = _attributes->objectForKey(key);
if( ret )
{
if( Double *obj=dynamic_cast<Double*>(ret) )
return obj->getValue();
CCASSERT(false, "Key found, type is not double");
}
// XXX: Should it throw an exception ?
CCLOG("Key not found: '%s'", key );
return 0.0;
}
float ComAttribute::getFloat(const char *key) const
{
Object *ret = _attributes->objectForKey(key);
if( ret )
{
if( Float *obj=dynamic_cast<Float*>(ret) )
return obj->getValue();
CCASSERT(false, "Key found, type is not float");
}
// XXX: Should it throw an exception ?
CCLOG("Key not found: '%s'", key );
return 0.0;
}
bool ComAttribute::getBool(const char *key) const
{
Object *ret = _attributes->objectForKey(key);
if( ret )
{
if( Bool *boolobj=dynamic_cast<Bool*>(ret) )
return boolobj->getValue();
if( String *strobj=dynamic_cast<String*>(ret) )
return strobj->boolValue();
CCASSERT(false, "Key found, type is not Bool");
}
// XXX: Should it throw an exception ?
CCLOG("Key not found: '%s'", key );
return false;
}
const char* ComAttribute::getCString(const char *key) const
{
Object *ret = _attributes->objectForKey(key);
if( ret )
{
if( String *str=dynamic_cast<String*>(ret) )
return str->getCString();
CCASSERT(false, "Key found, type is not CString");
}
// XXX: Should it throw an exception ?
CCLOG("Key not found: '%s'", key );
return NULL;
}
Object* ComAttribute::getObject(const char *key) const
{
return _attributes->objectForKey(key);
}
JsonDictionary* ComAttribute::getDict() const
{
return _jsonDict;

17
cocos/editor-support/cocostudio/CCComAttribute.h
View File

@ -47,24 +47,9 @@ protected:
public:
virtual bool init();
static ComAttribute* create(void);
void setInt(const char *key, int value);
void setDouble(const char *key, double value);
void setFloat(const char *key, float value);
void setBool(const char *key, bool value);
void setCString(const char *key, const char *value);
void setObject(const char *key, Object *value);
int getInt(const char *key) const;
double getDouble(const char *key) const;
float getFloat(const char *key) const;
bool getBool(const char *key) const;
const char* getCString(const char *key) const;
cocos2d::Object* getObject(const char *key) const;
JsonDictionary* getDict() const;
private:
cocos2d::Dictionary *_attributes;
JsonDictionary *_jsonDict;
};

10
cocos/editor-support/cocostudio/CCComController.h
View File

@ -32,7 +32,7 @@ namespace cocostudio {
class ComController : public cocos2d::Component, public InputDelegate
{
protected:
public:
ComController(void);
public:
@ -51,10 +51,10 @@ public:
* @js NA
* @lua NA
*/
virtual void onExit();
virtual void update(float delta);
virtual bool isEnabled() const;
virtual void setEnabled(bool b);
virtual void onExit() override;
virtual void update(float delta) override;
virtual bool isEnabled() const override;
virtual void setEnabled(bool b) override;
static ComController* create(void);
};

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h
View File

@ -14,7 +14,7 @@ public:
// Here's a difference. Method 'init' in cocos2d-x returns bool,
// instead of returning 'id' in cocos2d-iphone
virtual bool init();
virtual bool init() override;
// there's no 'id' in cpp, so we recommand to return the exactly class pointer
static cocos2d::Scene* scene();

8
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h
View File

@ -13,10 +13,10 @@ protected:
virtual ~EnemyController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
virtual bool init() override;
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta) override;
static EnemyController* create(void);
public:

10
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h
View File

@ -13,13 +13,13 @@ protected:
virtual ~PlayerController(void);
public:
void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event) override;
virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event) override;
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
virtual bool init() override;
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta) override;
static PlayerController* create(void);
};

8
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h
View File

@ -12,10 +12,10 @@ protected:
virtual ~ProjectileController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
virtual bool init() override;
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta) override;
static ProjectileController* create(void);
public:

6
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp
View File

@ -39,7 +39,7 @@ void SceneController::onEnter()
_projectiles->retain();
((ComAudio*)(_owner->getComponent("Audio")))->playBackgroundMusic("background-music-aac.wav", true);
((ComAttribute*)(_owner->getComponent("ComAttribute")))->setInt("KillCount", 0);
((ComAttribute*)(_owner->getComponent("ComAttribute")))->getDict()->insertItem("KillCount", 0);
}
void SceneController::onExit()
@ -102,10 +102,10 @@ void SceneController::spriteMoveFinished(Node* sender)
void SceneController::increaseKillCount()
{
int nProjectilesDestroyed = ((ComAttribute*)(_owner->getComponent("ComAttribute")))->getInt("KillCount");
int nProjectilesDestroyed = ((ComAttribute*)(_owner->getComponent("ComAttribute")))->getDict()->getItemIntValue("KillCount", -1);
ComAttribute *p = (ComAttribute*)(_owner->getComponent("ComAttribute"));
p->setInt("KillCount", ++nProjectilesDestroyed);
p->getDict()->insertItem("KillCount", ++nProjectilesDestroyed);
if (nProjectilesDestroyed >= 5)
{

8
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h
View File

@ -12,10 +12,10 @@ protected:
virtual ~SceneController(void);
public:
virtual bool init();
virtual void onEnter();
virtual void onExit();
virtual void update(float delta);
virtual bool init() override;
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta) override;
static SceneController* create(void);