Merge pull request #395 from cocos-creator/v1.3

merge V1.3 back to develop
This commit is contained in:
子龙山人
2016-11-11 00:45:37 -08:00
committed by GitHub
16 changed files with 1728 additions and 105 deletions
+1 -1
View File
@@ -1,9 +1,9 @@
language: cpp
os:
- linux
- osx
script:
- tools/travis-scripts/run-script.sh
sudo: required
before_install:
- tools/travis-scripts/before-install.sh
branches:
+5
View File
@@ -169,6 +169,11 @@ private:
bool _letterVisible;
};
void Label::setColor(const cocos2d::Color3B &color)
{
this->setTextColor(Color4B(color));
}
Label* Label::create()
{
auto ret = new (std::nothrow) Label;
+2 -1
View File
@@ -322,6 +322,8 @@ public:
*/
int getStringLength();
virtual void setColor(const Color3B& color);
/**
* Sets the text color of Label.
*
@@ -784,4 +786,3 @@ private:
NS_CC_END
#endif /*__COCOS2D_CCLABEL_H */
+2 -1
View File
@@ -117,6 +117,7 @@ bool TMXObjectImage::_initWithMapInfo(TMXMapInfo* mapInfo)
{
return false;
}
useTileset->_imageSize = texture->getContentSizeInPixels();
auto rect = useTileset->getRectForGID(_container->getGid());
initWithTexture(texture, CC_RECT_PIXELS_TO_POINTS(rect));
setScale(_container->getObjectSize().width / rect.size.width, _container->getObjectSize().height / rect.size.height);
@@ -155,7 +156,7 @@ void TMXObjectImage::_initPosWithMapInfo(TMXMapInfo* mapInfo)
case TMXOrientationIso:
{
setAnchorPoint(Vec2(0.5, 0));
auto posIdx = Vec2(_container->getOffset().x / tileSize.width * 2, _container->getOffset().y / tileSize.height);
auto posIdx = Vec2(_container->getOffset().x / tileSize.height, _container->getOffset().y / tileSize.height);
auto pos = Vec2(tileSize.width / 2 * (mapSize.width + posIdx.x - posIdx.y),
tileSize.height / 2 * (mapSize.height * 2 - posIdx.x - posIdx.y));
setPosition(CC_POINT_PIXELS_TO_POINTS(pos));
@@ -12300,15 +12300,13 @@ color4b
},
/**
* @method getLetter
* @param {int} arg0
* @return {cc.Sprite}
* @method getOverflow
* @return {cc.Label::Overflow}
*/
getLetter : function (
int
getOverflow : function (
)
{
return cc.Sprite;
return 0;
},
/**
@@ -12342,13 +12340,13 @@ color4b
},
/**
* @method getOverflow
* @return {cc.Label::Overflow}
* @method setColor
* @param {color3b_object} arg0
*/
getOverflow : function (
setColor : function (
color3b
)
{
return 0;
},
/**
@@ -12487,6 +12485,18 @@ float
{
},
/**
* @method getLetter
* @param {int} arg0
* @return {cc.Sprite}
*/
getLetter : function (
int
)
{
return cc.Sprite;
},
/**
* @method createWithBMFont
* @param {String} arg0
@@ -170,6 +170,236 @@ str
};
/**
* @class AnimationData
*/
dragonBones.AnimationData = {
/**
* @method getClassTypeIndex
* @return {unsigned long}
*/
getClassTypeIndex : function (
)
{
return 0;
},
/**
* @method getBoneTimeline
* @param {String} arg0
* @return {dragonBones::BoneTimelineData}
*/
getBoneTimeline : function (
str
)
{
return dragonBones::BoneTimelineData;
},
/**
* @method getTypeIndex
* @return {unsigned long}
*/
getTypeIndex : function (
)
{
return 0;
},
/**
* @method AnimationData
* @constructor
*/
AnimationData : function (
)
{
},
};
/**
* @class BoneData
*/
dragonBones.BoneData = {
/**
* @method getTypeIndex
* @return {unsigned long}
*/
getTypeIndex : function (
)
{
return 0;
},
/**
* @method BoneData
* @constructor
*/
BoneData : function (
)
{
},
};
/**
* @class SlotData
*/
dragonBones.SlotData = {
/**
* @method getTypeIndex
* @return {unsigned long}
*/
getTypeIndex : function (
)
{
return 0;
},
/**
* @method generateColor
* @return {dragonBones::ColorTransform}
*/
generateColor : function (
)
{
return dragonBones::ColorTransform;
},
/**
* @method SlotData
* @constructor
*/
SlotData : function (
)
{
},
};
/**
* @class SkinData
*/
dragonBones.SkinData = {
/**
* @method getTypeIndex
* @return {unsigned long}
*/
getTypeIndex : function (
)
{
return 0;
},
/**
* @method SkinData
* @constructor
*/
SkinData : function (
)
{
},
};
/**
* @class ArmatureData
*/
dragonBones.ArmatureData = {
/**
* @method getBone
* @param {String} arg0
* @return {dragonBones::BoneData}
*/
getBone : function (
str
)
{
return dragonBones::BoneData;
},
/**
* @method getAnimation
* @param {String} arg0
* @return {dragonBones::AnimationData}
*/
getAnimation : function (
str
)
{
return dragonBones::AnimationData;
},
/**
* @method getSlot
* @param {String} arg0
* @return {dragonBones::SlotData}
*/
getSlot : function (
str
)
{
return dragonBones::SlotData;
},
/**
* @method getSkin
* @param {String} arg0
* @return {dragonBones::SkinData}
*/
getSkin : function (
str
)
{
return dragonBones::SkinData;
},
/**
* @method getDefaultSkin
* @return {dragonBones::SkinData}
*/
getDefaultSkin : function (
)
{
return dragonBones::SkinData;
},
/**
* @method getDefaultAnimation
* @return {dragonBones::AnimationData}
*/
getDefaultAnimation : function (
)
{
return dragonBones::AnimationData;
},
/**
* @method getTypeIndex
* @return {unsigned long}
*/
getTypeIndex : function (
)
{
return 0;
},
/**
* @method ArmatureData
* @constructor
*/
ArmatureData : function (
)
{
},
};
/**
* @class DragonBonesData
*/
@@ -33715,30 +33715,22 @@ bool js_cocos2dx_Label_setTextColor(JSContext *cx, uint32_t argc, jsval *vp)
JS_ReportError(cx, "js_cocos2dx_Label_setTextColor : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp)
bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
bool ok = true;
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getLetter : Invalid Native Object");
if (argc == 1) {
int arg0 = 0;
ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Label_getLetter : Error processing arguments");
cocos2d::Sprite* ret = cobj->getLetter(arg0);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getOverflow : Invalid Native Object");
if (argc == 0) {
int ret = (int)cobj->getOverflow();
JS::RootedValue jsret(cx);
if (ret) {
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::Sprite>(cx, (cocos2d::Sprite*)ret));
} else {
jsret = JSVAL_NULL;
};
jsret = int32_to_jsval(cx, ret);
args.rval().set(jsret);
return true;
}
JS_ReportError(cx, "js_cocos2dx_Label_getLetter : wrong number of arguments: %d, was expecting %d", argc, 1);
JS_ReportError(cx, "js_cocos2dx_Label_getOverflow : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_Label_setHeight(JSContext *cx, uint32_t argc, jsval *vp)
@@ -33799,22 +33791,24 @@ bool js_cocos2dx_Label_enableGlow(JSContext *cx, uint32_t argc, jsval *vp)
JS_ReportError(cx, "js_cocos2dx_Label_enableGlow : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp)
bool js_cocos2dx_Label_setColor(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
bool ok = true;
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getOverflow : Invalid Native Object");
if (argc == 0) {
int ret = (int)cobj->getOverflow();
JS::RootedValue jsret(cx);
jsret = int32_to_jsval(cx, ret);
args.rval().set(jsret);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_setColor : Invalid Native Object");
if (argc == 1) {
cocos2d::Color3B arg0;
ok &= jsval_to_cccolor3b(cx, args.get(0), &arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Label_setColor : Error processing arguments");
cobj->setColor(arg0);
args.rval().setUndefined();
return true;
}
JS_ReportError(cx, "js_cocos2dx_Label_getOverflow : wrong number of arguments: %d, was expecting %d", argc, 0);
JS_ReportError(cx, "js_cocos2dx_Label_setColor : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Label_getVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp)
@@ -34095,6 +34089,32 @@ bool js_cocos2dx_Label_setBMFontSize(JSContext *cx, uint32_t argc, jsval *vp)
JS_ReportError(cx, "js_cocos2dx_Label_setBMFontSize : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
bool ok = true;
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
cocos2d::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getLetter : Invalid Native Object");
if (argc == 1) {
int arg0 = 0;
ok &= jsval_to_int32(cx, args.get(0), (int32_t *)&arg0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Label_getLetter : Error processing arguments");
cocos2d::Sprite* ret = cobj->getLetter(arg0);
JS::RootedValue jsret(cx);
if (ret) {
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::Sprite>(cx, (cocos2d::Sprite*)ret));
} else {
jsret = JSVAL_NULL;
};
args.rval().set(jsret);
return true;
}
JS_ReportError(cx, "js_cocos2dx_Label_getLetter : wrong number of arguments: %d, was expecting %d", argc, 1);
return false;
}
bool js_cocos2dx_Label_createWithBMFont(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -34446,11 +34466,11 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) {
JS_FN("getTTFConfig", js_cocos2dx_Label_getTTFConfig, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("enableItalics", js_cocos2dx_Label_enableItalics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setTextColor", js_cocos2dx_Label_setTextColor, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getLetter", js_cocos2dx_Label_getLetter, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getOverflow", js_cocos2dx_Label_getOverflow, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setHeight", js_cocos2dx_Label_setHeight, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("isShadowEnabled", js_cocos2dx_Label_isShadowEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("enableGlow", js_cocos2dx_Label_enableGlow, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getOverflow", js_cocos2dx_Label_getOverflow, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setColor", js_cocos2dx_Label_setColor, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getVerticalAlignment", js_cocos2dx_Label_getVerticalAlignment, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setAdditionalKerning", js_cocos2dx_Label_setAdditionalKerning, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getSystemFontSize", js_cocos2dx_Label_getSystemFontSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
@@ -34465,6 +34485,7 @@ void js_register_cocos2dx_Label(JSContext *cx, JS::HandleObject global) {
JS_FN("setAlignment", js_cocos2dx_Label_setAlignment, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("requestSystemFontRefresh", js_cocos2dx_Label_requestSystemFontRefresh, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("setBMFontSize", js_cocos2dx_Label_setBMFontSize, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("getLetter", js_cocos2dx_Label_getLetter, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FN("ctor", js_cocos2dx_Label_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
JS_FS_END
};
@@ -2244,11 +2244,11 @@ bool js_cocos2dx_Label_getShadowColor(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getTTFConfig(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_enableItalics(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setTextColor(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setHeight(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_isShadowEnabled(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_enableGlow(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getOverflow(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setColor(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getVerticalAlignment(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setAdditionalKerning(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getSystemFontSize(JSContext *cx, uint32_t argc, jsval *vp);
@@ -2263,6 +2263,7 @@ bool js_cocos2dx_Label_setFontDefinition(JSContext *cx, uint32_t argc, jsval *vp
bool js_cocos2dx_Label_setAlignment(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_requestSystemFontRefresh(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_setBMFontSize(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_getLetter(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_createWithBMFont(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_create(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_Label_createWithCharMap(JSContext *cx, uint32_t argc, jsval *vp);
File diff suppressed because it is too large Load Diff
@@ -58,6 +58,65 @@ bool js_cocos2dx_dragonbones_TextureAtlasData_addTexture(JSContext *cx, uint32_t
bool js_cocos2dx_dragonbones_TextureAtlasData_generateTexture(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_TextureAtlasData_getTexture(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_AnimationData_class;
extern JSObject *jsb_dragonBones_AnimationData_prototype;
bool js_cocos2dx_dragonbones_AnimationData_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_dragonbones_AnimationData_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_dragonbones_AnimationData(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_dragonbones_AnimationData_getClassTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_AnimationData_getBoneTimeline(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_AnimationData_getTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_AnimationData_AnimationData(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_BoneData_class;
extern JSObject *jsb_dragonBones_BoneData_prototype;
bool js_cocos2dx_dragonbones_BoneData_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_dragonbones_BoneData_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_dragonbones_BoneData(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_dragonbones_BoneData_getTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_BoneData_BoneData(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_SlotData_class;
extern JSObject *jsb_dragonBones_SlotData_prototype;
bool js_cocos2dx_dragonbones_SlotData_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_dragonbones_SlotData_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_dragonbones_SlotData(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_dragonbones_SlotData_getTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_SlotData_generateColor(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_SlotData_SlotData(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_SkinData_class;
extern JSObject *jsb_dragonBones_SkinData_prototype;
bool js_cocos2dx_dragonbones_SkinData_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_dragonbones_SkinData_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_dragonbones_SkinData(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_dragonbones_SkinData_getTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_SkinData_SkinData(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_ArmatureData_class;
extern JSObject *jsb_dragonBones_ArmatureData_prototype;
bool js_cocos2dx_dragonbones_ArmatureData_constructor(JSContext *cx, uint32_t argc, jsval *vp);
void js_cocos2dx_dragonbones_ArmatureData_finalize(JSContext *cx, JSObject *obj);
void js_register_cocos2dx_dragonbones_ArmatureData(JSContext *cx, JS::HandleObject global);
void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj);
bool js_cocos2dx_dragonbones_ArmatureData_getBone(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getAnimation(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getSlot(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getSkin(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getDefaultSkin(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getDefaultAnimation(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_getTypeIndex(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_ArmatureData(JSContext *cx, uint32_t argc, jsval *vp);
extern JSClass *jsb_dragonBones_DragonBonesData_class;
extern JSObject *jsb_dragonBones_DragonBonesData_prototype;
@@ -45,6 +45,24 @@ bool js_cocos2dx_dragonbones_Armature_getAnimation(JSContext *cx, uint32_t argc,
return false;
}
bool js_cocos2dx_dragonbones_Armature_getArmatureData(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::Armature* cobj = (dragonBones::Armature *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Armature_getArmatureData : Invalid Native Object");
if (argc == 0) {
const dragonBones::ArmatureData& ret = cobj->getArmatureData();
JS::RootedValue jsret(cx, OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::ArmatureData>(cx, (dragonBones::ArmatureData*)&ret)));
args.rval().set(jsret);
return true;
}
JS_ReportError(cx, "js_cocos2dx_dragonbones_Armature_getArmatureData : wrong number of arguments: %d, was expecting %d", argc, 0);
return false;
}
bool js_cocos2dx_dragonbones_Armature_getDisplay(JSContext *cx, uint32_t argc, jsval *vp)
{
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -104,6 +122,118 @@ bool js_cocos2dx_dragonbones_AnimationState_getClip(JSContext *cx, uint32_t argc
return false;
}
bool js_cocos2dx_dragonbones_ArmatureData_get_animations(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::ArmatureData* cobj = (dragonBones::ArmatureData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_ArmatureData_get_animations : Invalid Native Object");
JS::RootedObject proto(cx);
JS::RootedObject parent(cx);
JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, proto, parent));
const std::map<std::string, dragonBones::AnimationData*>& v = cobj->animations;
for (auto iter = v.begin(); iter != v.end(); ++iter)
{
JS::RootedValue element(cx);
std::string key = iter->first;
dragonBones::AnimationData* valueObj = iter->second;
element = OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::AnimationData>(cx, valueObj));
if (!key.empty())
{
JS_SetProperty(cx, jsRet, key.c_str(), element);
}
}
vp.set(OBJECT_TO_JSVAL(jsRet));
return true;
}
bool js_cocos2dx_dragonbones_ArmatureData_get_bones(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::ArmatureData* cobj = (dragonBones::ArmatureData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_ArmatureData_get_bones : Invalid Native Object");
JS::RootedObject proto(cx);
JS::RootedObject parent(cx);
JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, proto, parent));
const std::map<std::string, dragonBones::BoneData*>& v = cobj->bones;
for (auto iter = v.begin(); iter != v.end(); ++iter)
{
JS::RootedValue element(cx);
std::string key = iter->first;
dragonBones::BoneData* valueObj = iter->second;
element = OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::BoneData>(cx, valueObj));
if (!key.empty())
{
JS_SetProperty(cx, jsRet, key.c_str(), element);
}
}
vp.set(OBJECT_TO_JSVAL(jsRet));
return true;
}
bool js_cocos2dx_dragonbones_ArmatureData_get_skins(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::ArmatureData* cobj = (dragonBones::ArmatureData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_ArmatureData_get_skins : Invalid Native Object");
JS::RootedObject proto(cx);
JS::RootedObject parent(cx);
JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, proto, parent));
const std::map<std::string, dragonBones::SkinData*>& v = cobj->skins;
for (auto iter = v.begin(); iter != v.end(); ++iter)
{
JS::RootedValue element(cx);
std::string key = iter->first;
dragonBones::SkinData* valueObj = iter->second;
element = OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::SkinData>(cx, valueObj));
if (!key.empty())
{
JS_SetProperty(cx, jsRet, key.c_str(), element);
}
}
vp.set(OBJECT_TO_JSVAL(jsRet));
return true;
}
bool js_cocos2dx_dragonbones_ArmatureData_get_slots(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::ArmatureData* cobj = (dragonBones::ArmatureData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_ArmatureData_get_slots : Invalid Native Object");
JS::RootedObject proto(cx);
JS::RootedObject parent(cx);
JS::RootedObject jsRet(cx, JS_NewObject(cx, NULL, proto, parent));
const std::map<std::string, dragonBones::SlotData*>& v = cobj->slots;
for (auto iter = v.begin(); iter != v.end(); ++iter)
{
JS::RootedValue element(cx);
std::string key = iter->first;
dragonBones::SlotData* valueObj = iter->second;
element = OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::SlotData>(cx, valueObj));
if (!key.empty())
{
JS_SetProperty(cx, jsRet, key.c_str(), element);
}
}
vp.set(OBJECT_TO_JSVAL(jsRet));
return true;
}
bool js_cocos2dx_dragonbones_DragonBonesData_get_armatureNames(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
js_proxy_t *proxy = jsb_get_js_proxy(obj);
dragonBones::DragonBonesData* cobj = (dragonBones::DragonBonesData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_DragonBonesData_get_armatureNames : Invalid Native Object");
const std::vector<std::string>& ret = cobj->getArmatureNames();
JS::RootedValue jsret(cx);
jsret = std_vector_string_to_jsval(cx, ret);
vp.set(jsret);
return true;
}
bool js_cocos2dx_dragonbones_WorldClock_getClock(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp)
{
JS::RootedValue jsret(cx, OBJECT_TO_JSVAL(js_get_or_create_jsobject<dragonBones::WorldClock>(cx, &dragonBones::WorldClock::clock)));
@@ -214,6 +344,8 @@ bool js_cocos2dx_dragonbones_TransformObject_getOffset(JSContext *cx, JS::Handle
}
extern JSObject *jsb_dragonBones_Armature_prototype;
extern JSObject *jsb_dragonBones_ArmatureData_prototype;
extern JSObject *jsb_dragonBones_DragonBonesData_prototype;
extern JSObject *jsb_dragonBones_CCArmatureDisplay_prototype;
extern JSObject *jsb_dragonBones_AnimationState_prototype;
extern JSObject *jsb_dragonBones_TransformObject_prototype;
@@ -223,6 +355,7 @@ void register_all_cocos2dx_dragonbones_manual(JSContext* cx, JS::HandleObject gl
{
JS::RootedObject armature(cx, jsb_dragonBones_Armature_prototype);
JS_DefineFunction(cx, armature, "getAnimation", js_cocos2dx_dragonbones_Armature_getAnimation, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);
JS_DefineFunction(cx, armature, "getArmatureData", js_cocos2dx_dragonbones_Armature_getArmatureData, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);
JS_DefineFunction(cx, armature, "getDisplay", js_cocos2dx_dragonbones_Armature_getDisplay, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);
JS::RootedObject armatureDisplay(cx, jsb_dragonBones_CCArmatureDisplay_prototype);
@@ -231,6 +364,15 @@ void register_all_cocos2dx_dragonbones_manual(JSContext* cx, JS::HandleObject gl
JS::RootedObject animationState(cx, jsb_dragonBones_AnimationState_prototype);
JS_DefineFunction(cx, animationState, "getClip", js_cocos2dx_dragonbones_AnimationState_getClip, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);
JS::RootedObject armatureData(cx, jsb_dragonBones_ArmatureData_prototype);
JS_DefineProperty(cx, armatureData, "animations", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_ArmatureData_get_animations);
JS_DefineProperty(cx, armatureData, "bones", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_ArmatureData_get_bones);
JS_DefineProperty(cx, armatureData, "skins", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_ArmatureData_get_skins);
JS_DefineProperty(cx, armatureData, "slots", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_ArmatureData_get_slots);
JS::RootedObject dragonBonesData(cx, jsb_dragonBones_DragonBonesData_prototype);
JS_DefineProperty(cx, dragonBonesData, "armatureNames", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_DragonBonesData_get_armatureNames);
JS::RootedObject tmpObj(cx);
get_or_create_js_obj(cx, global, "dragonBones", &tmpObj);
get_or_create_js_obj(cx, tmpObj, "WorldClock", &tmpObj);
@@ -28,10 +28,17 @@
void register_all_cocos2dx_dragonbones_manual(JSContext* cx, JS::HandleObject global);
bool js_cocos2dx_dragonbones_Armature_getAnimation(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_Armature_getArmatureData(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_Armature_getDisplay(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_CCArmatureDisplay_getAnimation(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_AnimationState_getClip(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_ArmatureData_get_animations(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_ArmatureData_get_bones(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_ArmatureData_get_skins(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_ArmatureData_get_slots(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_DragonBonesData_get_armatureNames(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_WorldClock_getClock(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
bool js_cocos2dx_dragonbones_WorldClock_add(JSContext *cx, uint32_t argc, jsval *vp);
bool js_cocos2dx_dragonbones_WorldClock_remove(JSContext *cx, uint32_t argc, jsval *vp);
+12 -4
View File
@@ -20,7 +20,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s
headers = %(cocosdir)s/cocos/editor-support/dragonbones/cocos2dx/CCDragonBonesHeaders.h
classes = DragonBonesData CCFactory CCArmatureDisplay Armature CCSlot WorldClock Animation Slot BaseFactory BaseObject TextureData CCTextureData TextureAtlasData CCTextureAtlasData AnimationState EventObject Bone Transform Matrix TransformObject
classes = DragonBonesData CCFactory CCArmatureDisplay Armature CCSlot WorldClock Animation Slot BaseFactory BaseObject TextureData CCTextureData TextureAtlasData CCTextureAtlasData AnimationState EventObject Bone Transform Matrix TransformObject ArmatureData BoneData SlotData SkinData AnimationData
abstract_classes = Slot BaseFactory BaseObject TextureAtlasData TextureData TransformObject
@@ -35,18 +35,26 @@ skip = CCFactory::[loadDragonBonesData loadTextureAtlasData],
CCSlot::[_onClear],
Transform::[operator= fromMatrix add identity minus toMatrix],
Matrix::[operator= identity concat invert transformPoint],
WorldClock::[add remove]
WorldClock::[add remove],
ArmatureData::[cacheFrames addBone addSlot addSkin addAnimation getSortedBones getSortedSlots],
AnimationData::[cacheFrames addBoneTimeline addSlotTimeline addFFDTimeline getBontTimeline getSlotTimeline getFFDTimeline],
SkinData::[addSlot getSlot]
field = TransformObject::[name globalTransformMatrix],
Transform::[x y skewX skewY scaleX scaleY],
Slot::[displayController inheritAnimation],
Matrix::[a b c d tx ty],
EventObject::[animationState armature name type bone slot],
AnimationState::[timeScale displayControl additiveBlending playTimes weight autoFadeOutTime fadeTotalTime]
AnimationState::[timeScale displayControl additiveBlending playTimes weight autoFadeOutTime fadeTotalTime],
ArmatureData::[frameRate name],
AnimationData::[name frameCount playTimes position duration fadeInTime],
BoneData::[name parent],
SlotData::[name parent],
SkinData::[name]
remove_prefix =
classes_have_no_parents = WorldClock Slot
classes_have_no_parents = WorldClock Slot AnimationData
base_classes_to_skip = IAnimateble IArmatureDisplay
@@ -29,8 +29,13 @@ install_android_ndk()
mv android-ndk-r11c android-ndk
}
function install_python_module_for_osx()
{
sudo easy_install pip
sudo -H pip install pyyaml
sudo -H pip install Cheetah
}
#we only use osx for generate bindings
if [ $TRAVIS_OS_NAME == 'osx' ]; then
install_android_ndk
sudo pip install PyYAML
fi
install_android_ndk
install_python_module_for_osx
@@ -29,26 +29,12 @@ JS_COMMIT_PATH="cocos/scripting/js-bindings/auto"
# Exit on error
set -e
if [ $TRAVIS_OS_NAME == 'osx' ]; then
mkdir -p $HOME/bin
pushd $HOME/bin
curl -O http://pyyaml.org/download/pyyaml/PyYAML-3.10.zip
unzip PyYAML-3.10.zip 2> /dev/null > /dev/null
cd PyYAML-3.10
sudo python setup.py install 2> /dev/null > /dev/null
cd ..
curl -O https://pypi.python.org/packages/source/C/Cheetah/Cheetah-2.4.4.tar.gz
tar xzf Cheetah-2.4.4.tar.gz
cd Cheetah-2.4.4
sudo python setup.py install 2> /dev/null > /dev/null
popd
fi
generate_bindings_glue_codes()
{
echo "Create auto-generated jsbinding glue codes."
pushd "$TOJS_ROOT"
./genbindings.py
rm userconf.ini
popd
}
@@ -82,6 +68,8 @@ cp "$backup_dir"/js_bindings_chipmunk_functions.h "$JS_AUTO_GENERATED_DIR"/
cp "$backup_dir"/js_bindings_chipmunk_functions_registration.h "$JS_AUTO_GENERATED_DIR"/
#move the backup chipmunk js bindings to js auto directory
rm -rf $backup_dir
# 1. Generate js bindings
generate_bindings_glue_codes
+34 -42
View File
@@ -8,49 +8,41 @@ if [ -z "$NDK_ROOT" ]; then
export NDK_ROOT=$HOME/bin/android-ndk
fi
if [ -z "$PYTHON_BIN" ]; then
export PYTHON_BIN=/usr/bin/python
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ -z "${GH_EMAIL}" ]; then
echo "GH_EMAIL not set"
exit 1
fi
if [ -z "${GH_USER}" ]; then
echo "GH_USER not set"
exit 1
fi
if [ -z "${GH_PASSWORD}" ]; then
echo "GH_USER not set"
exit 1
fi
if [ $TRAVIS_OS_NAME == 'osx' ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ -z "${GH_EMAIL}" ]; then
echo "GH_EMAIL not set"
exit 1
fi
if [ -z "${GH_USER}" ]; then
echo "GH_USER not set"
exit 1
fi
if [ -z "${GH_PASSWORD}" ]; then
echo "GH_USER not set"
exit 1
fi
cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-bindings.sh $TRAVIS_BRANCH
cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-bindings.sh $TRAVIS_BRANCH
elif [ $TRAVIS_OS_NAME == 'linux' ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ -z "${GH_EMAIL}" ]; then
echo "GH_EMAIL not set"
exit 1
fi
if [ -z "${GH_USER}" ]; then
echo "GH_USER not set"
exit 1
fi
if [ -z "${GH_PASSWORD}" ]; then
echo "GH_USER not set"
exit 1
fi
cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh $TRAVIS_BRANCH
else
echo "Unknown \$PLATFORM: '$PLATFORM'"
exit 1
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ -z "${GH_EMAIL}" ]; then
echo "GH_EMAIL not set"
exit 1
fi
if [ -z "${GH_USER}" ]; then
echo "GH_USER not set"
exit 1
fi
if [ -z "${GH_PASSWORD}" ]; then
echo "GH_USER not set"
exit 1
fi
cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-cocosfiles.sh $TRAVIS_BRANCH
exit 0