Skip to content

Commit d69991e

Browse files
committed
Cocos2d finale
1 parent f5a5312 commit d69991e

File tree

2 files changed

+69
-41
lines changed

2 files changed

+69
-41
lines changed

bindings/2.2081/Cocos2d.bro

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,88 +13,88 @@ class cocos2d {
1313
static cocos2d::CCAffineTransform __CCAffineTransformMake(float, float, float, float, float, float) = imac 0x23ff70, m1 0x1e7948, ios 0x413230;
1414
static cocos2d::CCPoint __CCPointApplyAffineTransform(cocos2d::CCPoint const&, cocos2d::CCAffineTransform const&) = imac 0x23ffa0, m1 0x1e7958, ios 0x413240;
1515
static cocos2d::CCSize __CCSizeApplyAffineTransform(cocos2d::CCSize const&, cocos2d::CCAffineTransform const&) = imac 0x240010, m1 0x1e79b4, ios inline;
16-
static char* cc_utf16_to_utf8(unsigned short const*, long, long*, long*);
17-
static gd::vector<unsigned short> cc_utf16_vec_from_utf16_str(unsigned short const*);
18-
static unsigned int cc_utf8_find_last_not_char(gd::vector<unsigned short>, unsigned short);
19-
static long cc_utf8_strlen(char const*, int);
20-
static unsigned short* cc_utf8_to_utf16(char const*, int*);
21-
static void cc_utf8_trim_ws(gd::vector<unsigned short>*);
22-
static int cc_wcslen(unsigned short const*);
16+
static char* cc_utf16_to_utf8(unsigned short const*, long, long*, long*) = m1 0x580578, imac 0x660840;
17+
static gd::vector<unsigned short> cc_utf16_vec_from_utf16_str(unsigned short const*) = m1 0x58024c, imac 0x6604b0, ios 0x1ad22c;
18+
static unsigned int cc_utf8_find_last_not_char(gd::vector<unsigned short>, unsigned short) = m1 0x57fe34, imac 0x65ffb0, ios 0x1ad048;
19+
static long cc_utf8_strlen(char const*, int) = m1 0x58016c, imac 0x660370;
20+
static unsigned short* cc_utf8_to_utf16(char const*, int*) = m1 0x5803bc, imac 0x660660, ios 0x1ad390;
21+
static void cc_utf8_trim_ws(gd::vector<unsigned short>*) = m1 0x57ff70, imac 0x6600f0, ios 0x1ad11c;
22+
static int cc_wcslen(unsigned short const*) = m1 0x580140, imac 0x660340, ios 0x1ad200;
2323
static cocos2d::CCAffineTransform CCAffineTransformConcat(cocos2d::CCAffineTransform const&, cocos2d::CCAffineTransform const&) = imac 0x2403d0, m1 0x1e7cc0, ios 0x4134bc;
2424
static bool CCAffineTransformEqualToTransform(cocos2d::CCAffineTransform const&, cocos2d::CCAffineTransform const&) = imac 0x240440, m1 0x1e7d18, ios inline;
2525
static cocos2d::CCAffineTransform CCAffineTransformInvert(cocos2d::CCAffineTransform const&) = imac 0x2404a0, m1 0x1e7d84, ios 0x413514;
2626
static cocos2d::CCAffineTransform CCAffineTransformMakeIdentity() = imac 0x240070, m1 0x1e7a04, ios 0x41329c;
2727
static cocos2d::CCAffineTransform CCAffineTransformRotate(cocos2d::CCAffineTransform const&, float) = imac 0x240380, m1 0x1e7c7c, ios 0x413478;
2828
static cocos2d::CCAffineTransform CCAffineTransformScale(cocos2d::CCAffineTransform const&, float, float) = imac 0x240360, m1 0x1e7c5c, ios inline;
2929
static cocos2d::CCAffineTransform CCAffineTransformTranslate(cocos2d::CCAffineTransform const&, float, float) = imac 0x240320, m1 0x1e7c30, ios 0x41344c;
30-
static cocos2d::CCPoint ccCardinalSplineAt(cocos2d::CCPoint&, cocos2d::CCPoint&, cocos2d::CCPoint&, cocos2d::CCPoint&, float, float);
31-
static void ccDrawCardinalSpline(cocos2d::CCPointArray*, float, unsigned int);
32-
static void ccDrawCatmullRom(cocos2d::CCPointArray*, unsigned int);
30+
static cocos2d::CCPoint ccCardinalSplineAt(cocos2d::CCPoint&, cocos2d::CCPoint&, cocos2d::CCPoint&, cocos2d::CCPoint&, float, float) = m1 0x26ca20, imac 0x2d1750;
31+
static void ccDrawCardinalSpline(cocos2d::CCPointArray*, float, unsigned int) = m1 0x1b57a8, imac 0x209810;
32+
static void ccDrawCatmullRom(cocos2d::CCPointArray*, unsigned int) = m1 0x1b57a0, imac 0x2097f0;
3333
static void ccDrawCircle(cocos2d::CCPoint const&, float, float, unsigned int, bool) = imac 0x208dc0, m1 0x1b4f7c, ios 0x24c6fc;
34-
static void ccDrawCircle(cocos2d::CCPoint const&, float, float, unsigned int, bool, float, float) = imac 0x208970, m1 0x1b4c1c;
35-
static void ccDrawCircleSegment(cocos2d::CCPoint const&, float, float, float, unsigned int, bool, float, float);
34+
static void ccDrawCircle(cocos2d::CCPoint const&, float, float, unsigned int, bool, float, float) = imac 0x208970, m1 0x1b4c1c, ios 0x24c56c;
35+
static void ccDrawCircleSegment(cocos2d::CCPoint const&, float, float, float, unsigned int, bool, float, float) = m1 0x1b4f88, imac 0x208de0, ios 0x24c708;
3636
static void ccDrawColor4B(unsigned char, unsigned char, unsigned char, unsigned char) = imac 0x209d90, m1 0x1b5c20, ios 0x24c9f0;
37-
static void ccDrawColor4F(float, float, float, float);
38-
static void ccDrawCubicBezier(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, unsigned int);
37+
static void ccDrawColor4F(float, float, float, float) = m1 0x1b5bdc, imac 0x209d30;
38+
static void ccDrawCubicBezier(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, unsigned int) = m1 0x1b59cc, imac 0x209ab0;
3939
static void ccDrawFilledCircle(cocos2d::CCPoint const&, float, float, unsigned int) = imac 0x209230, m1 0x1b52e8, ios 0x24c894;
40-
static void ccDrawFree();
41-
static void ccDrawInit();
40+
static void ccDrawFree() = m1 0x1b438c, imac 0x208140, ios 0x24c224;
41+
static void ccDrawInit() = m1 0x1b4308, imac 0x2080c0, ios 0x24c1a4;
4242
static void ccDrawLine(cocos2d::CCPoint const&, cocos2d::CCPoint const&) = imac 0x2084a0, m1 0x1b4708, ios 0x24c314;
4343
static void ccDrawLines(cocos2d::CCPoint const*, unsigned int) = imac 0x208390, m1 0x1b45f4, ios 0x24c258;
44-
static void ccDrawPoint(cocos2d::CCPoint const&);
45-
static void ccDrawPoints(cocos2d::CCPoint const*, unsigned int);
46-
static void ccDrawPoly(cocos2d::CCPoint const*, unsigned int, bool);
47-
static void ccDrawQuadBezier(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, unsigned int);
44+
static void ccDrawPoint(cocos2d::CCPoint const&) = m1 0x1b43c0, imac 0x208170;
45+
static void ccDrawPoints(cocos2d::CCPoint const*, unsigned int) = m1 0x1b44e0, imac 0x208280;
46+
static void ccDrawPoly(cocos2d::CCPoint const*, unsigned int, bool) = m1 0x1b4b04, imac 0x208870;
47+
static void ccDrawQuadBezier(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, unsigned int) = m1 0x1b55f4, imac 0x209600;
4848
static void ccDrawRect(cocos2d::CCPoint, cocos2d::CCPoint) = imac 0x2085d0, m1 0x1b4850, ios 0x24c3f4;
4949
static void ccDrawSolidPoly(cocos2d::CCPoint const*, unsigned int, cocos2d::ccColor4F) = imac 0x208770, m1 0x1b49ec, ios 0x24c4bc;
5050
static void ccDrawSolidRect(cocos2d::CCPoint origin, cocos2d::CCPoint destination, cocos2d::ccColor4F color) = imac 0x2086c0, m1 0x1b4918, ios inline;
5151
static void ccGLBindTexture2D(unsigned int) = imac 0x35b760, m1 0x2e6d0c, ios 0x18e82c;
5252
static void ccGLBindTexture2DN(unsigned int, unsigned int) = imac 0x35b7a0, m1 0x2e6d50, ios 0x18e838;
53-
static void ccGLBindVAO(unsigned int);
53+
static void ccGLBindVAO(unsigned int) = m1 0x2e6e38, imac 0x35b860, ios 0x18e8c4;
5454
static void ccGLBlendFunc(unsigned int, unsigned int) = imac 0x35b6b0, m1 0x2e6c54, ios 0x18e7b4;
5555
static void ccGLBlendResetToCache() = imac 0x35b710, m1 0x2e6cb8, ios inline;
56-
static void ccGLDeleteProgram(unsigned int);
56+
static void ccGLDeleteProgram(unsigned int) = m1 0x2e6c1c, imac 0x35b670, ios 0x18e77c;
5757
static void ccGLDeleteTexture(unsigned int) = imac 0x35b7e0, m1 0x2e6da8, ios 0x18e884;
5858
static void ccGLDeleteTextureN(unsigned int, unsigned int) = imac 0x35b820, m1 0x2e6de8, ios inline;
5959
static void ccGLEnable(cocos2d::ccGLServerState) = imac 0x35b880, m1 0x2e6e54, ios 0x18e8e0;
6060
static void ccGLEnableVertexAttribs(unsigned int) = imac 0x35b890, m1 0x2e6e58, ios 0x18e8e4;
61-
static void ccGLInvalidateStateCache();
61+
static void ccGLInvalidateStateCache() = m1 0x2e6bc8, imac 0x35b600, ios 0x18e718;
6262
static void ccGLUseProgram(unsigned int) = imac 0x35b690, m1 0x2e6c38, ios 0x18e798;
63-
static void CCLog(char const*);
64-
static void CCLuaLog(char const*);
65-
static void CCMessageBox(char const*, char const*);
66-
static float ccpAngle(cocos2d::CCPoint const&, cocos2d::CCPoint const&);
67-
static float ccpAngleSigned(cocos2d::CCPoint const&, cocos2d::CCPoint const&);
68-
static cocos2d::CCPoint ccpClamp(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&);
69-
static cocos2d::CCPoint ccpCompMult(cocos2d::CCPoint const&, cocos2d::CCPoint const&);
63+
// static void CCLog(char const*, ...);
64+
static void CCLuaLog(char const*) = m1 0x13c148, imac 0x175b40;
65+
static void CCMessageBox(char const*, char const*) = m1 0x13c14c, imac 0x175b50;
66+
static float ccpAngle(cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e2948, imac 0x3566f0, ios inline;
67+
static float ccpAngleSigned(cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e2688, imac 0x3563b0, ios inline;
68+
static cocos2d::CCPoint ccpClamp(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e25c0, imac 0x356280, ios 0x1aea30;
69+
static cocos2d::CCPoint ccpCompMult(cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e2670, imac 0x356380, ios inline;
7070
static float ccpDistance(cocos2d::CCPoint const&, cocos2d::CCPoint const&) = imac 0x356100, m1 0x2e24a8, ios 0x1ae920;
71-
static cocos2d::CCPoint ccpForAngle(float);
71+
static cocos2d::CCPoint ccpForAngle(float) = m1 0x2e2504, imac 0x356190, ios 0x1ae97c;
7272
static cocos2d::CCPoint ccpFromSize(cocos2d::CCSize const& size) = imac 0x356300, m1 0x2e260c, ios inline;
73-
static bool ccpFuzzyEqual(cocos2d::CCPoint const&, cocos2d::CCPoint const&, float);
74-
static cocos2d::CCPoint ccpIntersectPoint(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&);
75-
static float ccpLength(cocos2d::CCPoint const&);
73+
static bool ccpFuzzyEqual(cocos2d::CCPoint const&, cocos2d::CCPoint const&, float) = m1 0x2e266c, imac 0x356370, ios inline;
74+
static cocos2d::CCPoint ccpIntersectPoint(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e2840, imac 0x3565d0, ios 0x1aeb4c;
75+
static float ccpLength(cocos2d::CCPoint const&) = m1 0x2e2494, imac 0x3560e0, ios 0x1ae90c;
7676
static cocos2d::CCPoint ccpLerp(cocos2d::CCPoint const&, cocos2d::CCPoint const&, float) = imac 0x3561e0, m1 0x2e253c, ios 0x1ae9ac;
7777
static bool ccpLineIntersect(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, float*, float*) = imac 0x3564e0, m1 0x2e276c, ios 0x1aea80;
7878
static cocos2d::CCPoint ccpNormalize(cocos2d::CCPoint const&) = imac 0x356140, m1 0x2e24d8, ios 0x1ae950;
7979
static cocos2d::CCPoint CCPointFromString(char const*) = imac 0x5675e0, m1 0x4b5f48, ios 0x1a6808;
80-
static void ccPointSize(float);
80+
static void ccPointSize(float) = m1 0x1b5bf0, imac 0x209d60;
8181
static void CCProfilingBeginTimingBlock(char const*) = m1 0x446b54, imac 0x4ec650;
8282
static void CCProfilingEndTimingBlock(char const*) = m1 0x446cd8, imac 0x4ec7e0;
8383
static void CCProfilingResetTimingBlock(char const*) = m1 0x446e9c, imac 0x4ec9b0;
84-
static cocos2d::CCPoint ccpRotateByAngle(cocos2d::CCPoint const&, cocos2d::CCPoint const&, float);
85-
static bool ccpSegmentIntersect(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&);
84+
static cocos2d::CCPoint ccpRotateByAngle(cocos2d::CCPoint const&, cocos2d::CCPoint const&, float) = m1 0x2e268c, imac 0x3563c0, ios 0x1aea7c;
85+
static bool ccpSegmentIntersect(cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&, cocos2d::CCPoint const&) = m1 0x2e2690, imac 0x3563e0, ios inline;
8686
static float ccpToAngle(cocos2d::CCPoint const& point) = imac 0x3561c0, m1 0x2e2534, ios inline;
8787
static cocos2d::CCRect CCRectApplyAffineTransform(cocos2d::CCRect const&, cocos2d::CCAffineTransform const&) = imac 0x240090, m1 0x1e7a18, ios 0x4132b0;
8888
static cocos2d::CCRect CCRectFromString(char const*) = imac 0x5668a0, m1 0x4b5358, ios 0x1a6168;
89-
static void ccSetProjectionMatrixDirty();
89+
static void ccSetProjectionMatrixDirty() = m1 0x2e6f6c, imac 0x35b950, ios 0x18e9ac;
9090
static cocos2d::CCSize CCSizeFromString(char const*) = imac 0x5676e0, m1 0x4b6074, ios 0x1a68dc;
91-
static bool ccVertexLineIntersect(float, float, float, float, float, float, float, float, float*);
92-
static void ccVertexLineToPolygon(cocos2d::CCPoint*, float, cocos2d::ccVertex2F*, unsigned int, unsigned int);
91+
static bool ccVertexLineIntersect(float, float, float, float, float, float, float, float, float*) = m1 0x32d7bc, imac 0x3a95f0, ios 0x3ff28c;
92+
static void ccVertexLineToPolygon(cocos2d::CCPoint*, float, cocos2d::ccVertex2F*, unsigned int, unsigned int) = m1 0x32d468, imac 0x3a9110, ios 0x3fefa8;
9393
static float clampf(float, float, float) = imac 0x356250, m1 0x2e25a0, ios 0x1aea10;
9494
static char const* cocos2dVersion() = imac 0x355670, m1 0x2e1c3c, ios 0x7c16c;
9595
static cocos2d::CCBMFontConfiguration* FNTConfigLoadFile(char const*) = imac 0x5d4c40, m1 0x500b70, ios 0x2f8d54;
9696
static void FNTConfigRemoveCache() = ios 0x2f8ee4;
97-
static bool isspace_unicode(unsigned short);
97+
static bool isspace_unicode(unsigned short) = m1 0x57fe74, imac 0x65fff0, ios 0x1ad088;
9898
// static cocos2d::CCPoint ccpCompOp(cocos2d::CCPoint const&, float (float)*);
9999
}
100100

bindings/2.2081/inline/cocos2d.cpp

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#include <Geode/Bindings.hpp>
22

3+
#if defined(GEODE_IS_MACOS) || defined(GEODE_IS_IOS)
4+
cocos2d::CCPoint ccpCompOp(cocos2d::CCPoint const& p, float (*opFunc)(float)) {
5+
return ccp(opFunc(p.x), opFunc(p.y));
6+
}
7+
#endif
38

49
#if defined(GEODE_IS_WINDOWS) || defined(GEODE_IS_IOS)
510
#endif
@@ -57,5 +62,28 @@ cocos2d::CCPoint cocos2d::ccpFromSize(cocos2d::CCSize const& size) {
5762
float cocos2d::ccpToAngle(cocos2d::CCPoint const& point) {
5863
return point.getAngle();
5964
}
65+
66+
bool cocos2d::ccpFuzzyEqual(cocos2d::CCPoint const& a, cocos2d::CCPoint const& b, float var) {
67+
return a.fuzzyEquals(b, var);
68+
}
69+
70+
cocos2d::CCPoint cocos2d::ccpCompMult(cocos2d::CCPoint const& a, cocos2d::CCPoint const& b) {
71+
return ccp(a.x * b.x, a.y * b.y);
72+
}
73+
74+
float cocos2d::ccpAngleSigned(cocos2d::CCPoint const& a, cocos2d::CCPoint const& b) {
75+
return a.getAngle(b);
76+
}
77+
78+
bool cocos2d::ccpSegmentIntersect(cocos2d::CCPoint const& a, cocos2d::CCPoint const& b, cocos2d::CCPoint const& c, cocos2d::CCPoint const& d) {
79+
float s;
80+
float t;
81+
return ccpLineIntersect(a, b, c, d, &s, &t) && (s >= 0.0f && s <= 1.0f && t >= 0.0f && t <= 1.0f);
82+
}
83+
84+
float cocos2d::ccpAngle(cocos2d::CCPoint const& a, cocos2d::CCPoint const& b) {
85+
auto angle = acosf(ccpDot(ccpNormalize(a), ccpNormalize(b)));
86+
return fabs(angle) < FLT_EPSILON ? 0.f : angle;
87+
}
6088
#endif
6189

0 commit comments

Comments
 (0)