Skip to content

Commit 2251b52

Browse files
ricardoquesadaricardoquesada
committed
Merge pull request cocos2d#14611 from ricardoquesada/js_get_or_create_jsobject
js_get_or_create_jsobject() and other stuff
2 parents ea5dace + 96ee343 commit 2251b52

16 files changed

+2728
-4258
lines changed

‎cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp

+153-246
Large diffs are not rendered by default.

‎cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp

+25-40
Original file line numberDiff line numberDiff line change
@@ -680,14 +680,11 @@ bool js_cocos2dx_3d_extension_PUParticleSystem3D_clone(JSContext *cx, uint32_t a
680680
if (argc == 0) {
681681
cocos2d::PUParticleSystem3D* ret = cobj->clone();
682682
jsval jsret = JSVAL_NULL;
683-
do {
684-
if (ret) {
685-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret);
686-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
687-
} else {
688-
jsret = JSVAL_NULL;
689-
}
690-
} while (0);
683+
if (ret) {
684+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret));
685+
} else {
686+
jsret = JSVAL_NULL;
687+
};
691688
args.rval().set(jsret);
692689
return true;
693690
}
@@ -773,14 +770,11 @@ bool js_cocos2dx_3d_extension_PUParticleSystem3D_getParentParticleSystem(JSConte
773770
if (argc == 0) {
774771
cocos2d::PUParticleSystem3D* ret = cobj->getParentParticleSystem();
775772
jsval jsret = JSVAL_NULL;
776-
do {
777-
if (ret) {
778-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret);
779-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
780-
} else {
781-
jsret = JSVAL_NULL;
782-
}
783-
} while (0);
773+
if (ret) {
774+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret));
775+
} else {
776+
jsret = JSVAL_NULL;
777+
};
784778
args.rval().set(jsret);
785779
return true;
786780
}
@@ -1026,14 +1020,11 @@ bool js_cocos2dx_3d_extension_PUParticleSystem3D_create(JSContext *cx, uint32_t
10261020
if (!ok) { ok = true; break; }
10271021
cocos2d::PUParticleSystem3D* ret = cocos2d::PUParticleSystem3D::create(arg0);
10281022
jsval jsret = JSVAL_NULL;
1029-
do {
1030-
if (ret) {
1031-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret);
1032-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
1033-
} else {
1034-
jsret = JSVAL_NULL;
1035-
}
1036-
} while (0);
1023+
if (ret) {
1024+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret));
1025+
} else {
1026+
jsret = JSVAL_NULL;
1027+
};
10371028
args.rval().set(jsret);
10381029
return true;
10391030
}
@@ -1043,14 +1034,11 @@ bool js_cocos2dx_3d_extension_PUParticleSystem3D_create(JSContext *cx, uint32_t
10431034
if (argc == 0) {
10441035
cocos2d::PUParticleSystem3D* ret = cocos2d::PUParticleSystem3D::create();
10451036
jsval jsret = JSVAL_NULL;
1046-
do {
1047-
if (ret) {
1048-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret);
1049-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
1050-
} else {
1051-
jsret = JSVAL_NULL;
1052-
}
1053-
} while (0);
1037+
if (ret) {
1038+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret));
1039+
} else {
1040+
jsret = JSVAL_NULL;
1041+
};
10541042
args.rval().set(jsret);
10551043
return true;
10561044
}
@@ -1066,14 +1054,11 @@ bool js_cocos2dx_3d_extension_PUParticleSystem3D_create(JSContext *cx, uint32_t
10661054
if (!ok) { ok = true; break; }
10671055
cocos2d::PUParticleSystem3D* ret = cocos2d::PUParticleSystem3D::create(arg0, arg1);
10681056
jsval jsret = JSVAL_NULL;
1069-
do {
1070-
if (ret) {
1071-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret);
1072-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
1073-
} else {
1074-
jsret = JSVAL_NULL;
1075-
}
1076-
} while (0);
1057+
if (ret) {
1058+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::PUParticleSystem3D>(cx, (cocos2d::PUParticleSystem3D*)ret));
1059+
} else {
1060+
jsret = JSVAL_NULL;
1061+
};
10771062
args.rval().set(jsret);
10781063
return true;
10791064
}

‎cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp

+14-23
Original file line numberDiff line numberDiff line change
@@ -645,14 +645,11 @@ bool js_cocos2dx_audioengine_AudioEngine_getDefaultProfile(JSContext *cx, uint32
645645

646646
cocos2d::experimental::AudioProfile* ret = cocos2d::experimental::AudioEngine::getDefaultProfile();
647647
jsval jsret = JSVAL_NULL;
648-
do {
649648
if (ret) {
650-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret);
651-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
652-
} else {
653-
jsret = JSVAL_NULL;
654-
}
655-
} while (0);
649+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret));
650+
} else {
651+
jsret = JSVAL_NULL;
652+
};
656653
args.rval().set(jsret);
657654
return true;
658655
}
@@ -713,14 +710,11 @@ bool js_cocos2dx_audioengine_AudioEngine_getProfile(JSContext *cx, uint32_t argc
713710
if (!ok) { ok = true; break; }
714711
cocos2d::experimental::AudioProfile* ret = cocos2d::experimental::AudioEngine::getProfile(arg0);
715712
jsval jsret = JSVAL_NULL;
716-
do {
717-
if (ret) {
718-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret);
719-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
720-
} else {
721-
jsret = JSVAL_NULL;
722-
}
723-
} while (0);
713+
if (ret) {
714+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret));
715+
} else {
716+
jsret = JSVAL_NULL;
717+
};
724718
args.rval().set(jsret);
725719
return true;
726720
}
@@ -733,14 +727,11 @@ bool js_cocos2dx_audioengine_AudioEngine_getProfile(JSContext *cx, uint32_t argc
733727
if (!ok) { ok = true; break; }
734728
cocos2d::experimental::AudioProfile* ret = cocos2d::experimental::AudioEngine::getProfile(arg0);
735729
jsval jsret = JSVAL_NULL;
736-
do {
737-
if (ret) {
738-
js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret);
739-
jsret = OBJECT_TO_JSVAL(jsProxy->obj);
740-
} else {
741-
jsret = JSVAL_NULL;
742-
}
743-
} while (0);
730+
if (ret) {
731+
jsret = OBJECT_TO_JSVAL(js_get_or_create_jsobject<cocos2d::experimental::AudioProfile>(cx, (cocos2d::experimental::AudioProfile*)ret));
732+
} else {
733+
jsret = JSVAL_NULL;
734+
};
744735
args.rval().set(jsret);
745736
return true;
746737
}

0 commit comments

Comments
 (0)