Renamed AbstractObject -> Object, draw() is now dummy instead of pure virtual.

examples/triangle/Triangle.cpp

@@ -19,7 +19,7 @@
 
 namespace Magnum { namespace Examples {
 
-Triangle::Triangle(AbstractObject* parent): AbstractObject(parent), mesh(Mesh::Triangles, 3) {
+Triangle::Triangle(Object* parent): Object(parent), mesh(Mesh::Triangles, 3) {
     /* Vertices and colors, interleaved */
     Vector4 data[] = {
         Vector4(-0.5f, -0.5f, 0.0f),    Vector4(1.0f, 0.0f, 0.0f),  /* Red lower left vertex */

examples/triangle/Triangle.h

@@ -15,15 +15,15 @@
     GNU Lesser General Public License version 3 for more details.
 */
 
-#include "AbstractObject.h"
+#include "Object.h"
 #include "Mesh.h"
 #include "IdentityShader.h"
 
 namespace Magnum { namespace Examples {
 
-class Triangle: public AbstractObject {
+class Triangle: public Object {
     public:
-        Triangle(AbstractObject* parent = 0);
+        Triangle(Object* parent = 0);
 
         virtual void draw(const Matrix4& transformationMatrix, const Matrix4& projectionMatrix);
 

src/CMakeLists.txt

@@ -6,7 +6,7 @@ find_package(GLEW REQUIRED)
 add_subdirectory(Math)
 
 set(Magnum_SRCS
-    AbstractObject.cpp
+    Object.cpp
     AbstractShaderProgram.cpp
     Camera.cpp
     IndexedMesh.cpp

src/Camera.cpp

@@ -17,7 +17,7 @@
 
 namespace Magnum {
 
-Camera::Camera(AbstractObject* parent): AbstractObject(parent), viewportWidth(0), viewportHeight(0), _aspectRatioPolicy(Extend) {
+Camera::Camera(Object* parent): Object(parent), viewportWidth(0), viewportHeight(0), _aspectRatioPolicy(Extend) {
     setOrthographic(2, 1, 1000);
 }
 

src/Camera.h

@@ -19,7 +19,7 @@
  * @brief Class Magnum::Camera
  */
 
-#include "AbstractObject.h"
+#include "Object.h"
 
 namespace Magnum {
 
@@ -28,7 +28,7 @@ namespace Magnum {
  *
  * @todo Subclasses - perspective, FBO postprocessing etc.
  */
-class Camera: public AbstractObject {
+class Camera: public Object {
     public:
         /** @brief Aspect ratio policy */
         enum AspectRatioPolicy {
@@ -43,7 +43,7 @@ class Camera: public AbstractObject {
          *
          * Calls <tt>setOrthographic(2, 1, 1000)</tt>.
          */
-        Camera(AbstractObject* parent = 0);
+        Camera(Object* parent = 0);
 
         /** @brief Aspect ratio policy */
         AspectRatioPolicy aspectRatioPolicy() const { return _aspectRatioPolicy; }
@@ -96,14 +96,6 @@ class Camera: public AbstractObject {
          */
         void setViewport(int width, int height);
 
-        /**
-         * @brief Draw camera
-         *
-         * Subclasses can draw for example an HUD. Default implementation does
-         * nothing.
-         */
-        virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {}
-
     private:
         Matrix4 rawProjectionMatrix;
         Matrix4 _projectionMatrix;

src/Object.cpp

@@ -13,13 +13,13 @@
     GNU Lesser General Public License version 3 for more details.
 */
 
-#include "AbstractObject.h"
+#include "Object.h"
 
 using namespace std;
 
 namespace Magnum {
 
-void AbstractObject::setParent(AbstractObject* parent) {
+void Object::setParent(Object* parent) {
     if(_parent == parent) return;
 
     /* Remove the object from old parent children list */
@@ -34,12 +34,12 @@ void AbstractObject::setParent(AbstractObject* parent) {
     _parent = parent;
 }
 
-AbstractObject::~AbstractObject() {
+Object::~Object() {
     /* Remove the object from parent's children */
     setParent(0);
 
     /* Delete all children */
-    for(set<AbstractObject*>::const_iterator it = _children.begin(); it != _children.end(); ++it)
+    for(set<Object*>::const_iterator it = _children.begin(); it != _children.end(); ++it)
         delete *it;
 }
 

src/Object.h

@@ -1,5 +1,5 @@
-#ifndef Magnum_AbstractObject_h
+#ifndef Magnum_Object_h
-#define Magnum_AbstractObject_h
+#define Magnum_Object_h
 /*
     Copyright © 2010 Vladimír Vondruš <mosra@centrum.cz>
 
@@ -16,7 +16,7 @@
 */
 
 /** @file
- * @brief Class Magnum::AbstractObject
+ * @brief Class Magnum::Object
  */
 
 #include <set>
@@ -31,8 +31,8 @@ namespace Magnum {
  * @todo Transform transformation when changing parent, so the object stays in
  * place.
  */
-class AbstractObject {
+class Object {
-    DISABLE_COPY(AbstractObject)
+    DISABLE_COPY(Object)
 
     public:
         /**
@@ -41,7 +41,7 @@ class AbstractObject {
          *
          * Sets all transformations to their default values.
          */
-        inline AbstractObject(AbstractObject* parent = 0): _parent(0) {
+        inline Object(Object* parent = 0): _parent(0) {
             setParent(parent);
         }
 
@@ -51,16 +51,16 @@ class AbstractObject {
          * Removes itself from parent's children list and destroys all own
          * children.
          */
-        virtual ~AbstractObject();
+        virtual ~Object();
 
         /** @brief Parent object */
-        inline AbstractObject* parent() const { return _parent; }
+        inline Object* parent() const { return _parent; }
 
         /** @brief Child objects */
-        inline const std::set<AbstractObject*>& children() const { return _children; }
+        inline const std::set<Object*>& children() const { return _children; }
 
         /** @brief Set parent object */
-        void setParent(AbstractObject* parent);
+        void setParent(Object* parent);
 
         /** @brief Transformation matrix */
         inline Matrix4 transformation() const { return _transformation; }
@@ -87,7 +87,7 @@ class AbstractObject {
          * Sets parent and transformation from another object, so they will
          * appear in the same place.
          */
-        inline void setTransformationFrom(const AbstractObject& another) {
+        inline void setTransformationFrom(const Object& another) {
             setParent(another.parent());
             setTransformation(another.transformation());
         }
@@ -134,12 +134,16 @@ class AbstractObject {
             rotate(angle, Vector3(x, y, z), global);
         }
 
-        /** @brief Draw object */
+        /**
-        virtual void draw(const Matrix4& transformationMatrix, const Matrix4& projectionMatrix) = 0;
+         * @brief Draw object
+         *
+         * Default implementation does nothing.
+         */
+        virtual void draw(const Matrix4& transformationMatrix, const Matrix4& projectionMatrix) {}
 
     private:
-        AbstractObject* _parent;
+        Object* _parent;
-        std::set<AbstractObject*> _children;
+        std::set<Object*> _children;
         Matrix4 _transformation;
 };
 

src/Scene.cpp

@@ -52,8 +52,8 @@ void Scene::draw() {
     drawChildren(this, _camera->cameraMatrix());
 }
 
-void Scene::drawChildren(AbstractObject* object, const Matrix4& transformationMatrix) {
+void Scene::drawChildren(Object* object, const Matrix4& transformationMatrix) {
-    for(set<AbstractObject*>::const_iterator it = object->children().begin(); it != object->children().end(); ++it) {
+    for(set<Object*>::const_iterator it = object->children().begin(); it != object->children().end(); ++it) {
         /* Transformation matrix for the object */
         Matrix4 matrix = transformationMatrix*(*it)->transformation();
 

src/Scene.h

@@ -24,10 +24,10 @@
 namespace Magnum {
 
 /** @brief Scene */
-class Scene: public AbstractObject {
+class Scene: public Object {
     private:
-        AbstractObject::setTransformation;
+        Object::setParent;
-        AbstractObject::setParent;
+        Object::setTransformation;
 
     public:
         /** @brief Features */
@@ -38,7 +38,7 @@ class Scene: public AbstractObject {
         };
 
         /** @brief Constructor */
-        inline Scene(): AbstractObject(0), _features(0), _camera(0) {
+        inline Scene(): Object(0), _features(0), _camera(0) {
             setClearColor(0.1f, 0.1f, 0.1f, 1.0f);
         }
 
@@ -90,7 +90,7 @@ class Scene: public AbstractObject {
         unsigned int viewportWidth, viewportHeight;
 
         inline virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {}
-        void drawChildren(AbstractObject* object, const Matrix4& transformationMatrix);
+        void drawChildren(Object* object, const Matrix4& transformationMatrix);
 };
 
 }

src/Test/CMakeLists.txt

@@ -1,2 +1,2 @@
-magnum_add_test(AbstractObjectTest AbstractObjectTest.h AbstractObjectTest.cpp Magnum)
+magnum_add_test(ObjectTest ObjectTest.h ObjectTest.cpp Magnum)
 magnum_add_test(CameraTest CameraTest.h CameraTest.cpp Magnum)

src/Test/ObjectTest.cpp

@@ -13,15 +13,15 @@
     GNU Lesser General Public License version 3 for more details.
 */
 
-#include "AbstractObjectTest.h"
+#include "ObjectTest.h"
 
 #include <QtTest/QTest>
 
-QTEST_APPLESS_MAIN(Magnum::Test::AbstractObjectTest)
+QTEST_APPLESS_MAIN(Magnum::Test::ObjectTest)
 
 namespace Magnum { namespace Test {
 
-void AbstractObjectTest::parenting() {
+void ObjectTest::parenting() {
     Object root;
 
     Object* childOne = new Object(&root);

src/Test/ObjectTest.h

@@ -1,5 +1,5 @@
-#ifndef Magnum_Test_AbstractObjectTest_h
+#ifndef Magnum_Test_ObjectTest_h
-#define Magnum_Test_AbstractObjectTest_h
+#define Magnum_Test_ObjectTest_h
 /*
     Copyright © 2010 Vladimír Vondruš <mosra@centrum.cz>
 
@@ -17,19 +17,11 @@
 
 #include <QtCore/QObject>
 
-#include "AbstractObject.h"
+#include "Object.h"
 
 namespace Magnum { namespace Test {
 
-class Object: public AbstractObject {
+class ObjectTest: public QObject {
-    public:
-        inline Object(AbstractObject* parent = 0): AbstractObject(parent) {}
-        inline virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {}
-
-        inline const std::set<AbstractObject*>& children() { return AbstractObject::children(); }
-};
-
-class AbstractObjectTest: public QObject {
     Q_OBJECT
 
     private slots: