Remove unused Messages
diff --git a/include/rive/artboard.hpp b/include/rive/artboard.hpp index 17daac9..68effa7 100644 --- a/include/rive/artboard.hpp +++ b/include/rive/artboard.hpp
@@ -6,7 +6,6 @@ #include "rive/core_context.hpp" #include "rive/generated/artboard_base.hpp" #include "rive/hit_info.hpp" -#include "rive/message.hpp" #include "rive/math/aabb.hpp" #include "rive/renderer.hpp" #include "rive/shapes/shape_paint_container.hpp" @@ -48,8 +47,6 @@ bool m_IsInstance = false; bool m_FrameOrigin = true; - std::queue<Message> m_MessageQueue; - void sortDependencies(); void sortDrawOrder(); @@ -64,8 +61,6 @@ void addStateMachine(StateMachine* object); void addNestedArtboard(NestedArtboard* object); - void testing_only_enque_message(const Message&); - public: Artboard() {} ~Artboard(); @@ -93,19 +88,6 @@ bool advance(double elapsedSeconds); - // Returns true iff calling popMessage() will return true. - bool hasMessages() const; - - // If there are any queued messages... - // copies the first message into msg parameter - // removes that message from the queue - // returns true - // else - // ignores msg parameter - // returns false - // - bool nextMessage(Message* msg); - enum class DrawOption { kNormal, kHideBG,
diff --git a/include/rive/message.hpp b/include/rive/message.hpp deleted file mode 100644 index 5fda832..0000000 --- a/include/rive/message.hpp +++ /dev/null
@@ -1,19 +0,0 @@ -#ifndef _RIVE_MESSAGE_HPP_ -#define _RIVE_MESSAGE_HPP_ - -#include "rive/math/vec2d.hpp" -#include <string> - -namespace rive { - -struct Message { - // TODO -- how to represent this? - // Perhaps some sort of JSON-like object: key-value pairs? - // For now, store a string so we can test it... - - std::string m_Str; -}; - -} // namespace rive - -#endif
diff --git a/skia/viewer/src/main.cpp b/skia/viewer/src/main.cpp index 0d5640b..e41850e 100644 --- a/skia/viewer/src/main.cpp +++ b/skia/viewer/src/main.cpp
@@ -156,20 +156,6 @@ initAnimation(0); } -static void test_messages(rive::Artboard* artboard) { - rive::Message msg; - int i = 0; -#ifdef DEBUG - bool hasAny = artboard->hasMessages(); -#endif - - while (artboard->nextMessage(&msg)) { - printf("-- message[%d]: '%s'\n", i, msg.m_Str.c_str()); - i += 1; - } - assert((hasAny && i > 0) || (!hasAny && i == 0)); -} - int main() { if (!glfwInit()) { fprintf(stderr, "Failed to initialize glfw.\n"); @@ -372,7 +358,6 @@ ImGui::Columns(1); } ImGui::End(); - test_messages(artboardInstance.get()); } else { ImGui::Text("Drop a .riv file to preview.");
diff --git a/src/artboard.cpp b/src/artboard.cpp index 85302b9..b11e996 100644 --- a/src/artboard.cpp +++ b/src/artboard.cpp
@@ -576,20 +576,6 @@ return result; } -void Artboard::testing_only_enque_message(const Message& msg) { m_MessageQueue.push(msg); } - -bool Artboard::hasMessages() const { return !m_MessageQueue.empty(); } - -bool Artboard::nextMessage(Message* msg) { - if (m_MessageQueue.empty()) { - return false; - } else { - *msg = m_MessageQueue.front(); - m_MessageQueue.pop(); - return true; - } -} - ////////// ArtboardInstance #include "rive/animation/linear_animation_instance.hpp"