refractor folder

TheGame/openglrenderdevice.h

@@ -1,7 +1,7 @@
 #ifndef OPENGLRENDERDEVICE_H
 #define OPENGLRENDERDEVICE_H
 
-#include "abstractrenderdevice.h"
+#include "engine/abstractrenderdevice.h"
 
 class OpenGLRenderDevice : public AbstractRenderDevice
 {
@@ -9,8 +9,6 @@ class OpenGLRenderDevice : public AbstractRenderDevice
 public:
     explicit OpenGLRenderDevice(QObject *parent = 0);
 
-//    static float
-
 signals:
 
 public slots:

TheGame/renderwidget.h

@@ -4,7 +4,7 @@
 #include <QGLWidget>
 #include <QMouseEvent>
 #include <QWheelEvent>
-#include "ugameengine.h"
+#include "engine/ugameengine.h"
 #include "openglrenderdevice.h"
 
 class RenderWidget : public QGLWidget

UGameEngine/UGameEngine.pro

@@ -11,17 +11,17 @@ TEMPLATE = lib
 
 DEFINES += UGAMEENGINE_LIBRARY
 
-SOURCES += ugameengine.cpp \
-    ugeentity.cpp \
-    vector3d.cpp \
-    abstractrenderdevice.cpp \
-    colorvector3d.cpp
+SOURCES += engine/ugameengine.cpp \
+    engine/abstractrenderdevice.cpp \
+    entities/ugeentity.cpp \
+    utils/vector3d.cpp \
+    utils/colorvector3d.cpp
 
-HEADERS += ugameengine.h\
-    ugeentity.h \
-    vector3d.h \
-    abstractrenderdevice.h \
-    colorvector3d.h
+HEADERS += engine/ugameengine.h\
+    engine/abstractrenderdevice.h \
+    entities/ugeentity.h \
+    utils/vector3d.h \
+    utils/colorvector3d.h
 
 unix {
     target.path = /usr/lib

UGameEngine/abstractrenderdevice.h → UGameEngine/engine/abstractrenderdevice.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QColor>
-#include "colorvector3d.h"
+#include "utils/colorvector3d.h"
 
 class AbstractRenderDevice : public QObject
 {

UGameEngine/ugameengine.cpp → UGameEngine/engine/ugameengine.cpp

@@ -6,6 +6,10 @@ UGameEngine::UGameEngine(AbstractRenderDevice* device)
 {
 }
 
+UGameEngine::~UGameEngine()
+{
+}
+
 void UGameEngine::draw()
 {
     _device->preDraw();

UGameEngine/ugameengine.h → UGameEngine/engine/ugameengine.h

@@ -2,13 +2,14 @@
 #define UGAMEENGINE_H
 
 #include "abstractrenderdevice.h"
-#include "ugeentity.h"
+#include "entities/ugeentity.h"
 
 class UGameEngine : public QObject
 {
     Q_OBJECT
 public:
     UGameEngine(AbstractRenderDevice* device);
+    virtual ~UGameEngine();
 
     void draw();
 

UGameEngine/ugeentity.cpp → UGameEngine/entities/ugeentity.cpp

@@ -1,7 +1,12 @@
 #include "ugeentity.h"
 
-UGEEntity::UGEEntity(QObject *parent) :
-    QObject(parent)
+UGEEntity::UGEEntity(QObject *parent)
+    : QObject(parent)
+    , _visible(true)
+{
+}
+
+UGEEntity::~UGEEntity()
 {
 }
 
@@ -64,3 +69,23 @@ void UGEEntity::scale(const Vector3D &scale)
 {
     _scale += scale;
 }
+bool UGEEntity::isVisible() const
+{
+    return _visible;
+}
+
+void UGEEntity::setVisible(bool visible)
+{
+    _visible = visible;
+}
+
+void UGEEntity::show()
+{
+    _visible = true;
+}
+
+void UGEEntity::hide()
+{
+    _visible = false;
+}
+

UGameEngine/ugeentity.h → UGameEngine/entities/ugeentity.h

@@ -4,14 +4,15 @@
 #include <QObject>
 #include <QPoint>
 #include <QSharedPointer>
-#include "vector3d.h"
-#include "abstractrenderdevice.h"
+#include "utils/vector3d.h"
+#include "engine/abstractrenderdevice.h"
 
 class UGEEntity : public QObject
 {
     Q_OBJECT
 public:
     explicit UGEEntity(QObject *parent = 0);
+    virtual ~UGEEntity();
 
     Vector3D getPosition() const;
     void setPosition(const Vector3D& position);
@@ -29,6 +30,11 @@ public:
     void setScale(const Vector3D& scale);
     void scale(const Vector3D& scale);
 
+    bool isVisible() const;
+    void setVisible(bool visible);
+    void show();
+    void hide();
+
     virtual void draw(AbstractRenderDevice* device) = 0;
 
 private:
@@ -40,6 +46,8 @@ private:
 
     Vector3D _scale;
 
+    bool _visible;
+
 };
 
 #endif // UGEENTITY_H

UGameEngine/colorvector3d.cpp → UGameEngine/utils/colorvector3d.cpp

@@ -18,6 +18,10 @@ ColorVector3D::ColorVector3D(const ColorVector3D &other)
 {
 }
 
+ColorVector3D::~ColorVector3D()
+{
+}
+
 QColor ColorVector3D::getColor() const
 {
     return _color;

UGameEngine/colorvector3d.h → UGameEngine/utils/colorvector3d.h

@@ -10,6 +10,7 @@ public:
     ColorVector3D(QColor color = Qt::black, double x = 0.0, double y = 0.0, double z = 0.0);
     ColorVector3D(QColor color = Qt::black, const Vector3D& other = Vector3D());
     ColorVector3D(const ColorVector3D& other);
+    virtual ~ColorVector3D();
 
     QColor getColor() const;
     void setColor(const QColor &color);

tests/testvector3d.cpp

@@ -1,5 +1,5 @@
 #include <QtTest/QtTest>
-#include "vector3d.h"
+#include "utils/vector3d.h"
 
 class TestVector3D : public QObject
 {