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

Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 

Update easing default speed
This commit is contained in:
XiaoFeng 2015-06-23 11:31:16 +08:00
parent a14fd25436
commit 375e80bd70
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/editor-support/cocostudio/CSParseBinary_generated.h
View File

@ -1791,7 +1791,7 @@ inline flatbuffers::Offset<ListViewOptions> CreateListViewOptions(flatbuffers::F
struct ProjectNodeOptions : private flatbuffers::Table { struct ProjectNodeOptions : private flatbuffers::Table {
const WidgetOptions *nodeOptions() const { return GetPointer<const WidgetOptions *>(4); } const WidgetOptions *nodeOptions() const { return GetPointer<const WidgetOptions *>(4); }
const flatbuffers::String *fileName() const { return GetPointer<const flatbuffers::String *>(6); } const flatbuffers::String *fileName() const { return GetPointer<const flatbuffers::String *>(6); }
float innerActionSpeed() const { return GetField<float>(8, 1.0); } float innerActionSpeed() const { return GetField<float>(8, 0); }
bool Verify(flatbuffers::Verifier &verifier) const { bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* nodeOptions */) && VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* nodeOptions */) &&
@ -1808,7 +1808,7 @@ struct ProjectNodeOptionsBuilder {
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_nodeOptions(flatbuffers::Offset<WidgetOptions> nodeOptions) { fbb_.AddOffset(4, nodeOptions); } void add_nodeOptions(flatbuffers::Offset<WidgetOptions> nodeOptions) { fbb_.AddOffset(4, nodeOptions); }
void add_fileName(flatbuffers::Offset<flatbuffers::String> fileName) { fbb_.AddOffset(6, fileName); } void add_fileName(flatbuffers::Offset<flatbuffers::String> fileName) { fbb_.AddOffset(6, fileName); }
void add_innerActionSpeed(float innerActionSpeed) { fbb_.AddElement<float>(8, innerActionSpeed, 1.0); } void add_innerActionSpeed(float innerActionSpeed) { fbb_.AddElement<float>(8, innerActionSpeed, 0); }
ProjectNodeOptionsBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } ProjectNodeOptionsBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
ProjectNodeOptionsBuilder &operator=(const ProjectNodeOptionsBuilder &); ProjectNodeOptionsBuilder &operator=(const ProjectNodeOptionsBuilder &);
flatbuffers::Offset<ProjectNodeOptions> Finish() { flatbuffers::Offset<ProjectNodeOptions> Finish() {
@ -1820,7 +1820,7 @@ struct ProjectNodeOptionsBuilder {
inline flatbuffers::Offset<ProjectNodeOptions> CreateProjectNodeOptions(flatbuffers::FlatBufferBuilder &_fbb, inline flatbuffers::Offset<ProjectNodeOptions> CreateProjectNodeOptions(flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<WidgetOptions> nodeOptions = 0, flatbuffers::Offset<WidgetOptions> nodeOptions = 0,
flatbuffers::Offset<flatbuffers::String> fileName = 0, flatbuffers::Offset<flatbuffers::String> fileName = 0,
float innerActionSpeed = 1.0) { float innerActionSpeed = 0) {
ProjectNodeOptionsBuilder builder_(_fbb); ProjectNodeOptionsBuilder builder_(_fbb);
builder_.add_innerActionSpeed(innerActionSpeed); builder_.add_innerActionSpeed(innerActionSpeed);
builder_.add_fileName(fileName); builder_.add_fileName(fileName);

2
cocos/editor-support/cocostudio/CocosStudioExport.h
View File

@ -24,6 +24,8 @@
#define NULL ((void *)0) #define NULL ((void *)0)
#endif #endif
#endif #endif
#elif defined(_SHARED_)
#define CC_STUDIO_DLL __attribute__((visibility("default")))
#else #else
#define CC_STUDIO_DLL #define CC_STUDIO_DLL
#endif #endif

14
cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp
View File

@ -85,15 +85,15 @@ namespace cocostudio
attriname = attribute->Name(); attriname = attribute->Name();
std::string value = attribute->Value(); std::string value = attribute->Value();
if (attriname == "ValueX") if (attriname == "X")
{ {
ret.x = atof(value.c_str()); ret.x = atof(value.c_str());
} }
else if (attriname == "ValueY") else if (attriname == "Y")
{ {
ret.y = atof(value.c_str()); ret.y = atof(value.c_str());
} }
else if(attriname == "ValueZ") else if(attriname == "Z")
{ {
ret.z = atof(value.c_str()); ret.z = atof(value.c_str());
} }
@ -196,11 +196,11 @@ namespace cocostudio
attriname = attribute->Name(); attriname = attribute->Name();
std::string value = attribute->Value(); std::string value = attribute->Value();
if (attriname == "ValueX") if (attriname == "X")
{ {
position.x = atof(value.c_str()); position.x = atof(value.c_str());
} }
else if (attriname == "ValueY") else if (attriname == "Y")
{ {
position.y = atof(value.c_str()); position.y = atof(value.c_str());
} }
@ -217,11 +217,11 @@ namespace cocostudio
attriname = attribute->Name(); attriname = attribute->Name();
std::string value = attribute->Value(); std::string value = attribute->Value();
if (attriname == "ValueX") if (attriname == "X")
{ {
scale.x = atof(value.c_str()); scale.x = atof(value.c_str());
} }
else if (attriname == "ValueY") else if (attriname == "Y")
{ {
scale.y = atof(value.c_str()); scale.y = atof(value.c_str());
} }

4
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
View File

@ -85,11 +85,11 @@ namespace cocostudio
attriname = attribute->Name(); attriname = attribute->Name();
std::string value = attribute->Value(); std::string value = attribute->Value();
if (attriname == "ValueX") if (attriname == "X")
{ {
ret.x = atof(value.c_str()); ret.x = atof(value.c_str());
} }
else if (attriname == "ValueY") else if (attriname == "Y")
{ {
ret.y = atof(value.c_str()); ret.y = atof(value.c_str());
} }

4
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
View File

@ -84,11 +84,11 @@ namespace cocostudio
attriname = attribute->Name(); attriname = attribute->Name();
std::string value = attribute->Value(); std::string value = attribute->Value();
if (attriname == "ValueX") if (attriname == "X")
{ {
ret.x = atof(value.c_str()); ret.x = atof(value.c_str());
} }
else if (attriname == "ValueY") else if (attriname == "Y")
{ {
ret.y = atof(value.c_str()); ret.y = atof(value.c_str());
} }