Rename Drawables to Renderers

elnormous · May 23, 2017 · 38a1b20 · 38a1b20
1 parent 7ca54fa
commit 38a1b20
Show file tree

Hide file tree

Showing 16 changed files with 92 additions and 94 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -109,19 +109,19 @@ SOURCES=$(ROOT_DIR)/../ouzel/animators/Animator.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Camera.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Component.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Layer.cpp \
-	$(ROOT_DIR)/../ouzel/scene/MeshDrawable.cpp \
+	$(ROOT_DIR)/../ouzel/scene/MeshRenderer.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Node.cpp \
 	$(ROOT_DIR)/../ouzel/scene/NodeContainer.cpp \
 	$(ROOT_DIR)/../ouzel/scene/ParticleDefinition.cpp \
 	$(ROOT_DIR)/../ouzel/scene/ParticleSystem.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Scene.cpp \
 	$(ROOT_DIR)/../ouzel/scene/SceneManager.cpp \
-	$(ROOT_DIR)/../ouzel/scene/ShapeDrawable.cpp \
+	$(ROOT_DIR)/../ouzel/scene/ShapeRenderer.cpp \
 	$(ROOT_DIR)/../ouzel/scene/SoundListener.cpp \
 	$(ROOT_DIR)/../ouzel/scene/SoundPlayer.cpp \
 	$(ROOT_DIR)/../ouzel/scene/Sprite.cpp \
 	$(ROOT_DIR)/../ouzel/scene/SpriteFrame.cpp \
-	$(ROOT_DIR)/../ouzel/scene/TextDrawable.cpp \
+	$(ROOT_DIR)/../ouzel/scene/TextRenderer.cpp \
 	$(ROOT_DIR)/../ouzel/utils/Log.cpp \
 	$(ROOT_DIR)/../ouzel/utils/OBF.cpp \
 	$(ROOT_DIR)/../ouzel/utils/Utils.cpp

diff --git a/build/jni/Android.mk b/build/jni/Android.mk
@@ -106,19 +106,19 @@ LOCAL_SRC_FILES :=../../ouzel/animators/Animator.cpp \
     ../../ouzel/scene/Camera.cpp \
     ../../ouzel/scene/Component.cpp \
     ../../ouzel/scene/Layer.cpp \
-    ../../ouzel/scene/MeshDrawable.cpp \
+    ../../ouzel/scene/MeshRenderer.cpp \
     ../../ouzel/scene/Node.cpp \
     ../../ouzel/scene/NodeContainer.cpp \
     ../../ouzel/scene/ParticleDefinition.cpp \
     ../../ouzel/scene/ParticleSystem.cpp \
     ../../ouzel/scene/Scene.cpp \
     ../../ouzel/scene/SceneManager.cpp \
-    ../../ouzel/scene/ShapeDrawable.cpp \
+    ../../ouzel/scene/ShapeRenderer.cpp \
     ../../ouzel/scene/SoundListener.cpp \
     ../../ouzel/scene/SoundPlayer.cpp \
     ../../ouzel/scene/Sprite.cpp \
     ../../ouzel/scene/SpriteFrame.cpp \
-    ../../ouzel/scene/TextDrawable.cpp \
+    ../../ouzel/scene/TextRenderer.cpp \
     ../../ouzel/utils/Log.cpp \
     ../../ouzel/utils/OBF.cpp \
     ../../ouzel/utils/Utils.cpp

diff --git a/build/ouzel.xcodeproj/project.pbxproj b/build/ouzel.xcodeproj/project.pbxproj
diff --git a/ouzel/gui/Button.cpp b/ouzel/gui/Button.cpp
@@ -4,13 +4,11 @@
 #include <functional>
 #include "Button.h"
 #include "core/Engine.h"
-#include "scene/Sprite.h"
 #include "events/EventHandler.h"
 #include "events/EventDispatcher.h"
 #include "scene/Layer.h"
 #include "scene/Camera.h"
 #include "Label.h"
-#include "scene/TextDrawable.h"
 
 namespace ouzel
 {
@@ -81,7 +79,7 @@ namespace ouzel
 
             if (!label.empty())
             {
-                labelDrawable.reset(new scene::TextDrawable(font, true, label));
+                labelDrawable.reset(new scene::TextRenderer(font, true, label));
                 labelDrawable->setColor(labelColor);
                 addComponent(labelDrawable.get());
             }

diff --git a/ouzel/gui/Button.h b/ouzel/gui/Button.h
@@ -6,7 +6,7 @@
 #include <functional>
 #include "gui/Widget.h"
 #include "scene/Sprite.h"
-#include "scene/TextDrawable.h"
+#include "scene/TextRenderer.h"
 #include "events/Event.h"
 #include "events/EventHandler.h"
 #include "math/Color.h"
@@ -36,7 +36,7 @@ namespace ouzel
             scene::Sprite* getSelectedSprite() const { return selectedSprite.get(); }
             scene::Sprite* getPressedSprite() const { return pressedSprite.get(); }
             scene::Sprite* getDisabledSprite() const { return disabledSprite.get(); }
-            scene::TextDrawable* getLabelDrawable() const { return labelDrawable.get(); }
+            scene::TextRenderer* getLabelDrawable() const { return labelDrawable.get(); }
 
         protected:
             virtual void setSelected(bool newSelected) override;
@@ -49,7 +49,7 @@ namespace ouzel
             std::unique_ptr<scene::Sprite> selectedSprite;
             std::unique_ptr<scene::Sprite> pressedSprite;
             std::unique_ptr<scene::Sprite> disabledSprite;
-            std::unique_ptr<scene::TextDrawable> labelDrawable;
+            std::unique_ptr<scene::TextRenderer> labelDrawable;
 
             EventHandler eventHandler;
 

diff --git a/ouzel/gui/Label.cpp b/ouzel/gui/Label.cpp
@@ -19,7 +19,7 @@ namespace ouzel
                      Color color,
                      const Vector2& textAnchor):
             text(aText),
-            labelDrawable(std::make_shared<scene::TextDrawable>(fontFile, true, text, color, textAnchor))
+            labelDrawable(std::make_shared<scene::TextRenderer>(fontFile, true, text, color, textAnchor))
         {
             addComponent(labelDrawable.get());
             labelDrawable->setText(text);

diff --git a/ouzel/gui/Label.h b/ouzel/gui/Label.h
@@ -7,7 +7,7 @@
 #include <string>
 #include "gui/Widget.h"
 #include "math/Color.h"
-#include "scene/TextDrawable.h"
+#include "scene/TextRenderer.h"
 
 namespace ouzel
 {
@@ -24,11 +24,11 @@ namespace ouzel
             virtual void setText(const std::string& newText);
             virtual const std::string& getText() const { return text; }
 
-            const std::shared_ptr<scene::TextDrawable>& getLabelDrawable() { return labelDrawable; }
+            const std::shared_ptr<scene::TextRenderer>& getLabelDrawable() { return labelDrawable; }
 
         protected:
             std::string text;
-            std::shared_ptr<scene::TextDrawable> labelDrawable;
+            std::shared_ptr<scene::TextRenderer> labelDrawable;
         };
     } // namespace gui
 } // namespace ouzel
diff --git a/ouzel/ouzel.h b/ouzel/ouzel.h
@@ -71,16 +71,16 @@
 #include "scene/Camera.h"
 #include "scene/Component.h"
 #include "scene/Layer.h"
-#include "scene/MeshDrawable.h"
+#include "scene/MeshRenderer.h"
 #include "scene/Node.h"
 #include "scene/ParticleSystem.h"
 #include "scene/Scene.h"
 #include "scene/SceneManager.h"
-#include "scene/ShapeDrawable.h"
+#include "scene/ShapeRenderer.h"
 #include "scene/SoundListener.h"
 #include "scene/SoundPlayer.h"
 #include "scene/Sprite.h"
-#include "scene/TextDrawable.h"
+#include "scene/TextRenderer.h"
 #include "utils/Log.h"
 #include "utils/OBF.h"
 #include "utils/Utils.h"
diff --git a/ouzel/scene/MeshDrawable.cpp → ouzel/scene/MeshRenderer.cpp b/ouzel/scene/MeshDrawable.cpp → ouzel/scene/MeshRenderer.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Elviss Strazdins
 // This file is part of the Ouzel engine.
 
-#include "MeshDrawable.h"
+#include "MeshRenderer.h"
 
 namespace ouzel
 {

diff --git a/ouzel/scene/MeshDrawable.h → ouzel/scene/MeshRenderer.h b/ouzel/scene/MeshDrawable.h → ouzel/scene/MeshRenderer.h
@@ -9,7 +9,7 @@ namespace ouzel
 {
     namespace scene
     {
-        class MeshDrawable: public Component
+        class MeshRenderer: public Component
         {
         public:
         };

diff --git a/ouzel/scene/ShapeDrawable.cpp → ouzel/scene/ShapeRenderer.cpp b/ouzel/scene/ShapeDrawable.cpp → ouzel/scene/ShapeRenderer.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Elviss Strazdins
 // This file is part of the Ouzel engine.
 
-#include "ShapeDrawable.h"
+#include "ShapeRenderer.h"
 #include "core/Engine.h"
 #include "graphics/Renderer.h"
 #include "graphics/MeshBufferResource.h"
@@ -13,7 +13,7 @@ namespace ouzel
 {
     namespace scene
     {
-        ShapeDrawable::ShapeDrawable()
+        ShapeRenderer::ShapeRenderer()
         {
             shader = sharedEngine->getCache()->getShader(graphics::SHADER_COLOR);
             blendState = sharedEngine->getCache()->getBlendState(graphics::BLEND_ALPHA);
@@ -28,7 +28,7 @@ namespace ouzel
             meshBuffer->init(sizeof(uint16_t), indexBuffer, ouzel::graphics::VertexPC::ATTRIBUTES, vertexBuffer);
         }
 
-        void ShapeDrawable::draw(const Matrix4& transformMatrix,
+        void ShapeRenderer::draw(const Matrix4& transformMatrix,
                                  const Color& drawColor,
                                  const Matrix4& renderViewProjection,
                                  const std::shared_ptr<graphics::Texture>& renderTarget,
@@ -87,7 +87,7 @@ namespace ouzel
             }
         }
 
-        void ShapeDrawable::clear()
+        void ShapeRenderer::clear()
         {
             boundingBox.reset();
 
@@ -98,7 +98,7 @@ namespace ouzel
             dirty = true;
         }
 
-        void ShapeDrawable::line(const Vector2& start, const Vector2& finish, const Color& color, float thickness)
+        void ShapeRenderer::line(const Vector2& start, const Vector2& finish, const Color& color, float thickness)
         {
             if (thickness <= 0.0f) return;
 
@@ -149,7 +149,7 @@ namespace ouzel
             dirty = true;
         }
 
-        void ShapeDrawable::circle(const Vector2& position,
+        void ShapeRenderer::circle(const Vector2& position,
                                    float radius,
                                    const Color& color,
                                    bool fill,
@@ -239,7 +239,7 @@ namespace ouzel
             dirty = true;
         }
 
-        void ShapeDrawable::rectangle(const Rectangle& rectangle,
+        void ShapeRenderer::rectangle(const Rectangle& rectangle,
                                       const Color& color,
                                       bool fill,
                                       float thickness)
@@ -334,7 +334,7 @@ namespace ouzel
             dirty = true;
         }
 
-        void ShapeDrawable::triangle(const Vector2 (&positions)[3],
+        void ShapeRenderer::triangle(const Vector2 (&positions)[3],
                                      const Color& color,
                                      bool fill,
                                      float thickness)
@@ -370,7 +370,7 @@ namespace ouzel
             dirty = true;
         }
 
-        void ShapeDrawable::polygon(const std::vector<Vector2>& edges,
+        void ShapeRenderer::polygon(const std::vector<Vector2>& edges,
                                     const Color& color,
                                     bool fill,
                                     float thickness)
@@ -430,7 +430,7 @@ namespace ouzel
             return ret;
         }
 
-        void ShapeDrawable::curve(const std::vector<Vector2>& controlPoints,
+        void ShapeRenderer::curve(const std::vector<Vector2>& controlPoints,
                                   const Color& color,
                                   uint32_t segments,
                                   float thickness)

diff --git a/ouzel/scene/ShapeDrawable.h → ouzel/scene/ShapeRenderer.h b/ouzel/scene/ShapeDrawable.h → ouzel/scene/ShapeRenderer.h
@@ -16,10 +16,10 @@ namespace ouzel
 {
     namespace scene
     {
-        class ShapeDrawable: public Component
+        class ShapeRenderer: public Component
         {
         public:
-            ShapeDrawable();
+            ShapeRenderer();
 
             virtual void draw(const Matrix4& transformMatrix,
                               const Color& drawColor,

diff --git a/ouzel/scene/TextDrawable.cpp → ouzel/scene/TextRenderer.cpp b/ouzel/scene/TextDrawable.cpp → ouzel/scene/TextRenderer.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Elviss Strazdins
 // This file is part of the Ouzel engine.
 
-#include "TextDrawable.h"
+#include "TextRenderer.h"
 #include "core/Engine.h"
 #include "graphics/Renderer.h"
 #include "scene/Camera.h"
@@ -12,7 +12,7 @@ namespace ouzel
 {
     namespace scene
     {
-        TextDrawable::TextDrawable(const std::string& fontFile,
+        TextRenderer::TextRenderer(const std::string& fontFile,
                                    bool aMipmaps,
                                    const std::string& aText,
                                    Color aColor,
@@ -41,29 +41,29 @@ namespace ouzel
             updateText();
         }
 
-        void TextDrawable::setFont(const std::string& fontFile)
+        void TextRenderer::setFont(const std::string& fontFile)
         {
             font = sharedEngine->getCache()->getBMFont(fontFile);
             texture = sharedEngine->getCache()->getTexture(font.getTexture(), false, mipmaps);
 
             updateText();
         }
 
-        void TextDrawable::setTextAnchor(const Vector2& newTextAnchor)
+        void TextRenderer::setTextAnchor(const Vector2& newTextAnchor)
         {
             textAnchor = newTextAnchor;
 
             updateText();
         }
 
-        void TextDrawable::setTextScale(const Vector2& newTextScale)
+        void TextRenderer::setTextScale(const Vector2& newTextScale)
         {
             textScale = newTextScale;
 
             updateText();
         }
 
-        void TextDrawable::draw(const Matrix4& transformMatrix,
+        void TextRenderer::draw(const Matrix4& transformMatrix,
                                 const Color& drawColor,
                                 const Matrix4& renderViewProjection,
                                 const std::shared_ptr<graphics::Texture>& renderTarget,
@@ -120,21 +120,21 @@ namespace ouzel
                                                         scissorRectangle);
         }
 
-        void TextDrawable::setText(const std::string& newText)
+        void TextRenderer::setText(const std::string& newText)
         {
             text = newText;
 
             updateText();
         }
 
-        void TextDrawable::setColor(const Color& newColor)
+        void TextRenderer::setColor(const Color& newColor)
         {
             color = newColor;
 
             updateText();
         }
 
-        void TextDrawable::updateText()
+        void TextRenderer::updateText()
         {
             font.getVertices(text, color, textAnchor, textScale, indices, vertices);
             needsMeshUpdate = true;

diff --git a/ouzel/scene/TextDrawable.h → ouzel/scene/TextRenderer.h b/ouzel/scene/TextDrawable.h → ouzel/scene/TextRenderer.h
@@ -17,10 +17,10 @@ namespace ouzel
 {
     namespace scene
     {
-        class TextDrawable: public Component
+        class TextRenderer: public Component
         {
         public:
-            TextDrawable(const std::string& fontFile,
+            TextRenderer(const std::string& fontFile,
                          bool aMipmaps = true,
                          const std::string& aText = std::string(),
                          Color aColor = Color::WHITE,

diff --git a/samples/AnimationsSample.cpp b/samples/AnimationsSample.cpp
@@ -24,7 +24,7 @@ AnimationsSample::AnimationsSample(Samples& aSamples):
     layer->addChild(camera.get());
     addLayer(layer.get());
 
-    shapeDrawable.reset(new scene::ShapeDrawable());
+    shapeDrawable.reset(new scene::ShapeRenderer());
     shapeDrawable->rectangle(ouzel::Rectangle(100.0f, 100.0f), Color(0, 128, 128, 255), true);
     shapeDrawable->rectangle(ouzel::Rectangle(100.0f, 100.0f), Color::WHITE, false, 2.0f);
     shapeDrawable->line(Vector2(0.0f, 0.0f), Vector2(50.0f, 50.0f), Color::CYAN, 2.0f);

diff --git a/samples/AnimationsSample.h b/samples/AnimationsSample.h
@@ -20,7 +20,7 @@ class AnimationsSample: public ouzel::scene::Scene
     std::unique_ptr<ouzel::scene::Layer> layer;
     std::unique_ptr<ouzel::scene::Camera> camera;
 
-    std::unique_ptr<ouzel::scene::ShapeDrawable> shapeDrawable;
+    std::unique_ptr<ouzel::scene::ShapeRenderer> shapeDrawable;
     std::unique_ptr<ouzel::scene::Node> drawNode;
 
     std::unique_ptr<ouzel::scene::Shake> shake;