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

fix windows compile error

This commit is contained in:
andyque 2014-06-23 18:29:23 +08:00
parent 3e5ab0ec8e
commit d2680f2884
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "CCActionTimelineCache.h"
#include "CCActionTimeline.h"
#include "../CCSGUIReader.h"
#include "cocostudio/CCSGUIReader.h"
using namespace cocos2d;
using namespace ui;
@ -150,7 +150,6 @@ void NodeReader::init()
_funcs.insert(Pair(ClassName_Widget, std::bind(&NodeReader::loadWidget, this, _1)));
_funcs.insert(Pair(ClassName_Label, std::bind(&NodeReader::loadWidget, this, _1)));
_guiReader = new WidgetPropertiesReader0300();
}
Node* NodeReader::createNode(const std::string& filename)
@ -445,7 +444,9 @@ Node* NodeReader::loadWidget(const rapidjson::Value& json)
WidgetReaderProtocol* reader = dynamic_cast<WidgetReaderProtocol*>(ObjectFactory::getInstance()->createObject(readerName));
_guiReader->setPropsForAllWidgetFromJsonDictionary(reader, widget, json);
WidgetPropertiesReader0300* guiReader = new WidgetPropertiesReader0300();
guiReader->setPropsForAllWidgetFromJsonDictionary(reader, widget, json);
CC_SAFE_DELETE(guiReader);
int actionTag = DICTOOL->getIntValue_json(json, ACTION_TAG);
widget->setUserObject(ActionTimelineData::create(actionTag));

2
cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h
View File

@ -30,7 +30,6 @@ THE SOFTWARE.
namespace cocostudio {
class WidgetPropertiesReader0300;
namespace timeline{
@ -78,7 +77,6 @@ protected:
std::unordered_map<std::string, NodeCreateFunc> _funcs;
WidgetPropertiesReader0300* _guiReader;
bool _recordJsonPath;
std::string _jsonPath;

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

@ -110,11 +110,6 @@ public:
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode) = 0;
virtual void setPropsForAllCustomWidgetFromBinary(const std::string& classType,
cocos2d::ui::Widget* widget,
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode) = 0;
protected:
void setAnchorPointForWidget(cocos2d::ui::Widget* widget, const rapidjson::Value&options);
std::string getWidgetReaderClassName(const std::string& classname);
@ -153,11 +148,6 @@ public:
cocos2d::ui::Widget* widget,
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode) {}
virtual void setPropsForAllCustomWidgetFromBinary(const std::string& classType,
cocos2d::ui::Widget* widget,
CocoLoader* cocoLoader,
stExpCocoNode* pCocoNode) {}
virtual void setPropsForWidgetFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options);

4
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h
View File

@ -26,7 +26,7 @@
#define __TestCpp__WidgetReader__
#include "WidgetReaderProtocol.h"
#include "../CCSGUIReader.h"
#include "cocostudio/CCSGUIReader.h"
#include "ui/GUIDefine.h"
#include "ui/UIWidget.h"
@ -34,7 +34,7 @@
namespace cocostudio
{
class CocoLoader;
class stExpCocoNode;
struct stExpCocoNode;
class WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol
{

2
cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h
View File

@ -41,7 +41,7 @@ namespace cocos2d
namespace cocostudio
{
class CocoLoader;
class stExpCocoNode;
struct stExpCocoNode;
class WidgetReaderProtocol
{