CCTexture2D::initWithString and update packages

Author: hiimjasmine00

bindings/2.2081/Cocos2d.bro

@@ -1934,7 +1934,7 @@ class cocos2d::CCLabelTTF : cocos2d::CCSprite, cocos2d::CCLabelProtocol {
     virtual void setString(char const*) = imac 0x3bdb30, m1 0x33f980, ios 0x6e990;
     virtual char const* getString() = imac 0x3bdd60, m1 0x33fb7c, ios 0x6eae8;
 
-    cocos2d::ccFontDefinition _prepareTextDefinition(bool) = imac 0x3be2a0, m1 0x33fff0, ios inline;
+    cocos2d::ccFontDefinition _prepareTextDefinition(bool) = imac 0x3be2a0, m1 0x33fff0, ios 0x6eb20;
     void _updateWithTextDefinition(cocos2d::ccFontDefinition&, bool) = imac 0x3bda60, m1 0x33f8c8, ios inline;
     char const* description() = imac 0x3bddb0, m1 0x33fbb4, ios inline;
     void disableShadow(bool) = imac 0x3be0f0, m1 0x33fe50, ios inline;
@@ -4348,9 +4348,9 @@ class cocos2d::CCTexture2D : cocos2d::CCObject {
     bool initWithETCFile(char const*) = imac 0x4793c0, m1 0x3e01ac;
     bool initWithImage(cocos2d::CCImage*) = imac 0x478620, m1 0x3df40c, ios 0x12d7fc;
     bool initWithPVRFile(char const*) = imac 0x4792e0, m1 0x3e00d8;
-    bool initWithString(char const*, cocos2d::ccFontDefinition*);
-    bool initWithString(char const*, char const*, float) = imac 0x478f30, m1 0x3dfd08;
-    bool initWithString(char const*, char const*, float, cocos2d::CCSize const&, cocos2d::CCTextAlignment, cocos2d::CCVerticalTextAlignment) = imac 0x478f90, m1 0x3dfd78;
+    bool initWithString(char const*, cocos2d::ccFontDefinition*) = m1 0x3dfec4, imac 0x4790d0, ios 0x12db2c;
+    bool initWithString(char const*, char const*, float) = imac 0x478f30, m1 0x3dfd08, ios inline;
+    bool initWithString(char const*, char const*, float, cocos2d::CCSize const&, cocos2d::CCTextAlignment, cocos2d::CCVerticalTextAlignment) = imac 0x478f90, m1 0x3dfd78, ios inline;
     void* keepData(void*, unsigned int);
     void releaseData(void*);
     void releaseGLTexture() = imac 0x478260, m1 0x3df084;

bindings/2.2081/inline/CCLabelTTF.cpp

@@ -48,36 +48,6 @@ cocos2d::CCLabelTTF* cocos2d::CCLabelTTF::createWithFontDefinition(char const* p
     return nullptr;
 }
 
-cocos2d::ccFontDefinition cocos2d::CCLabelTTF::_prepareTextDefinition(bool p0) {
-    auto factor = CCDirector::sharedDirector()->getContentScaleFactor();
-
-    ccFontDefinition texDef;
-    texDef.m_fontSize = p0 ? m_fFontSize * factor : m_fFontSize;
-    texDef.m_fontName = *m_pFontName;
-    texDef.m_alignment = m_hAlignment;
-    texDef.m_vertAlignment = m_vAlignment;
-    texDef.m_dimensions = p0 ? CCSize { m_tDimensions.width * factor, m_tDimensions.height * factor } : m_tDimensions;
-    
-    if (m_strokeEnabled) {
-        texDef.m_stroke.m_strokeEnabled = true;
-        texDef.m_stroke.m_strokeColor = m_strokeColor;
-        texDef.m_stroke.m_strokeSize = p0 ? m_strokeSize * factor : m_strokeSize;
-    }
-    else texDef.m_stroke.m_strokeEnabled = false;
-
-    if (m_shadowEnabled) {
-        texDef.m_shadow.m_shadowEnabled = true;
-        texDef.m_shadow.m_shadowBlur = m_shadowBlur;
-        texDef.m_shadow.m_shadowOpacity = m_shadowOpacity;
-        texDef.m_shadow.m_shadowOffset = p0 ? CCSize { m_shadowOffset.width * factor, m_shadowOffset.height * factor } : m_shadowOffset;
-    }
-    else texDef.m_shadow.m_shadowEnabled = false;
-
-    texDef.m_fontFillColor = m_textFillColor;
-
-    return texDef;
-}
-
 void cocos2d::CCLabelTTF::_updateWithTextDefinition(cocos2d::ccFontDefinition& p0, bool p1) {
     m_tDimensions = p0.m_dimensions;
     m_hAlignment = p0.m_alignment;

bindings/2.2081/inline/CCTexture2D.cpp

@@ -33,5 +33,22 @@ unsigned int cocos2d::CCTexture2D::bitsPerPixelForFormat(cocos2d::CCTexture2DPix
             return -1;
     }
 }
+
+bool cocos2d::CCTexture2D::initWithString(char const* text, char const* fontName, float fontSize) {
+    return this->initWithString(text, fontName, fontSize, { 0.f, 0.f }, kCCTextAlignmentCenter, kCCVerticalTextAlignmentTop);
+}
+
+bool cocos2d::CCTexture2D::initWithString(char const* text, char const* fontName, float fontSize, cocos2d::CCSize const& dimensions, cocos2d::CCTextAlignment hAlignment, cocos2d::CCVerticalTextAlignment vAlignment) {
+    ccFontDefinition tempDef;
+    tempDef.m_shadow.m_shadowEnabled = false;
+    tempDef.m_stroke.m_strokeEnabled = false;
+    tempDef.m_fontName = std::string(fontName);
+    tempDef.m_fontSize = fontSize;
+    tempDef.m_dimensions = dimensions;
+    tempDef.m_alignment = hAlignment;
+    tempDef.m_vertAlignment = vAlignment;
+    tempDef.m_fontFillColor = { 255, 255, 255 };
+    return this->initWithString(text, &tempDef);
+}
 #endif
 

test/members/CMakeLists.txt

@@ -13,11 +13,12 @@ include(../../cmake/CPM.cmake)
 
 set(MAT_JSON_AS_INTERFACE ON)
 CPMAddPackage("gh:fmtlib/fmt#12.1.0")
-CPMAddPackage("gh:geode-sdk/result@1.3.3")
+CPMAddPackage("gh:geode-sdk/result@1.4.0")
 CPMAddPackage("gh:geode-sdk/json@3.2.3")
-CPMAddPackage("gh:geode-sdk/TulipHook@2.4.4")
+CPMAddPackage("gh:geode-sdk/TulipHook@3.1.7")
 CPMAddPackage("gh:zhihaoy/nontype_functional#8ec2e09")
-CPMAddPackage("gh:dankmeme01/arc#dcbd12e")
+set (ARC_FEATURE_FULL OFF CACHE BOOL "" FORCE)
+CPMAddPackage("gh:dankmeme01/arc@1.3.0")
 
 if (WIN32)
 	target_compile_definitions(fmt PRIVATE _HAS_ITERATOR_DEBUGGING=0)