auto add/remove entities; add/remove cubes by click

TheGame/TheGame.pro

@@ -16,13 +16,11 @@ CONFIG += c++11
 SOURCES += main.cpp\
         mainwindow.cpp \
     renderwidget.cpp \
-    openglrenderdevice.cpp \
-    gamecube.cpp
+    openglrenderdevice.cpp
 
 HEADERS  += mainwindow.h \
     renderwidget.h \
-    openglrenderdevice.h \
-    gamecube.h
+    openglrenderdevice.h
 
 FORMS    += mainwindow.ui
 

TheGame/gamecube.cpp

@@ -1,7 +0,0 @@
-#include "gamecube.h"
-
-GameCube::GameCube(QObject *parent)
-    : UGEEntityCube(parent)
-{
-    _size = 1;
-}

TheGame/gamecube.h

@@ -1,14 +0,0 @@
-#ifndef GAMECUBE_H
-#define GAMECUBE_H
-
-#include "entities/ugeentitycube.h"
-
-class GameCube : public UGEEntityCube
-{
-public:
-    GameCube(QObject *parent = 0);
-
-public slots:
-};
-
-#endif // GAMECUBE_H

TheGame/renderwidget.cpp

@@ -8,7 +8,6 @@
 #include "entities/ugeentitywavefrontobj.h"
 #include "cameras/rotationcamera.h"
 #include "cameras/freeflycamera.h"
-#include "gamecube.h"
 
 RenderWidget::RenderWidget(QWidget *parent) :
     QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
@@ -34,27 +33,26 @@ RenderWidget::RenderWidget(QWidget *parent) :
 ////        cube->rotate(Vector3D(0.0, 45.0, 45.0));
 //        cube->move(Vector3D(0, i, i));
 ////        cube->setScale(Vector3D(1.0, 2.0, 1.0));
-//        _engine->addEntity(cube);
 //        _entities.append(cube);
 //    }
 
-    for(int i = 0,j = 0; i * j< 626;){
-        UGEEntityCube* cube = new GameCube(_engine);
-        cube->setTextureId("rubiks");
-        cube->move(Vector3D(i, 0, j++));
-        _engine->addEntity(cube);
-        _entities.append(cube);
-        if(j == 26){
-            j = 0;
-            i++;
+
+//    int xmax = 25;
+//    int zmax = 25;
+    int xmax = 1;
+    int zmax = 1;
+    for (int x = 0; x < xmax; ++x) {
+        for (int z = 0; z < zmax; ++z) {
+            UGEEntityCube* cube = new UGEEntityCube(_engine);
+            cube->setTextureId("rubiks");
+            cube->move(Vector3D(x - (xmax / 2), 0, z - (zmax / 2)));
         }
     }
 
     WaveFrontObj* wavefrontObj = new WaveFrontObj(this);
     wavefrontObj->openFile(_assetsPath + "objs/enterprise/USSEnterprise.obj");
-    UGEEntityWaveFrontObj* obj = new UGEEntityWaveFrontObj(wavefrontObj, this);
+    UGEEntityWaveFrontObj* obj = new UGEEntityWaveFrontObj(wavefrontObj, _engine);
     obj->hide();
-    _engine->addEntity(obj);
     _entities.append(obj);
     animate();
 }
@@ -82,22 +80,32 @@ void RenderWidget::resizeGL(int width, int height)
 void RenderWidget::mousePressEvent(QMouseEvent *event)
 {
     _camera->mousePressEvent(event);
-    if (event->buttons() & Qt::LeftButton) {
-//        Vector3D pos = _engine->get3DFrom2D(Vector2D(event->x(), height() - event->y()));
-        Vector3D pos = _camera->getPosition();
-       // qDebug() << pos.getX() << pos.getY() << pos.getZ();
+    bool left = event->buttons() & Qt::LeftButton;
+    bool right = event->buttons() & Qt::RightButton;
+    if (left || right) {
         Vector3D bestp;
-        bool ok = false;
-        for (int i = 0; i < _engine->getEntities().size(); i++) {
-            UGEEntity* entity = _engine->getEntities()[i];
-            bool provi;
-            Vector3D collision = entity->getVectorNearestIntesection(_camera->getDirection(), pos, &provi);
-            if (provi && (!ok || (pos - bestp).norm() > (pos - collision).norm())) {
-                bestp = collision;
-                UGEEntityAxes* axe = new UGEEntityAxes(_engine);
-                axe->move(bestp);
-                _engine->addEntity(axe);
-                ok = true;
+        UGEEntity* entity = _engine->getVectorNearestIntesection(_camera->getDirection(), _camera->getPosition(), &bestp);
+        if (entity) {
+//            UGEEntity* axe = new UGEEntityAxes(_engine);
+//            axe->move(bestp);
+            if (right) {
+                entity->deleteLater();
+            }
+            else if (left) {
+                Vector3D pos = entity->getPosition();
+                Vector3D diff = pos - bestp;
+                if (fmod(fabs(diff.getX()), 0.5) == 0) {
+                    pos.add(Vector3D(1 * (diff.getX() < 0 ? 1 : -1), 0, 0));
+                }
+                else if (fmod(fabs(diff.getY()), 0.5) == 0) {
+                    pos.add(Vector3D(0, 1 * (diff.getY() < 0 ? 1 : -1), 0));
+                }
+                else if (fmod(fabs(diff.getZ()), 0.5) == 0) {
+                    pos.add(Vector3D(0, 0, 1 * (diff.getZ() < 0 ? 1 : -1)));
+                }
+                UGEEntityCube* cube = new UGEEntityCube(_engine);
+                cube->move(pos);
+                cube->setTextureId("rubiks");
             }
         }
     }
@@ -111,12 +119,6 @@ void RenderWidget::mouseReleaseEvent(QMouseEvent *event)
 void RenderWidget::mouseMoveEvent(QMouseEvent *event)
 {
     _camera->mouseMoveEvent(event);
-
-//    Vector3D dd = _device->get2DFrom3D(Vector3D(0.5, 0.5, 0.5));
-//    dd.setY(height() - dd.getY());
-//    qDebug() << event->pos() << dd;
-//    pos = _device->get3DFrom2D(event->x(), height() - event->y());
-
 }
 
 void RenderWidget::mouseDoubleClickEvent(QMouseEvent *event)

UGameEngine/cameras/freeflycamera.cpp

@@ -15,9 +15,10 @@ FreeFlyCamera::FreeFlyCamera(UGameEngine *engine, QWidget* widget)
 
 void FreeFlyCamera::mouseMoveEvent(QMouseEvent *event)
 {
-    QPoint diff = (event->pos() - _lastPoint) / 2;
+    double ratio = 0.5;
+    QPoint diff = (event->pos() - _lastPoint);
 
-    rotate(-diff.x(), diff.y());
+    rotate(-diff.x() * ratio, diff.y() * ratio);
 
     QPoint glob = _widget->mapToGlobal(QPoint(_widget->width()/2,_widget->height()/2));
     QCursor::setPos(glob);
@@ -62,7 +63,7 @@ void FreeFlyCamera::updateLookAt()
     _engine->lookAt(_position, _direction + _position);
 }
 
-void FreeFlyCamera::rotate(float phi, float theta)
+void FreeFlyCamera::rotate(double phi, double theta)
 {
     _phi = Tools::normalizeAngle(_phi + phi);
     if (_theta + theta >= 180.0) {

UGameEngine/cameras/freeflycamera.h

@@ -16,7 +16,7 @@ public:
 
     virtual void updateLookAt();
 
-    void rotate(float phi, float theta);
+    void rotate(double phi, double theta);
 
 private:
 

UGameEngine/engine/ugameengine.cpp

@@ -84,10 +84,21 @@ Vector3D UGameEngine::get3DFrom2D(const Vector2D &pos)
     return _device->get3DFrom2D(pos);
 }
 
-UGEEntity *UGameEngine::getVectorNearestIntesection(const Vector3D &vector, const Vector3D &pos)
+UGEEntity *UGameEngine::getVectorNearestIntesection(const Vector3D &vector, const Vector3D &pos, Vector3D* bestp)
 {
-    Vector3D nearestPoint;
-    UGEEntity* entity = 0;
+    UGEEntity* beste = 0;
+    bool ok = false;
+    for (int i = 0; i < _entitites.size(); i++) {
+        UGEEntity* entity = _entitites[i];
+        bool provi;
+        Vector3D collision = entity->getVectorNearestIntesection(vector, pos, &provi);
+        if (provi && (!ok || (pos - *bestp).norm() > (pos - collision).norm())) {
+            *bestp = collision;
+            beste = entity;
+            ok = true;
+        }
+    }
+    return beste;
 }
 
 void UGameEngine::addEntity(UGEEntity *entity)
@@ -95,6 +106,11 @@ void UGameEngine::addEntity(UGEEntity *entity)
     _entitites.append(entity);
 }
 
+void UGameEngine::removeEntity(UGEEntity *entity)
+{
+    _entitites.removeOne(entity);
+}
+
 void UGameEngine::lookAt(const Vector3D &eye, const Vector3D &center, const Vector3D &up)
 {
     _device->lookAt(eye, center, up);

UGameEngine/engine/ugameengine.h

@@ -6,6 +6,7 @@
 #include "entitiesupdatethread.h"
 
 class EntitiesUpdateThread;
+class UGEEntity;
 
 class UGameEngine : public QObject
 {
@@ -24,11 +25,13 @@ public:
 
     Vector3D get3DFrom2D(const Vector2D &pos);
 
-    UGEEntity* getVectorNearestIntesection(const Vector3D& vector, const Vector3D &pos);
+    UGEEntity* getVectorNearestIntesection(const Vector3D& vector, const Vector3D &pos, Vector3D *bestp);
 
 public slots:
     void addEntity(UGEEntity* entity);
 
+    void removeEntity(UGEEntity* entity);
+
     void lookAt(const Vector3D& eye, const Vector3D& center, const Vector3D& up = Vector3D(0.0, 1.0, 0.0));
 
     void setClearColor(const QColor &clearColor);

UGameEngine/entities/ugeentity.cpp

@@ -1,21 +1,23 @@
 #include "ugeentity.h"
 #include "utils/tools.h"
 
-UGEEntity::UGEEntity(QObject *parent)
+UGEEntity::UGEEntity(UGameEngine *engine, QObject *parent)
     : QObject(parent)
-    , _scale(1.0, 1.0, 1.0)
-    , _visible(true)
-    , _needUpdate(true)
-    , _zero(0.001)
+    , _engine(engine)
 {
-    connect(this, SIGNAL(positionChanged()), this, SLOT(needUpdate()));
-    connect(this, SIGNAL(rotationChanged()), this, SLOT(needUpdate()));
-    connect(this, SIGNAL(scaleChanged()), this, SLOT(needUpdate()));
-    connect(this, SIGNAL(colorChanged()), this, SLOT(needUpdate()));
+    init();
+}
+
+UGEEntity::UGEEntity(UGameEngine *engine)
+    : QObject(engine)
+    , _engine(engine)
+{
+    init();
 }
 
 UGEEntity::~UGEEntity()
 {
+    _engine->removeEntity(this);
 }
 
 Vector3D UGEEntity::getPosition() const
@@ -234,6 +236,21 @@ void UGEEntity::needUpdate()
     _needUpdate = true;
 }
 
+void UGEEntity::init()
+{
+    connect(this, SIGNAL(positionChanged()), this, SLOT(needUpdate()));
+    connect(this, SIGNAL(rotationChanged()), this, SLOT(needUpdate()));
+    connect(this, SIGNAL(scaleChanged()), this, SLOT(needUpdate()));
+    connect(this, SIGNAL(colorChanged()), this, SLOT(needUpdate()));
+
+    _scale = Vector3D(1.0, 1.0, 1.0);
+    _visible = true;
+    _needUpdate =true;
+    _zero = 0.001;
+
+    _engine->addEntity(this);
+}
+
 
 Vector3D UGEEntity::getVectorNearestFaceIntersection(const Vector3D & p0, const Vector3D &p1, const Vector3D &p2, const Vector3D &vector, const Vector3D &pos, bool* ok){
     Vector3D v1 = p1 - p0;

UGameEngine/entities/ugeentity.h

@@ -7,12 +7,16 @@
 #include "utils/vector3d.h"
 #include "utils/matrix3x3.h"
 #include "engine/abstractrenderdevice.h"
+#include "engine/ugameengine.h"
+
+class UGameEngine;
 
 class UGEEntity : public QObject
 {
     Q_OBJECT
 public:
-    explicit UGEEntity(QObject *parent = 0);
+    explicit UGEEntity(UGameEngine* engine, QObject *parent);
+    explicit UGEEntity(UGameEngine* engine);
     virtual ~UGEEntity();
 
     Vector3D getPosition() const;
@@ -90,6 +94,8 @@ signals:
     void colorChanged(QColor color);
 
 protected:
+    UGameEngine* _engine;
+
     Vector3D _position;
 
 //    Vector3D _speed;
@@ -108,6 +114,9 @@ protected:
 
     double _zero;
 
+private:
+    void init();
+
 };
 
 #endif // UGEENTITY_H

UGameEngine/entities/ugeentityaxes.cpp

@@ -1,15 +1,22 @@
 #include "ugeentityaxes.h"
 
-UGEEntityAxes::UGEEntityAxes(QObject *parent) :
-    UGEEntity(parent)
+UGEEntityAxes::UGEEntityAxes(UGameEngine *engine, QObject *parent) :
+    UGEEntity(engine, parent)
 {
+    init();
+}
+
+UGEEntityAxes::UGEEntityAxes(UGameEngine *engine) :
+    UGEEntity(engine)
+{
+    init();
 }
 
 void UGEEntityAxes::onDraw(AbstractRenderDevice *device)
 {
-    drawLine(device, ColorVector3D(Qt::red, 0.0, 0.0, 0.0), ColorVector3D(Qt::red, 1.0, 0.0, 0.0), 2.5);
-    drawLine(device, ColorVector3D(Qt::green, 0.0, 0.0, 0.0), ColorVector3D(Qt::green, 0.0, 1.0, 0.0), 2.5);
-    drawLine(device, ColorVector3D(Qt::blue, 0.0, 0.0, 0.0), ColorVector3D(Qt::blue, 0.0, 0.0, 1.0), 2.5);
+    drawLine(device, ColorVector3D(Qt::red, 0.0, 0.0, 0.0), ColorVector3D(Qt::red, _size, 0.0, 0.0), 2.5);
+    drawLine(device, ColorVector3D(Qt::green, 0.0, 0.0, 0.0), ColorVector3D(Qt::green, 0.0, _size, 0.0), 2.5);
+    drawLine(device, ColorVector3D(Qt::blue, 0.0, 0.0, 0.0), ColorVector3D(Qt::blue, 0.0, 0.0, _size), 2.5);
 }
 
 Vector3D UGEEntityAxes::getVectorNearestIntesection(const Vector3D &vector, const Vector3D &pos, bool *ok)
@@ -17,3 +24,18 @@ Vector3D UGEEntityAxes::getVectorNearestIntesection(const Vector3D &vector, cons
     *ok = false;
     return Vector3D();
 }
+double UGEEntityAxes::size() const
+{
+    return _size;
+}
+
+void UGEEntityAxes::setSize(double size)
+{
+    _size = size;
+}
+
+void UGEEntityAxes::init()
+{
+    _size = 1.0;
+}
+

UGameEngine/entities/ugeentityaxes.h

@@ -7,16 +7,26 @@ class UGEEntityAxes : public UGEEntity
 {
     Q_OBJECT
 public:
-    explicit UGEEntityAxes(QObject *parent = 0);
+    explicit UGEEntityAxes(UGameEngine* engine, QObject *parent);
+    explicit UGEEntityAxes(UGameEngine* engine);
 
     virtual void onDraw(AbstractRenderDevice* device);
 
     virtual Vector3D getVectorNearestIntesection(const Vector3D &vector, const Vector3D &pos, bool* ok);
 
+    double size() const;
+    void setSize(double size);
+
 signals:
 
 public slots:
 
+protected:
+    double _size;
+
+private:
+    void init();
+
 };
 
 #endif // UGEENTITYAXES_H

UGameEngine/entities/ugeentitycube.cpp

@@ -1,11 +1,15 @@
 #include "ugeentitycube.h"
 
-UGEEntityCube::UGEEntityCube(QObject *parent)
-    : UGEEntity(parent)
-    , _size(1.0)
+UGEEntityCube::UGEEntityCube(UGameEngine *engine, QObject *parent)
+    : UGEEntity(engine, parent)
 {
-    connect(this, SIGNAL(sizeChanged()), this, SLOT(needUpdate()));
-    connect(this, SIGNAL(textureChanged()), this, SLOT(needUpdate()));
+    init();
+}
+
+UGEEntityCube::UGEEntityCube(UGameEngine *engine)
+    : UGEEntity(engine)
+{
+    init();
 }
 
 double UGEEntityCube::getSize() const
@@ -56,6 +60,14 @@ void UGEEntityCube::setTextureId(const QVariant &textureId)
     emit textureChanged(_textureId);
 }
 
+void UGEEntityCube::init()
+{
+    connect(this, SIGNAL(sizeChanged()), this, SLOT(needUpdate()));
+    connect(this, SIGNAL(textureChanged()), this, SLOT(needUpdate()));
+
+    _size = 1;
+}
+
 void UGEEntityCube::onUpdate()
 {
     double r = _size / 2;
@@ -114,9 +126,6 @@ void UGEEntityCube::onUpdate()
 Vector3D UGEEntityCube::getVectorNearestIntesection(const Vector3D &vector, const Vector3D &origin, bool *ok)
 {
     *ok = false;
-    //    Vector3D p1 = points[1] - p;
-    //    Vector3D p2 = points[1];
-    //    Vector3D n = p1.crossProduct(p2);
     Vector3D bestP;
     for (int i = 0; i < _facesTexture.size(); ++i){
         bool provi = false;
@@ -129,44 +138,7 @@ Vector3D UGEEntityCube::getVectorNearestIntesection(const Vector3D &vector, cons
                 bestP = pinter;
                 *ok = true;
             }
-            //qDebug() << bestP.getX() << bestP.getY() << bestP.getZ();
         }
     }
     return bestP;
-
-
-//    Vector3D inv(1.0 / vector.getX(), 1.0 / vector.getY(), 1.0 / vector.getZ());
-//    float tmin, tmax, tymin, tymax, tzmin, tzmax;
-
-//    tmin = (parameters[r.sign[0]].x() - origin.getX()) * inv.getX();
-//    tmax = (parameters[1-r.sign[0]].x() - origin.getX()) * inv.getX();
-//    tymin = (parameters[r.sign[1]].y() - origin.getY()) * inv.getY();
-//    tymax = (parameters[1-r.sign[1]].y() - origin.getY()) * inv.getY();
-//    if ( (tmin > tymax) || (tymin > tmax) ) {
-//        *ok = false;
-//        return Vector3D();
-//    }
-//    if (tymin > tmin)
-//    tmin = tymin;
-//    if (tymax < tmax)
-//    tmax = tymax;
-//    tzmin = (parameters[r.sign[2]].z() - r.origin.z()) * r.inv_direction.z();
-//    tzmax = (parameters[1-r.sign[2]].z() - r.origin.z()) * r.inv_direction.z();
-//    if ( (tmin > tzmax) || (tzmin > tmax) ) {
-//        *ok = false;
-//        return Vector3D();
-//    }
-//    *ok = true;
-//    return _position;
-
-//    if (tzmin > tmin)
-//    tmin = tzmin;
-//    if (tzmax < tmax)
-//    tmax = tzmax;
-//    if ((tmin < t1) && (tmax > t0)) {
-//        *ok = true;
-//        return _position;
-//    }
-//    *ok = false;
-//    return Vector3D();
 }

UGameEngine/entities/ugeentitycube.h

@@ -7,7 +7,8 @@ class UGEEntityCube : public UGEEntity
 {
     Q_OBJECT
 public:
-    explicit UGEEntityCube(QObject *parent = 0);
+    explicit UGEEntityCube(UGameEngine* engine, QObject *parent);
+    explicit UGEEntityCube(UGameEngine* engine);
 
     double getSize() const;
 
@@ -40,6 +41,9 @@ protected:
 
     QList<QList<ColorVector3D> > _facesColor;
 
+private:
+    void init();
+
 };
 
 #endif // UGEENTITYCUBE_H

UGameEngine/entities/ugeentitywavefrontobj.cpp

@@ -1,9 +1,17 @@
 #include "ugeentitywavefrontobj.h"
 
-UGEEntityWaveFrontObj::UGEEntityWaveFrontObj(WaveFrontObj *obj, QObject *parent)
-    : UGEEntity(parent)
+UGEEntityWaveFrontObj::UGEEntityWaveFrontObj(WaveFrontObj *obj, UGameEngine *engine, QObject *parent)
+    : UGEEntity(engine, parent)
     , _obj(obj)
 {
+
+}
+
+UGEEntityWaveFrontObj::UGEEntityWaveFrontObj(WaveFrontObj *obj, UGameEngine *engine)
+    : UGEEntity(engine)
+    , _obj(obj)
+{
+
 }
 
 void UGEEntityWaveFrontObj::onDraw(AbstractRenderDevice *device)

UGameEngine/entities/ugeentitywavefrontobj.h

@@ -8,7 +8,8 @@ class UGEEntityWaveFrontObj : public UGEEntity
 {
     Q_OBJECT
 public:
-    explicit UGEEntityWaveFrontObj(WaveFrontObj* obj, QObject *parent = 0);
+    explicit UGEEntityWaveFrontObj(WaveFrontObj* obj, UGameEngine* engine, QObject *parent);
+    explicit UGEEntityWaveFrontObj(WaveFrontObj* obj, UGameEngine* engine);
 
     virtual void onDraw(AbstractRenderDevice* device);