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

Merge pull request #11510 from xiaofeng11/v3 

Bug fix
This commit is contained in:
minggo 2015-04-20 15:50:44 +08:00
parent 6ec3930bcb 829da53773
commit 8f88afa123
4 changed files with 170 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
View File

@ -1644,6 +1644,7 @@ FrameData *DataReaderHelper::decodeFrame(const rapidjson::Value& json, DataInfo
if (length != 0)
{
frameData->easingParams = new float[length];
frameData->easingParamNumber = length;
for (int i = 0; i < length; i++)
{

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

@ -727,6 +727,14 @@ struct ButtonOptions : private flatbuffers::Table {
const FlatSize *scale9Size() const { return GetStruct<const FlatSize *>(24); }
uint8_t scale9Enabled() const { return GetField<uint8_t>(26, 0); }
uint8_t displaystate() const { return GetField<uint8_t>(28, 1); }
uint8_t outlineEnabled() const { return GetField<uint8_t>(30, 0); }
const Color *outlineColor() const { return GetStruct<const Color *>(32); }
int32_t outlineSize() const { return GetField<int32_t>(34, 1); }
uint8_t shadowEnabled() const { return GetField<uint8_t>(36, 0); }
const Color *shadowColor() const { return GetStruct<const Color *>(38); }
float shadowOffsetX() const { return GetField<float>(40, 2); }
float shadowOffsetY() const { return GetField<float>(42, -2); }
int32_t shadowBlurRadius() const { return GetField<int32_t>(44, 0); }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* widgetOptions */) &&
@ -749,6 +757,14 @@ struct ButtonOptions : private flatbuffers::Table {
VerifyField<FlatSize>(verifier, 24 /* scale9Size */) &&
VerifyField<uint8_t>(verifier, 26 /* scale9Enabled */) &&
VerifyField<uint8_t>(verifier, 28 /* displaystate */) &&
VerifyField<uint8_t>(verifier, 30 /* outlineEnabled */) &&
VerifyField<Color>(verifier, 32 /* outlineColor */) &&
VerifyField<int32_t>(verifier, 34 /* outlineSize */) &&
VerifyField<uint8_t>(verifier, 36 /* shadowEnabled */) &&
VerifyField<Color>(verifier, 38 /* shadowColor */) &&
VerifyField<float>(verifier, 40 /* shadowOffsetX */) &&
VerifyField<float>(verifier, 42 /* shadowOffsetY */) &&
VerifyField<int32_t>(verifier, 44 /* shadowBlurRadius */) &&
verifier.EndTable();
}
};
@ -769,10 +785,18 @@ struct ButtonOptionsBuilder {
void add_scale9Size(const FlatSize *scale9Size) { fbb_.AddStruct(24, scale9Size); }
void add_scale9Enabled(uint8_t scale9Enabled) { fbb_.AddElement<uint8_t>(26, scale9Enabled, 0); }
void add_displaystate(uint8_t displaystate) { fbb_.AddElement<uint8_t>(28, displaystate, 1); }
void add_outlineEnabled(uint8_t outlineEnabled) { fbb_.AddElement<uint8_t>(30, outlineEnabled, 0); }
void add_outlineColor(const Color *outlineColor) { fbb_.AddStruct(32, outlineColor); }
void add_outlineSize(int32_t outlineSize) { fbb_.AddElement<int32_t>(34, outlineSize, 1); }
void add_shadowEnabled(uint8_t shadowEnabled) { fbb_.AddElement<uint8_t>(36, shadowEnabled, 0); }
void add_shadowColor(const Color *shadowColor) { fbb_.AddStruct(38, shadowColor); }
void add_shadowOffsetX(float shadowOffsetX) { fbb_.AddElement<float>(40, shadowOffsetX, 2); }
void add_shadowOffsetY(float shadowOffsetY) { fbb_.AddElement<float>(42, shadowOffsetY, -2); }
void add_shadowBlurRadius(int32_t shadowBlurRadius) { fbb_.AddElement<int32_t>(44, shadowBlurRadius, 0); }
ButtonOptionsBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
ButtonOptionsBuilder &operator=(const ButtonOptionsBuilder &);
flatbuffers::Offset<ButtonOptions> Finish() {
auto o = flatbuffers::Offset<ButtonOptions>(fbb_.EndTable(start_, 13));
auto o = flatbuffers::Offset<ButtonOptions>(fbb_.EndTable(start_, 21));
return o;
}
};
@ -790,8 +814,22 @@ inline flatbuffers::Offset<ButtonOptions> CreateButtonOptions(flatbuffers::FlatB
const CapInsets *capInsets = 0,
const FlatSize *scale9Size = 0,
uint8_t scale9Enabled = 0,
uint8_t displaystate = 1) {
uint8_t displaystate = 1,
uint8_t outlineEnabled = 0,
const Color *outlineColor = 0,
int32_t outlineSize = 1,
uint8_t shadowEnabled = 0,
const Color *shadowColor = 0,
float shadowOffsetX = 2,
float shadowOffsetY = -2,
int32_t shadowBlurRadius = 0) {
ButtonOptionsBuilder builder_(_fbb);
builder_.add_shadowBlurRadius(shadowBlurRadius);
builder_.add_shadowOffsetY(shadowOffsetY);
builder_.add_shadowOffsetX(shadowOffsetX);
builder_.add_shadowColor(shadowColor);
builder_.add_outlineSize(outlineSize);
builder_.add_outlineColor(outlineColor);
builder_.add_scale9Size(scale9Size);
builder_.add_capInsets(capInsets);
builder_.add_textColor(textColor);
@ -803,6 +841,8 @@ inline flatbuffers::Offset<ButtonOptions> CreateButtonOptions(flatbuffers::FlatB
builder_.add_pressedData(pressedData);
builder_.add_normalData(normalData);
builder_.add_widgetOptions(widgetOptions);
builder_.add_shadowEnabled(shadowEnabled);
builder_.add_outlineEnabled(outlineEnabled);
builder_.add_displaystate(displaystate);
builder_.add_scale9Enabled(scale9Enabled);
return builder_.Finish();

127
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
View File

@ -274,6 +274,14 @@ namespace cocostudio
std::string fontResourcePlistFile = "";
int fontResourceResourceType = 0;
bool outlineEnabled = false;
Color4B outlineColor = Color4B::BLACK;
int outlineSize = 1;
bool shadowEnabled = false;
Color4B shadowColor = Color4B::BLACK;
Size shadowOffset = Size(2, -2);
int shadowBlurRadius = 0;
// attributes
const tinyxml2::XMLAttribute* attribute = objectData->FirstAttribute();
while (attribute)
@ -320,6 +328,30 @@ namespace cocostudio
{
displaystate = (value == "True") ? true : false;
}
else if (name == "OutlineEnabled")
{
outlineEnabled = (value == "True") ? true : false;
}
else if (name == "OutlineSize")
{
outlineSize = atoi(value.c_str());
}
else if (name == "ShadowEnabled")
{
shadowEnabled = (value == "True") ? true : false;
}
else if (name == "ShadowOffsetX")
{
shadowOffset.width = atof(value.c_str());
}
else if (name == "ShadowOffsetY")
{
shadowOffset.height = atof(value.c_str());
}
else if (name == "ShadowBlurRadius")
{
shadowBlurRadius = atoi(value.c_str());
}
attribute = attribute->Next();
}
@ -505,6 +537,64 @@ namespace cocostudio
attribute = attribute->Next();
}
}
else if (name == "OutlineColor")
{
attribute = child->FirstAttribute();
while (attribute)
{
name = attribute->Name();
std::string value = attribute->Value();
if (name == "A")
{
outlineColor.a = atoi(value.c_str());
}
else if (name == "R")
{
outlineColor.r = atoi(value.c_str());
}
else if (name == "G")
{
outlineColor.g = atoi(value.c_str());
}
else if (name == "B")
{
outlineColor.b = atoi(value.c_str());
}
attribute = attribute->Next();
}
}
else if (name == "ShadowColor")
{
attribute = child->FirstAttribute();
while (attribute)
{
name = attribute->Name();
std::string value = attribute->Value();
if (name == "A")
{
shadowColor.a = atoi(value.c_str());
}
else if (name == "R")
{
shadowColor.r = atoi(value.c_str());
}
else if (name == "G")
{
shadowColor.g = atoi(value.c_str());
}
else if (name == "B")
{
shadowColor.b = atoi(value.c_str());
}
attribute = attribute->Next();
}
}
child = child->NextSiblingElement();
}
@ -512,6 +602,8 @@ namespace cocostudio
Color f_textColor(255, textColor.r, textColor.g, textColor.b);
CapInsets f_capInsets(capInsets.origin.x, capInsets.origin.y, capInsets.size.width, capInsets.size.height);
FlatSize f_scale9Size(scale9Size.width, scale9Size.height);
flatbuffers::Color f_outlineColor(outlineColor.a, outlineColor.r, outlineColor.g, outlineColor.b);
flatbuffers::Color f_shadowColor(shadowColor.a, shadowColor.r, shadowColor.g, shadowColor.b);
auto options = CreateButtonOptions(*builder,
widgetOptions,
@ -538,8 +630,15 @@ namespace cocostudio
&f_capInsets,
&f_scale9Size,
scale9Enabled,
displaystate
);
displaystate,
outlineEnabled,
&f_outlineColor,
outlineSize,
shadowEnabled,
&f_shadowColor,
shadowOffset.width,
shadowOffset.height,
shadowBlurRadius);
return *(Offset<Table>*)(&options);
}
@ -786,6 +885,30 @@ namespace cocostudio
button->setBright(displaystate);
button->setEnabled(displaystate);
bool outlineEnabled = options->outlineEnabled();
if (outlineEnabled)
{
auto f_outlineColor = options->outlineColor();
if (f_outlineColor)
{
Color4B outlineColor(f_outlineColor->r(), f_outlineColor->g(), f_outlineColor->b(), f_outlineColor->a());
auto label = button->getTitleRenderer();
label->enableOutline(outlineColor, options->outlineSize());
}
}
bool shadowEnabled = options->shadowEnabled();
if (shadowEnabled)
{
auto f_shadowColor = options->shadowColor();
if (f_shadowColor)
{
Color4B shadowColor(f_shadowColor->r(), f_shadowColor->g(), f_shadowColor->b(), f_shadowColor->a());
auto label = button->getTitleRenderer();
label->enableShadow(shadowColor, Size(options->shadowOffsetX(), options->shadowOffsetY()), options->shadowBlurRadius());
}
}
auto widgetReader = WidgetReader::getInstance();
widgetReader->setPropsWithFlatBuffers(node, (Table*)options->widgetOptions());

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

@ -454,7 +454,7 @@ namespace cocostudio
auto f_outlineColor = options->outlineColor();
if (f_outlineColor)
{
Color4B outlineColor(f_outlineColor->a(), f_outlineColor->r(), f_outlineColor->g(), f_outlineColor->b());
Color4B outlineColor(f_outlineColor->r(), f_outlineColor->g(), f_outlineColor->b(), f_outlineColor->a());
label->enableOutline(outlineColor, options->outlineSize());
}
}
@ -465,7 +465,7 @@ namespace cocostudio
auto f_shadowColor = options->shadowColor();
if (f_shadowColor)
{
Color4B shadowColor(f_shadowColor->a(), f_shadowColor->r(), f_shadowColor->g(), f_shadowColor->b());
Color4B shadowColor(f_shadowColor->r(), f_shadowColor->g(), f_shadowColor->b(), f_shadowColor->a());
label->enableShadow(shadowColor, Size(options->shadowOffsetX(), options->shadowOffsetY()), options->shadowBlurRadius());
}
}