Added Rich Text to SimpleTextArea!!!! #1654
+924
−199
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #pragma once | ||
|
|
||
| #include <cocos2d.h> | ||
|
|
||
| class CCWaveAction : public cocos2d::CCActionInterval | ||
| { | ||
| public: | ||
| static CCWaveAction* create(float period, float distX, float distY, float phase); | ||
|
|
||
| bool init(float period, float distX, float distY, float phase); | ||
|
|
||
| void startWithTarget(cocos2d::CCNode* target) override; | ||
|
|
||
| void update(float t) override; | ||
|
|
||
| cocos2d::CCActionInterval* reverse() override; | ||
|
|
||
| private: | ||
| float m_distX; | ||
| float m_distY; | ||
| float m_phase; | ||
| float m_baseX; | ||
| float m_baseY; | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| #pragma once | ||
|
|
||
| #include <Geode/ui/TextArea.hpp> | ||
| #include <memory> | ||
|
|
||
| namespace geode { | ||
|
|
||
| // abb2k wuz here :) | ||
|
|
||
| template <class T> | ||
| class RichTextKey; | ||
|
|
||
| class RichTextKeyInstanceBase { | ||
| public: | ||
| virtual ~RichTextKeyInstanceBase() = default; | ||
| virtual void applyChangesToSprite(cocos2d::CCFontSprite* spr, int index) = 0; | ||
| virtual std::string getKey() const = 0; | ||
| virtual bool isCancellation() const = 0; | ||
| virtual std::string runStrAddition() = 0; | ||
| virtual bool isButton() const = 0; | ||
| virtual void callButton(bool keyDown, cocos2d::CCFontSprite* spr, std::set<cocos2d::CCFontSprite*> const& word) = 0; | ||
| }; | ||
|
|
||
| template <class T> | ||
| class RichTextKeyInstance final : public RichTextKeyInstanceBase { | ||
| public: | ||
| RichTextKeyInstance(RichTextKey<T>* key, T data, bool cancellation) | ||
| : m_key(std::move(key)), m_value(std::move(data)), m_cancellation(std::move(cancellation)) {} | ||
|
|
||
| RichTextKey<T>* m_key = nullptr; | ||
| T m_value; | ||
| bool m_cancellation = false; | ||
|
|
||
| void applyChangesToSprite(cocos2d::CCFontSprite* spr, int index) override; | ||
|
|
||
| std::string getKey() const override { | ||
| return m_key->getKey(); | ||
| } | ||
|
|
||
| bool isCancellation() const override { | ||
| return m_cancellation; | ||
| } | ||
|
|
||
| std::string runStrAddition() override; | ||
|
|
||
| bool isButton() const override { | ||
| return m_key->m_buttonFunctionallity != NULL; | ||
| } | ||
|
|
||
| void callButton(bool keyDown, cocos2d::CCFontSprite* spr, std::set<cocos2d::CCFontSprite*> const& word){ | ||
| if (m_key->m_buttonFunctionallity != NULL) | ||
| m_key->m_buttonFunctionallity(m_value, keyDown, spr, word); | ||
| } | ||
| }; | ||
|
|
||
| class RichTextKeyBase { | ||
| public: | ||
| virtual ~RichTextKeyBase() = default; | ||
| virtual Result<std::shared_ptr<RichTextKeyInstanceBase>> createInstance(std::string const& value, bool cancellation) = 0; | ||
| virtual std::string getKey() const = 0; | ||
| }; | ||
|
|
||
| template <class T> | ||
| class RichTextKey final : public RichTextKeyBase { | ||
| public: | ||
| /** | ||
| @param key The identifier name for this rich text key | ||
| @param validCheck Function to validate and parse the value string into type T (if an error is returned the key will not be processed) | ||
| @param applyToSprite Function to apply the parsed value to a font sprite (optional) | ||
| */ | ||
| RichTextKey( | ||
| std::string key, | ||
| geode::Function<Result<T>(std::string const& value)> validCheck, | ||
| geode::Function<void( | ||
| T const& value, | ||
| bool keyDown, | ||
| cocos2d::CCFontSprite* specificSpriteClicked, | ||
| std::set<cocos2d::CCFontSprite*> const& wordClicked)> buttonFunctionallity | ||
| ) : m_key(std::move(key)), | ||
| m_validCheck(std::move(validCheck)), | ||
| m_buttonFunctionallity(std::move(buttonFunctionallity)) {} | ||
| /** | ||
| @param key The identifier name for this rich text key | ||
| @param validCheck Function to validate and parse the value string into type T (if an error is returned the key will not be processed) | ||
| @param applyToSprite Function to apply the parsed value to a font sprite (optional) | ||
| */ | ||
| RichTextKey( | ||
| std::string key, | ||
| geode::Function<Result<T>(std::string const& value)> validCheck, | ||
| geode::Function<void(T const& value, cocos2d::CCFontSprite* sprite, int charIndex)> applyToSprite | ||
| ) : m_key(std::move(key)), | ||
| m_validCheck(std::move(validCheck)), | ||
| m_applyToSprite(std::move(applyToSprite)) {} | ||
| /** | ||
| @param key The identifier name for this rich text key | ||
| @param validCheck Function to validate and parse the value string into type T (if an error is returned the key will not be processed) | ||
| @param stringAddition Function to add a new string at the point where the key is (optional) | ||
| */ | ||
| RichTextKey( | ||
| std::string key, | ||
| geode::Function<Result<T>(std::string const& value)> validCheck, | ||
| geode::Function<std::string(T const& value)> stringAddition | ||
| ) : m_key(std::move(key)), | ||
| m_validCheck(std::move(validCheck)), | ||
| m_stringAddition(std::move(stringAddition)) {} | ||
| /** | ||
| @param key The identifier name for this rich text key | ||
| @param validCheck Function to validate and parse the value string into type T (if an error is returned the key will not be processed) | ||
| @param applyToSprite Function to apply the parsed value to a font sprite (optional) | ||
| @param stringAddition Function to add a new string at the point where the key is (optional) | ||
| */ | ||
| RichTextKey( | ||
| std::string key, | ||
| geode::Function<Result<T>(std::string const& value)> validCheck, | ||
| geode::Function<void(T const& value, cocos2d::CCFontSprite* sprite, int charIndex)> applyToSprite, | ||
| geode::Function<std::string(T const& value)> stringAddition | ||
| ) : m_key(std::move(key)), | ||
| m_validCheck(std::move(validCheck)), | ||
| m_applyToSprite(std::move(applyToSprite)), | ||
| m_stringAddition(std::move(stringAddition)) {} | ||
|
|
||
| Result<std::shared_ptr<RichTextKeyInstanceBase>> createInstance(std::string const& value, bool cancellation) override; | ||
|
|
||
| std::string getKey() const override { | ||
| return m_key; | ||
| } | ||
|
|
||
| private: | ||
| std::string m_key; | ||
|
|
||
| public: | ||
| geode::Function<Result<T>(std::string const& value)> m_validCheck = NULL; | ||
| geode::Function<void(T const& value, cocos2d::CCFontSprite* sprite, int charIndex)> m_applyToSprite = NULL; | ||
| geode::Function<std::string(T const& value)> m_stringAddition = NULL; | ||
| geode::Function<void( | ||
| T const& value, | ||
| bool keyDown, | ||
| cocos2d::CCFontSprite* specificSpriteClicked, | ||
| std::set<cocos2d::CCFontSprite*> const& wordClicked)> m_buttonFunctionallity = NULL; | ||
| }; | ||
|
|
||
|
|
||
| class GEODE_DLL RichTextArea : public SimpleTextArea, public cocos2d::CCTouchDelegate { | ||
| public: | ||
| static RichTextArea* create(std::string text, std::string font = "chatFont.fnt", float scale = 1.0f); | ||
| static RichTextArea* create(std::string text, std::string font, float scale, float width); | ||
|
|
||
| void setText(std::string text) override; | ||
|
|
||
| template<class T> | ||
| void registerRichTextKey(std::shared_ptr<RichTextKey<T>> key); | ||
| protected: | ||
| RichTextArea(); | ||
| ~RichTextArea(); | ||
abb2k marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| class RichImpl; | ||
| std::unique_ptr<SimpleTextAreaImpl> createImpl() override; | ||
|
Member
There was a problem hiding this comment. is this really needed instead of just exposing protected methods to simpletextarea for richtextarea to use |
||
|
|
||
| private: | ||
| static RichTextArea* create(std::string font, std::string text, float scale, float width, const bool artificialWidth); | ||
|
|
||
| bool init(std::string font, std::string text, float scale, float width, const bool artificialWidth); | ||
|
|
||
| bool ccTouchBegan(cocos2d::CCTouch *pTouch, cocos2d::CCEvent *pEvent) override; | ||
|
|
||
| void ccTouchEnded(cocos2d::CCTouch *pTouch, cocos2d::CCEvent *pEvent) override; | ||
| void ccTouchCancelled(cocos2d::CCTouch *pTouch, cocos2d::CCEvent *pEvent) override; | ||
|
|
||
| RichImpl* castedImpl(); | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| #include <Geode/cocos/actions/CCWaveAction.h> | ||
|
|
||
| CCWaveAction* CCWaveAction::create(float period, float distX, float distY, float phase) | ||
| { | ||
| auto ret = new CCWaveAction(); | ||
| if (ret && ret->init(period, distX, distY, phase)) | ||
| { | ||
| ret->autorelease(); | ||
| return ret; | ||
| } | ||
|
|
||
| CC_SAFE_DELETE(ret); | ||
| return nullptr; | ||
| } | ||
|
|
||
| bool CCWaveAction::init(float period, float distX, float distY, float phase) | ||
| { | ||
| if (!cocos2d::CCActionInterval::initWithDuration(period)) | ||
| return false; | ||
|
|
||
| m_distX = distX; | ||
| m_distY = distY; | ||
| m_phase = phase; | ||
| m_baseX = NAN; | ||
| m_baseY = NAN; | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void CCWaveAction::startWithTarget(cocos2d::CCNode* target) | ||
| { | ||
| cocos2d::CCActionInterval::startWithTarget(target); | ||
|
|
||
| if (!std::isnan(m_baseX)) return; | ||
|
|
||
| m_baseX = target->getPositionX(); | ||
| m_baseY = target->getPositionY(); | ||
| } | ||
|
|
||
| void CCWaveAction::update(float t) | ||
| { | ||
| float angle = (t * 2.f * M_PI) + m_phase; | ||
|
|
||
| float x = m_baseX + cosf(angle) * m_distX; | ||
| float y = m_baseY + sinf(angle) * m_distY; | ||
|
|
||
| m_pTarget->setPosition(x, y); | ||
| } | ||
|
|
||
| cocos2d::CCActionInterval* CCWaveAction::reverse() | ||
| { | ||
| return CCWaveAction::create(m_fDuration, m_distX, m_distY, -m_phase); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what is this and why is this