added enterprise and rotating cubes; restored face normal

TheGame/openglrenderdevice.cpp

@@ -97,7 +97,7 @@ void OpenGLRenderDevice::initialize(int fov, int width, int height)
 //    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
 
-//    GLfloat light_diffuse[] = {1.0, 0.0, 0.0, 1.0};  /* Red diffuse light. */
+//    GLfloat light_diffuse[] = {1.0, 1.0, 1.0, 1.0};  /* Red diffuse light. */
 //    GLfloat light_position[] = {1.0, 1.0, 1.0, 0.0};  /* Infinite light location. */
 //    glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
 //    glLightfv(GL_LIGHT0, GL_POSITION, light_position);
@@ -174,12 +174,12 @@ void OpenGLRenderDevice::drawLine(const ColorVector3D &begin, const ColorVector3
 void OpenGLRenderDevice::drawPolygon(const QList<ColorVector3D> &points)
 {
     glBegin(GL_POLYGON);
-//    Vector3D p1 = points[0];
-//    Vector3D p2 = points[1];
-//    Vector3D n = p1.crossProduct(p2);
+    Vector3D p1 = points[0] - points[1];
+    Vector3D p2 = points[0] - points[2];
+    Vector3D n = p1.crossProduct(p2);
 //    Vector3D n2 = p2.crossProduct(p1);
 //    qDebug() << n.getX() << n.getY() << n.getZ() << n2.getX() << n2.getY() << n2.getZ();
-//    glNormal3d(n.getX(), n.getY(), n.getZ());
+    glNormal3d(n.getX(), n.getY(), n.getZ());
     for (int i = 0; i < points.size(); ++i) {
         drawVertex(points[i]);
     }

TheGame/renderwidget.cpp

@@ -25,6 +25,7 @@ RenderWidget::RenderWidget(QWidget *parent) :
 
     _engine = new UGameEngine(new OpenGLRenderDevice(this));
     _camera = new FreeFlyCamera(_engine, this);
+    _camera->setPosition(Vector3D(0, 1.5, 0));
 
     //_engine->addEntity(new UGEEntityAxes(_engine));
 
@@ -40,8 +41,6 @@ RenderWidget::RenderWidget(QWidget *parent) :
 
     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);
@@ -53,8 +52,25 @@ RenderWidget::RenderWidget(QWidget *parent) :
     WaveFrontObj* wavefrontObj = new WaveFrontObj(this);
     wavefrontObj->openFile(_assetsPath + "objs/enterprise/USSEnterprise.obj");
     UGEEntityWaveFrontObj* obj = new UGEEntityWaveFrontObj(wavefrontObj, _engine);
-    obj->hide();
-    _entities.append(obj);
+    obj->move(Vector3D(0, 15, 0));
+
+    UGEEntityCube* cube = new UGEEntityCube(_engine);
+    cube->move(Vector3D(5, 17, 5));
+    cube->setTextureId("dice");
+    _entities.append(cube);
+    cube = new UGEEntityCube(_engine);
+    cube->move(Vector3D(-5, 17, 5));
+    cube->setTextureId("dice");
+    _entities.append(cube);
+    cube = new UGEEntityCube(_engine);
+    cube->move(Vector3D(-5, 17, -5));
+    cube->setTextureId("dice");
+    _entities.append(cube);
+    cube = new UGEEntityCube(_engine);
+    cube->move(Vector3D(5, 17, -5));
+    cube->setTextureId("dice");
+    _entities.append(cube);
+
     animate();
 }
 
@@ -97,6 +113,11 @@ void RenderWidget::mousePressEvent(QMouseEvent *event)
         Vector3D bestp;
         UGEEntity* entity = _engine->getVectorNearestIntesection(_camera->getDirection(), _camera->getPosition(), &bestp);
         if (entity) {
+            for (int i = 0; i < _entities.size(); ++i) {
+                if (_entities[i] == entity) {
+                    return;
+                }
+            }
 //            UGEEntity* axe = new UGEEntityAxes(_engine);
 //            axe->move(bestp);
             if (right) {
@@ -183,9 +204,9 @@ void RenderWidget::paintEvent(QPaintEvent *event)
 
 void RenderWidget::animate()
 {
-//    for (int i = 0; i < _entities.size(); ++i) {
-//        _entities[i]->rotate(Vector3D(0.0, 2.0, 2.0));
-//    }
+    for (int i = 0; i < _entities.size(); ++i) {
+        _entities[i]->rotate(Vector3D(0.0, 2.0, 2.0));
+    }
     QTimer::singleShot(20, this, SLOT(animate()));
     update();
 }

UGameEngine/cameras/freeflycamera.cpp

@@ -5,8 +5,8 @@
 FreeFlyCamera::FreeFlyCamera(UGameEngine *engine, QWidget* widget)
     : AbstractCamera(engine, widget)
     , _speed(0.2)
-    , _phi(45)
-    , _theta(45)
+    , _phi(270.0)
+    , _theta(90.0)
 {
     _widget->setCursor(Qt::BlankCursor);
     _lastPoint = QPoint(_widget->width()/2,_widget->height()/2);