Skip to content

Commit 7d55e50

Browse files
dingpinglvdingpinglv
committed
Merge pull request #242 from pandamicro/master
Fixed #4571: Fixed API inconsistence for DrawNode
2 parents 80bd2d8 + 100d4aa commit 7d55e50

File tree

11 files changed

+574
-101
lines changed

11 files changed

+574
-101
lines changed

‎frameworks/cocos2d-html5

Submodule cocos2d-html5 updated 96 files

‎frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7897,18 +7897,16 @@ AtlasNode : function (
78977897
cc.DrawNode = {
78987898

78997899
/**
7900-
* @method drawQuadraticBezier
7900+
* @method drawTriangle
79017901
* @param {PointObject} arg0
79027902
* @param {PointObject} arg1
79037903
* @param {PointObject} arg2
7904-
* @param {unsigned int} arg3
7905-
* @param {Color4FObject} arg4
7904+
* @param {Color4FObject} arg3
79067905
*/
7907-
drawQuadraticBezier : function (
7906+
drawTriangle : function (
79087907
point,
79097908
point,
79107909
point,
7911-
int,
79127910
color4f
79137911
)
79147912
{
@@ -7934,22 +7932,6 @@ clear : function (
79347932
{
79357933
},
79367934

7937-
/**
7938-
* @method drawTriangle
7939-
* @param {PointObject} arg0
7940-
* @param {PointObject} arg1
7941-
* @param {PointObject} arg2
7942-
* @param {Color4FObject} arg3
7943-
*/
7944-
drawTriangle : function (
7945-
point,
7946-
point,
7947-
point,
7948-
color4f
7949-
)
7950-
{
7951-
},
7952-
79537935
/**
79547936
* @method init
79557937
* @return {bool}
@@ -7974,6 +7956,24 @@ color4f
79747956
{
79757957
},
79767958

7959+
/**
7960+
* @method drawQuadraticBezier
7961+
* @param {PointObject} arg0
7962+
* @param {PointObject} arg1
7963+
* @param {PointObject} arg2
7964+
* @param {unsigned int} arg3
7965+
* @param {Color4FObject} arg4
7966+
*/
7967+
drawQuadraticBezier : function (
7968+
point,
7969+
point,
7970+
point,
7971+
int,
7972+
color4f
7973+
)
7974+
{
7975+
},
7976+
79777977
/**
79787978
* @method drawCubicBezier
79797979
* @param {PointObject} arg0

‎frameworks/js-bindings/bindings/auto/jsb_cocos2dx_auto.cpp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24885,32 +24885,30 @@ void js_register_cocos2dx_AtlasNode(JSContext *cx, JSObject *global) {
2488524885
JSClass *jsb_cocos2d_DrawNode_class;
2488624886
JSObject *jsb_cocos2d_DrawNode_prototype;
2488724887

24888-
bool js_cocos2dx_DrawNode_drawQuadraticBezier(JSContext *cx, uint32_t argc, jsval *vp)
24888+
bool js_cocos2dx_DrawNode_drawTriangle(JSContext *cx, uint32_t argc, jsval *vp)
2488924889
{
2489024890
jsval *argv = JS_ARGV(cx, vp);
2489124891
bool ok = true;
2489224892
JSObject *obj = JS_THIS_OBJECT(cx, vp);
2489324893
js_proxy_t *proxy = jsb_get_js_proxy(obj);
2489424894
cocos2d::DrawNode* cobj = (cocos2d::DrawNode *)(proxy ? proxy->ptr : NULL);
24895-
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_drawQuadraticBezier : Invalid Native Object");
24896-
if (argc == 5) {
24895+
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_drawTriangle : Invalid Native Object");
24896+
if (argc == 4) {
2489724897
cocos2d::Point arg0;
2489824898
cocos2d::Point arg1;
2489924899
cocos2d::Point arg2;
24900-
unsigned int arg3;
24901-
cocos2d::Color4F arg4;
24900+
cocos2d::Color4F arg3;
2490224901
ok &= jsval_to_ccpoint(cx, argv[0], &arg0);
2490324902
ok &= jsval_to_ccpoint(cx, argv[1], &arg1);
2490424903
ok &= jsval_to_ccpoint(cx, argv[2], &arg2);
24905-
ok &= jsval_to_uint32(cx, argv[3], &arg3);
24906-
ok &= jsval_to_cccolor4f(cx, argv[4], &arg4);
24907-
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_DrawNode_drawQuadraticBezier : Error processing arguments");
24908-
cobj->drawQuadraticBezier(arg0, arg1, arg2, arg3, arg4);
24904+
ok &= jsval_to_cccolor4f(cx, argv[3], &arg3);
24905+
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_DrawNode_drawTriangle : Error processing arguments");
24906+
cobj->drawTriangle(arg0, arg1, arg2, arg3);
2490924907
JS_SET_RVAL(cx, vp, JSVAL_VOID);
2491024908
return true;
2491124909
}
2491224910

24913-
JS_ReportError(cx, "js_cocos2dx_DrawNode_drawQuadraticBezier : wrong number of arguments: %d, was expecting %d", argc, 5);
24911+
JS_ReportError(cx, "js_cocos2dx_DrawNode_drawTriangle : wrong number of arguments: %d, was expecting %d", argc, 4);
2491424912
return false;
2491524913
}
2491624914
bool js_cocos2dx_DrawNode_onDraw(JSContext *cx, uint32_t argc, jsval *vp)
@@ -24950,32 +24948,6 @@ bool js_cocos2dx_DrawNode_clear(JSContext *cx, uint32_t argc, jsval *vp)
2495024948
JS_ReportError(cx, "js_cocos2dx_DrawNode_clear : wrong number of arguments: %d, was expecting %d", argc, 0);
2495124949
return false;
2495224950
}
24953-
bool js_cocos2dx_DrawNode_drawTriangle(JSContext *cx, uint32_t argc, jsval *vp)
24954-
{
24955-
jsval *argv = JS_ARGV(cx, vp);
24956-
bool ok = true;
24957-
JSObject *obj = JS_THIS_OBJECT(cx, vp);
24958-
js_proxy_t *proxy = jsb_get_js_proxy(obj);
24959-
cocos2d::DrawNode* cobj = (cocos2d::DrawNode *)(proxy ? proxy->ptr : NULL);
24960-
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_drawTriangle : Invalid Native Object");
24961-
if (argc == 4) {
24962-
cocos2d::Point arg0;
24963-
cocos2d::Point arg1;
24964-
cocos2d::Point arg2;
24965-
cocos2d::Color4F arg3;
24966-
ok &= jsval_to_ccpoint(cx, argv[0], &arg0);
24967-
ok &= jsval_to_ccpoint(cx, argv[1], &arg1);
24968-
ok &= jsval_to_ccpoint(cx, argv[2], &arg2);
24969-
ok &= jsval_to_cccolor4f(cx, argv[3], &arg3);
24970-
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_DrawNode_drawTriangle : Error processing arguments");
24971-
cobj->drawTriangle(arg0, arg1, arg2, arg3);
24972-
JS_SET_RVAL(cx, vp, JSVAL_VOID);
24973-
return true;
24974-
}
24975-
24976-
JS_ReportError(cx, "js_cocos2dx_DrawNode_drawTriangle : wrong number of arguments: %d, was expecting %d", argc, 4);
24977-
return false;
24978-
}
2497924951
bool js_cocos2dx_DrawNode_init(JSContext *cx, uint32_t argc, jsval *vp)
2498024952
{
2498124953
JSObject *obj = JS_THIS_OBJECT(cx, vp);
@@ -25017,6 +24989,34 @@ bool js_cocos2dx_DrawNode_drawDot(JSContext *cx, uint32_t argc, jsval *vp)
2501724989
JS_ReportError(cx, "js_cocos2dx_DrawNode_drawDot : wrong number of arguments: %d, was expecting %d", argc, 3);
2501824990
return false;
2501924991
}
24992+
bool js_cocos2dx_DrawNode_drawQuadraticBezier(JSContext *cx, uint32_t argc, jsval *vp)
24993+
{
24994+
jsval *argv = JS_ARGV(cx, vp);
24995+
bool ok = true;
24996+
JSObject *obj = JS_THIS_OBJECT(cx, vp);
24997+
js_proxy_t *proxy = jsb_get_js_proxy(obj);
24998+
cocos2d::DrawNode* cobj = (cocos2d::DrawNode *)(proxy ? proxy->ptr : NULL);
24999+
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_DrawNode_drawQuadraticBezier : Invalid Native Object");
25000+
if (argc == 5) {
25001+
cocos2d::Point arg0;
25002+
cocos2d::Point arg1;
25003+
cocos2d::Point arg2;
25004+
unsigned int arg3;
25005+
cocos2d::Color4F arg4;
25006+
ok &= jsval_to_ccpoint(cx, argv[0], &arg0);
25007+
ok &= jsval_to_ccpoint(cx, argv[1], &arg1);
25008+
ok &= jsval_to_ccpoint(cx, argv[2], &arg2);
25009+
ok &= jsval_to_uint32(cx, argv[3], &arg3);
25010+
ok &= jsval_to_cccolor4f(cx, argv[4], &arg4);
25011+
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_DrawNode_drawQuadraticBezier : Error processing arguments");
25012+
cobj->drawQuadraticBezier(arg0, arg1, arg2, arg3, arg4);
25013+
JS_SET_RVAL(cx, vp, JSVAL_VOID);
25014+
return true;
25015+
}
25016+
25017+
JS_ReportError(cx, "js_cocos2dx_DrawNode_drawQuadraticBezier : wrong number of arguments: %d, was expecting %d", argc, 5);
25018+
return false;
25019+
}
2502025020
bool js_cocos2dx_DrawNode_drawCubicBezier(JSContext *cx, uint32_t argc, jsval *vp)
2502125021
{
2502225022
jsval *argv = JS_ARGV(cx, vp);
@@ -25161,12 +25161,12 @@ void js_register_cocos2dx_DrawNode(JSContext *cx, JSObject *global) {
2516125161
};
2516225162

2516325163
static JSFunctionSpec funcs[] = {
25164-
JS_FN("drawQuadraticBezier", js_cocos2dx_DrawNode_drawQuadraticBezier, 5, JSPROP_PERMANENT | JSPROP_ENUMERATE),
25164+
JS_FN("drawTriangle", js_cocos2dx_DrawNode_drawTriangle, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2516525165
JS_FN("onDraw", js_cocos2dx_DrawNode_onDraw, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2516625166
JS_FN("clear", js_cocos2dx_DrawNode_clear, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
25167-
JS_FN("drawTriangle", js_cocos2dx_DrawNode_drawTriangle, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2516825167
JS_FN("init", js_cocos2dx_DrawNode_init, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2516925168
JS_FN("drawDot", js_cocos2dx_DrawNode_drawDot, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE),
25169+
JS_FN("drawQuadBezier", js_cocos2dx_DrawNode_drawQuadraticBezier, 5, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2517025170
JS_FN("drawCubicBezier", js_cocos2dx_DrawNode_drawCubicBezier, 6, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2517125171
JS_FN("drawSegment", js_cocos2dx_DrawNode_drawSegment, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE),
2517225172
JS_FN("ctor", js_cocos2d_DrawNode_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),

‎frameworks/js-bindings/bindings/auto/jsb_cocos2dx_auto.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,12 +1651,12 @@ bool js_cocos2dx_DrawNode_constructor(JSContext *cx, uint32_t argc, jsval *vp);
16511651
void js_cocos2dx_DrawNode_finalize(JSContext *cx, JSObject *obj);
16521652
void js_register_cocos2dx_DrawNode(JSContext *cx, JSObject *global);
16531653
void register_all_cocos2dx(JSContext* cx, JSObject* obj);
1654-
bool js_cocos2dx_DrawNode_drawQuadraticBezier(JSContext *cx, uint32_t argc, jsval *vp);
1654+
bool js_cocos2dx_DrawNode_drawTriangle(JSContext *cx, uint32_t argc, jsval *vp);
16551655
bool js_cocos2dx_DrawNode_onDraw(JSContext *cx, uint32_t argc, jsval *vp);
16561656
bool js_cocos2dx_DrawNode_clear(JSContext *cx, uint32_t argc, jsval *vp);
1657-
bool js_cocos2dx_DrawNode_drawTriangle(JSContext *cx, uint32_t argc, jsval *vp);
16581657
bool js_cocos2dx_DrawNode_init(JSContext *cx, uint32_t argc, jsval *vp);
16591658
bool js_cocos2dx_DrawNode_drawDot(JSContext *cx, uint32_t argc, jsval *vp);
1659+
bool js_cocos2dx_DrawNode_drawQuadraticBezier(JSContext *cx, uint32_t argc, jsval *vp);
16601660
bool js_cocos2dx_DrawNode_drawCubicBezier(JSContext *cx, uint32_t argc, jsval *vp);
16611661
bool js_cocos2dx_DrawNode_drawSegment(JSContext *cx, uint32_t argc, jsval *vp);
16621662
bool js_cocos2dx_DrawNode_create(JSContext *cx, uint32_t argc, jsval *vp);

0 commit comments

Comments
 (0)