Upgrade to qt5.12. Too many changes ...

ActLib.cpp

@@ -242,7 +242,7 @@ int ActLib::LoadAllAct(QString gameRoot){
     return 0;
 }
 
-void ActLib::GetUnsavedInfo(std::vector<QString>& items){
+void ActLib::GetUnsavedInfo(QVector<QString>& items){
     Activity * e;
     for (int i = 0; i < ActLib::jestact; i++){
         e = ActLib::Act[i];

ActLib.h

@@ -44,7 +44,7 @@ class ActLib {
     static QVector<QString> GetServiceInUseList(QString n);
     static int AddPath(QString path, QString name);
     static int LoadAllAct(QString gameRoot);
-    static void GetUnsavedInfo(std::vector<QString> &items);
+    static void GetUnsavedInfo(QVector<QString> &items);
     static void UpdateServiceChanges(QString serviceNameId);
     static void SaveAll();
 private:

ActivityObject.cpp

@@ -23,6 +23,7 @@
 #include "TRitem.h"
 #include "Activity.h"
 #include "TerrainLib.h"
+#include <math.h>
 
 ActivityObject::~ActivityObject() {
 }

ActivityTools.cpp

@@ -496,7 +496,7 @@ void ActivityTools::actPlayEnabled(){
 }
 
 void ActivityTools::actSaveEnabled(){
-    std::vector<QString> unsavedItems;
+    QVector<QString> unsavedItems;
     ActLib::GetUnsavedInfo(unsavedItems);
     if(unsavedItems.size() == 0){
         qDebug() << "nic do zapisania";

CELoadWindow.cpp

@@ -59,13 +59,13 @@ CELoadWindow::CELoadWindow() {
     vlist->addRow("Rolling Stock:", &trainsNumber);
     info->setLayout(vlist);
     mainLayout->addWidget(info);
-    /*nowa = new QWidget();
-    QHBoxLayout *vbox1 = new QHBoxLayout;
-    vbox1->addWidget(myLabel3);
-    vbox1->addWidget(nowaTrasa);
-    vbox1->setContentsMargins(0,0,0,0);
-    nowa->setLayout(vbox1);
-    mainLayout->addWidget(nowa);*/
+    //nowa = new QWidget();
+    //QHBoxLayout *vbox1 = new QHBoxLayout;
+    //vbox1->addWidget(myLabel3);
+    //vbox1->addWidget(nowaTrasa);
+    //vbox1->setContentsMargins(0,0,0,0);
+    //nowa->setLayout(vbox1);
+    //mainLayout->addWidget(nowa);
 
     QWidget* box = new QWidget();
     QHBoxLayout *vbox = new QHBoxLayout;

Camera.cpp

@@ -13,6 +13,8 @@
 #include "GLMatrix.h"
 #include "Game.h"
 #include "GeoCoordinates.h"
+#include "GameObj.h"
+#include "GLUU.h"
 
 Camera::Camera(float* pt) {
     pozT = pt;
@@ -91,6 +93,12 @@ float Camera::getRotY() {
 void Camera::update(float fps) {
 }
 
+void Camera::renderHud(GLUU *gluu){
+
+    if(cameraObject != NULL)
+        cameraObject->renderHud();
+}
+
 void Camera::setCameraObject(GameObj* o){
     cameraObject = o;
     playerRot[0] = M_PI;

Camera.h

@@ -20,6 +20,7 @@
 
 class PreciseTileCoordinate;
 class GameObj;
+class GLUU;
 
 class Camera {
 public:
@@ -51,6 +52,7 @@ class Camera {
     virtual void keyDown(QKeyEvent * e);
     virtual void keyUp(QKeyEvent * e);
     virtual void update(float fps);
+    virtual void renderHud(GLUU *gluu);
     virtual void setCameraObject(GameObj* o);
     virtual PreciseTileCoordinate* getCurrentPos();
     float * pozT;

ComplexLine.cpp

@@ -12,6 +12,7 @@
 #include "GLMatrix.h"
 #include "Vector3f.h"
 #include <QDebug>
+#include <math.h>
 
 ComplexLinePoint::ComplexLinePoint(){
 

ConEditorWindow.cpp

@@ -35,6 +35,7 @@
 
 ConEditorWindow::ConEditorWindow() : QMainWindow() {
     Game::shadowsEnabled = 0;
+    Game::fogDensity = 0;
     Vec3::set((float*)Game::sunLightDirection,-1.0,0.0,0.0);
     aboutWindow = new AboutWindow(this);
     englib = new EngLib();
@@ -892,8 +893,8 @@ void ConEditorWindow::replaceAllAllEnabled(){
 
 void ConEditorWindow::closeEvent( QCloseEvent *event )
 {
-    std::vector<int> unsavedConIds;
-    std::vector<int> unsavedActIds;
+    QVector<int> unsavedConIds;
+    QVector<int> unsavedActIds;
     con1->getUnsaed(unsavedConIds);
     con1->getUnsaedAct(unsavedActIds);
     if(unsavedConIds.size()+unsavedActIds.size() == 0){

ConListWidget.cpp

@@ -271,7 +271,7 @@ void ConListWidget::deleteCurrentCon(){
     delete e;
 }
 
-void ConListWidget::getUnsaed(std::vector<int> &unsavedConIds){
+void ConListWidget::getUnsaed(QVector<int> &unsavedConIds){
     unsavedConIds.clear();
     //Game::currentEngLib = englib;
     Consist * e;
@@ -285,7 +285,7 @@ void ConListWidget::getUnsaed(std::vector<int> &unsavedConIds){
     }
 }
 
-void ConListWidget::getUnsaedAct(std::vector<int>& unsavedActIds){
+void ConListWidget::getUnsaedAct(QVector<int>& unsavedActIds){
     unsavedActIds.clear();
     //Game::currentEngLib = englib;
     Activity * e;

ConListWidget.h

@@ -28,8 +28,8 @@ class ConListWidget : public QWidget {
     void fillConList(QString n);
     void newConsist();
     void newConsist(Consist * con);
-    void getUnsaed(std::vector<int> &unsavedConIds);
-    void getUnsaedAct(std::vector<int> &unsavedActIds);
+    void getUnsaed(QVector<int> &unsavedConIds);
+    void getUnsaedAct(QVector<int> &unsavedActIds);
     void findConsistsByEng(int id);
     bool isActivity();
     int getCurrentActivityId();

Consist.cpp

@@ -24,6 +24,7 @@
 #include "TextObj.h"
 #include "TDB.h"
 #include "TerrainLib.h"
+#include "SimpleHud.h"
 
 
 std::unordered_map<int, TextObj*> Consist::txtNumbers;
@@ -363,14 +364,14 @@ void Consist::deteleSelected(){
 void Consist::appendEngItem(int id, int pos, bool flip){
     Eng * eng = Game::currentEngLib->eng[id];
     if(eng == NULL) return;
-    std::vector<int>::iterator it;
+
     EngItem* newE;
     if(pos == 0){
-        engItems.emplace(engItems.begin());
+        engItems.insert(0, EngItem());
         newE = &engItems[0];
         selectedIdx++;
     } else if(pos == 2){
-        engItems.emplace_back();
+        engItems.push_back(EngItem());
         newE = &engItems[engItems.size()-1];
     } else if(pos == 1){
         if(selectedIdx > engItems.size() - 1 )
@@ -380,7 +381,7 @@ void Consist::appendEngItem(int id, int pos, bool flip){
         if(selectedIdx < -1 )
             selectedIdx = -1;
         qDebug() << "selectedIdx "<< selectedIdx;
-        engItems.emplace(engItems.begin()+selectedIdx+1);
+        engItems.insert(selectedIdx+1, EngItem());
         newE = &engItems[selectedIdx+1];
     } else {
         return;
@@ -722,6 +723,10 @@ void Consist::setTrainSpeed(float val){
 float Consist::getTrainSpeed(){
     return trainSpeed;
 }
+
+float Consist::getTrainDistanceTravelled(){
+    return trainTotalDistance;
+}
 
 void Consist::updateSim(float deltaTime){
     if (loaded != 1) 
@@ -738,6 +743,7 @@ void Consist::updateSim(float deltaTime){
 
     trainSpeed = engItems[0].engPointer->getCurrentSpeed();
     float deltaMove = trainSpeed*deltaTime;
+    trainTotalDistance = engItems[0].engPointer->getTotalDistanceDownPath();
 
     for(int i = 0; i < engItems.size(); i++){
         //engItems[i].engPointer->move(-55.5*deltaTime);
@@ -746,6 +752,14 @@ void Consist::updateSim(float deltaTime){
 
 }
 
+void Consist::renderHud(){
+    if(hud == NULL)
+        hud = new SimpleHud();
+    hud->setAttribute("speed", trainSpeed);
+    hud->setAttribute("dist", trainTotalDistance);
+    hud->render();
+}
+
 void Consist::getCameraPosition(float *out){
     if (loaded != 1) 
         return;

Consist.h

@@ -22,6 +22,7 @@ class FileBuffer;
 class QTextStream;
 class GLUU;
 class Activity;
+class SimpleHud;
 
 class Consist : public GameObj {
 public:
@@ -69,7 +70,7 @@ class Consist : public GameObj {
     int posInit = false;
     int selectedIdx = -1;
     float textColor[3];
-    std::vector<EngItem> engItems;
+    QVector<EngItem> engItems;
     Consist(QString p, QString n);
     Consist(QString src, QString p, QString n);
     void load();
@@ -100,6 +101,7 @@ class Consist : public GameObj {
     void initOnTrack(float *posTXZ, int direction, QMap<int, int> *junctionDirections = NULL);
     bool getWagonWorldPosition(int id, float *posTW);
     void updateSim(float deltaTime);
+    void renderHud();
     void getCameraPosition(float *out);
     void renderOnTrack(GLUU* gluu, float * playerT, int selectionColor);
     void render(int selectionColor = 0, bool renderText = false);
@@ -110,13 +112,16 @@ class Consist : public GameObj {
     QString getFirstEngName();
     void setTrainSpeed(float val);
     float getTrainSpeed();
+    float getTrainDistanceTravelled();
 
 private:
     bool newConsist = false;
     bool modified = false;
     bool defaultValue = false;
     bool maxVelocityFixed = false;
     float trainSpeed = 0.0;
+    float trainTotalDistance = 0.0;
+    SimpleHud *hud = NULL;
 
     void replaceEngItem(int id, int pos);
 };

Coords.h

@@ -15,6 +15,7 @@
 #include <unordered_map>
 #include <QMap>
 #include <QPair>
+#include <QVector>
 
 class OglObj;
 class GLUU;
@@ -28,17 +29,17 @@ class Coords {
         float lon;
         int type;
         OglObj* oglObj = NULL;
-        std::vector<int> tileX;
-        std::vector<int> tileZ;
-        std::vector<int> x;
-        std::vector<int> y;
-        std::vector<int> z;
+        QVector<int> tileX;
+        QVector<int> tileZ;
+        QVector<int> x;
+        QVector<int> y;
+        QVector<int> z;
     };
     //struct Line {
 //
     //};
 
-    std::vector<Marker> markerList;
+    QVector<Marker> markerList;
     std::unordered_map<std::string, TextObj*> nameGl;
     //std::vector<Line> lineList;
 

CoordsGpx.cpp

@@ -54,7 +54,7 @@ CoordsGpx::CoordsGpx(QString path) {
 
             if (name.toUpper() == ("WPT")) {
                 placemark = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
                 float lat = 0;
                 float lon = 0;
                 if(attr.size() == 2){
@@ -79,7 +79,7 @@ CoordsGpx::CoordsGpx(QString path) {
                 }
             } else if (name.toUpper() == ("TRK")) {
                 placemark = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
             } else if (name.toUpper() == ("TRKPT")) {
                 float lat = 0;
                 float lon = 0;

CoordsKml.cpp

@@ -55,10 +55,10 @@ CoordsKml::CoordsKml(QString path) {
 
             if (name.toUpper() == ("PLACEMARK")) {
                 placemark = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
             } else if (name.toUpper() == ("PLACEMARK")) {
                 placemark = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
             } else if (name.toUpper() == ("COORDINATES")) {
                 if(placemark)
                     coordinates = true;

CoordsMkr.cpp

@@ -42,7 +42,7 @@ CoordsMkr::CoordsMkr(QString path) {
     while (!((sh = ParserX::NextTokenInside(data).toLower()) == "")) {
         //qDebug() << sh;
         if (sh == ("marker")) {
-            markerList.emplace_back();
+            markerList.push_back(Marker());
             markerList.back().lon = ParserX::GetNumber(data);
             markerList.back().lat = ParserX::GetNumber(data);
             markerList.back().name = ParserX::GetString(data);

CoordsRoutePlaces.cpp

@@ -35,7 +35,7 @@ CoordsRoutePlaces::CoordsRoutePlaces(TDB *tdb, QString place) {
         if (n->stationName.length() > 0 && place == "stations"){
             if(stations[n->stationName] == false){
                 stations[n->stationName] = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
                 markerList.back().name = n->stationName;
                 markerList.back().type = 0;
                 markerList.back().tileX.push_back(n->trItemRData[3]);
@@ -55,7 +55,7 @@ CoordsRoutePlaces::CoordsRoutePlaces(TDB *tdb, QString place) {
         if (n->type == "sidingitem" && n->platformName.length() > 0 && place == "sidings"){
             if(stations[n->platformName] == false){
                 stations[n->platformName] = true;
-                markerList.emplace_back();
+                markerList.push_back(Marker());
                 markerList.back().name = n->platformName;
                 markerList.back().type = 0;
                 markerList.back().tileX.push_back(n->trItemRData[3]);

Eng.cpp

@@ -564,8 +564,10 @@ void Eng::drawBorder3d(){
 void Eng::updateSim(float deltaTime){
     static float acceleration = 0;
     static float lastSpeed = 0;
+    // Use True for fake acceleration sound
+    static bool fakesound = true;
 
-    if(!Game::useNetworkEng){
+    if(!Game::useNetworkEng || fakesound){
     // Local Sound Speed test:
         static SoundDefinitionGroup::Stream::Curve curve1("SpeedControlled");
         static SoundDefinitionGroup::Stream::Curve curve2("SpeedControlled");
@@ -590,17 +592,17 @@ void Eng::updateSim(float deltaTime){
             curve = &curve1;
         }
 
-        static float acc = 0.1;
         if(soundVariables != NULL)
-            acc = curve->getValue(soundVariables);
+            acceleration = curve->getValue(soundVariables);
 
-        currentSpeed += acc*deltaTime;
+        currentSpeed += acceleration*deltaTime;
 
         // Static speed
-        currentSpeed = 37;
+        //currentSpeed = 40;
 
     // Network Speed
-    } else {
+    }
+    if(Game::useNetworkEng) {
         static IghCoordinate* igh = new IghCoordinate();
         static LatitudeLongitudeCoordinate* latlon = new LatitudeLongitudeCoordinate();
         static PreciseTileCoordinate* coords = new PreciseTileCoordinate();
@@ -624,8 +626,9 @@ void Eng::updateSim(float deltaTime){
         networkEng->writeData(data);
     } 
 
-    if(currentSpeed != lastSpeed)
+    if(currentSpeed != lastSpeed && !fakesound){
         acceleration = (currentSpeed - lastSpeed) / (deltaTime);
+    }
 
     //qDebug() << acceleration << currentSpeed << lastSpeed;
     if(soundVariables != NULL){