From 084f730163de6abcc236599e2bff6dec50ed802b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hermann=20H=C3=B6hne?= <hoe@fh-wedel.de>
Date: Tue, 12 Mar 2019 14:26:59 +0100
Subject: [PATCH] Adapted to compile on Linux (Ubuntu 18.04).
---
OpenRoadEd/Cephes/fresnl.cpp | 2 +-
OpenRoadEd/OpenDrive/Junction.h | 14 ++---
OpenRoadEd/OpenDrive/Lane.h | 6 +--
OpenRoadEd/OpenDrive/OpenDrive.h | 6 +--
OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp | 2 +-
OpenRoadEd/OpenDrive/OpenDriveXmlParser.h | 6 +--
OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp | 2 +-
OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h | 6 +--
OpenRoadEd/OpenDrive/OtherStructures.h | 4 +-
OpenRoadEd/OpenDrive/Road.h | 6 +--
OpenRoadEd/OpenDrive/RoadGeometry.h | 6 +--
OpenRoadEd/Osg/OSGCameraControls2.h | 6 +--
OpenRoadEd/Osg/OSGJunction.cpp | 2 +-
OpenRoadEd/Osg/OSGMain.cpp | 53 ++++++++++---------
OpenRoadEd/Osg/OSGMain.h | 12 ++---
OpenRoadEd/Osg/OSGObjectNode.h | 2 +-
OpenRoadEd/Osg/OSGRoad.cpp | 2 +-
.../Qt/ConfigDialogs/ReferencePlaneDialog.h | 2 +-
OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h | 2 +-
.../Qt/CreationWidgets/CreationAllRoad.h | 4 +-
OpenRoadEd/Qt/CreationWidgets/CreationPage.h | 4 +-
OpenRoadEd/Qt/CreationWidgets/DeleteAll.h | 2 +-
OpenRoadEd/Qt/MainWindow.h | 2 +-
OpenRoadEd/Qt/QOSGWidget.cpp | 4 +-
OpenRoadEd/Qt/QOSGWidget.h | 3 +-
OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h | 3 +-
OpenRoadEd/main.cpp | 2 +-
27 files changed, 82 insertions(+), 83 deletions(-)
diff --git a/OpenRoadEd/Cephes/fresnl.cpp b/OpenRoadEd/Cephes/fresnl.cpp
index 2632c85..8a99ab1 100644
--- a/OpenRoadEd/Cephes/fresnl.cpp
+++ b/OpenRoadEd/Cephes/fresnl.cpp
@@ -455,7 +455,7 @@ extern "C" {double p1evl ( double, double *, int );}
#else
double fabs(), cos(), sin(), polevl(), p1evl();
#endif
-extern "C" {double PI, PIO2, MACHEP;}
+extern "C" {extern double PI, PIO2, MACHEP;}
//int fresnl( xxa, ssa, cca )
//double xxa, *ssa, *cca;
diff --git a/OpenRoadEd/OpenDrive/Junction.h b/OpenRoadEd/OpenDrive/Junction.h
index 6e42539..45d5fc8 100644
--- a/OpenRoadEd/OpenDrive/Junction.h
+++ b/OpenRoadEd/OpenDrive/Junction.h
@@ -129,13 +129,13 @@ public:
* Return the pointer to the last junction connection
* @return A pointer to JunctionConnection object
*/
- JunctionConnection* Junction::GetLastJunctionConnection();
+ JunctionConnection* GetLastJunctionConnection();
/**
* Return the pointer to the last added junction connection (which might not be the one from the end of the vector)
* @return A pointer to JunctionConnection object
*/
- JunctionConnection* Junction::GetLastAddedJunctionConnection();
+ JunctionConnection* GetLastAddedJunctionConnection();
/**
* Return the vector that stores junction priority records
@@ -160,14 +160,14 @@ public:
* Return the pointer to the last junction priority record
* @return A pointer to JunctionPriorityRoad object
*/
- JunctionPriorityRoad* Junction::GetLastJunctionPriority();
+ JunctionPriorityRoad* GetLastJunctionPriority();
/**
* Return the pointer to the last added junction priority record (which might not be the one from the end of the vector)
* @return A pointer to JunctionPriorityRoad object
*/
- JunctionPriorityRoad* Junction::GetLastAddedJunctionPriority();
+ JunctionPriorityRoad* GetLastAddedJunctionPriority();
/**
* Return the vector that stores junction controller records
@@ -192,13 +192,13 @@ public:
* Return the pointer to the last junction controller record
* @return A pointer to JunctionController object
*/
- JunctionController* Junction::GetLastJunctionController();
+ JunctionController* GetLastJunctionController();
/**
* Return the pointer to the last added junction controller record (which might not be the one from the end of the vector)
* @return A pointer to JunctionController object
*/
- JunctionController* Junction::GetLastAddedJunctionController();
+ JunctionController* GetLastAddedJunctionController();
};
@@ -467,4 +467,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/Lane.h b/OpenRoadEd/OpenDrive/Lane.h
index ecf6eec..652d4b5 100644
--- a/OpenRoadEd/OpenDrive/Lane.h
+++ b/OpenRoadEd/OpenDrive/Lane.h
@@ -3,8 +3,8 @@
#include "Road.h"
#include "OtherStructures.h"
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
//Prototypes
@@ -770,4 +770,4 @@ public:
//----------------------------------------------------------------------------------
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDrive.h b/OpenRoadEd/OpenDrive/OpenDrive.h
index dffcec1..ff02a23 100644
--- a/OpenRoadEd/OpenDrive/OpenDrive.h
+++ b/OpenRoadEd/OpenDrive/OpenDrive.h
@@ -1,8 +1,8 @@
#ifndef OPENDRIVE_H
#define OPENDRIVE_H
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
#include "Road.h"
//--Prototypes--
@@ -164,4 +164,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
index dc2c8e6..cd0dc29 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.cpp
@@ -1,7 +1,7 @@
#include "OpenDriveXmlParser.h"
#include <iostream>
#include <algorithm>
-#include "windows.h"
+//#include "windows.h"
using std::cout;
using std::endl;
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
index 448e1b2..b451a58 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlParser.h
@@ -1,8 +1,8 @@
#ifndef OPENDRIVEXMLPARSER_H
#define OPENDRIVEXMLPARSER_H
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
#include <iostream>
#include <fstream>
@@ -83,4 +83,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
index d0099af..dad34f2 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.cpp
@@ -1,7 +1,7 @@
#include "OpenDriveXmlWriter.h"
#include <iostream>
#include <algorithm>
-#include "windows.h"
+//#include "windows.h"
using std::cout;
using std::endl;
diff --git a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
index 1ca76d6..2b51002 100644
--- a/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
+++ b/OpenRoadEd/OpenDrive/OpenDriveXmlWriter.h
@@ -1,8 +1,8 @@
#ifndef OPENDRIVEXMLWRITER_H
#define OPENDRIVEXMLWRITER_H
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
#include <iostream>
#include <iomanip>
@@ -84,4 +84,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/OtherStructures.h b/OpenRoadEd/OpenDrive/OtherStructures.h
index 493464f..ee37f27 100644
--- a/OpenRoadEd/OpenDrive/OtherStructures.h
+++ b/OpenRoadEd/OpenDrive/OtherStructures.h
@@ -1,6 +1,6 @@
#ifndef OTHERSTRUCTURES_H
#define OTHERSTRUCTURES_H
-#include <String>
+#include <string>
using std::string;
/**
@@ -63,4 +63,4 @@ public:
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/Road.h b/OpenRoadEd/OpenDrive/Road.h
index b56392d..3e65753 100644
--- a/OpenRoadEd/OpenDrive/Road.h
+++ b/OpenRoadEd/OpenDrive/Road.h
@@ -1,8 +1,8 @@
#ifndef ROAD_H
#define ROAD_H
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
#include "RoadGeometry.h"
#include "Lane.h"
@@ -486,4 +486,4 @@ public:
//----------------------------------------------------------------------------------
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/OpenDrive/RoadGeometry.h b/OpenRoadEd/OpenDrive/RoadGeometry.h
index 2f2291d..52983c7 100644
--- a/OpenRoadEd/OpenDrive/RoadGeometry.h
+++ b/OpenRoadEd/OpenDrive/RoadGeometry.h
@@ -1,8 +1,8 @@
#ifndef ROADGEOMETRY_H
#define ROADGEOMETRY_H
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
//Prototypes
class RoadGeometry;
@@ -383,4 +383,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Osg/OSGCameraControls2.h b/OpenRoadEd/Osg/OSGCameraControls2.h
index 42003a7..0630980 100644
--- a/OpenRoadEd/Osg/OSGCameraControls2.h
+++ b/OpenRoadEd/Osg/OSGCameraControls2.h
@@ -3,7 +3,7 @@
#include <osg/Matrixd>
-#include <osgGA/MatrixManipulator>
+#include <osgGA/CameraManipulator>
/**
* Free look camera that moves along the ground plane and along the vertical axis.
@@ -12,7 +12,7 @@
* Movement along the ground plane: Space + Right mouse button
* Movement along the vertical axis: Space + Middle mouse button
*/
-class OSGCameraControls2 : public osgGA::MatrixManipulator
+class OSGCameraControls2 : public osgGA::CameraManipulator
{
public:
/**
@@ -109,4 +109,4 @@ protected:
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Osg/OSGJunction.cpp b/OpenRoadEd/Osg/OSGJunction.cpp
index 031936e..7d6646e 100644
--- a/OpenRoadEd/Osg/OSGJunction.cpp
+++ b/OpenRoadEd/Osg/OSGJunction.cpp
@@ -4,7 +4,7 @@
#include "OSGConstants.h"
#include "OSGRoad.h"
#include <sstream> //debug (convert double to string)
-#include "windows.h" //debug (OutputDebugString)
+//#include "windows.h" //debug (OutputDebugString)
#include <osg/Geometry>
#include <osgUtil/DelaunayTriangulator>
diff --git a/OpenRoadEd/Osg/OSGMain.cpp b/OpenRoadEd/Osg/OSGMain.cpp
index 5500b4f..cef279c 100644
--- a/OpenRoadEd/Osg/OSGMain.cpp
+++ b/OpenRoadEd/Osg/OSGMain.cpp
@@ -1,5 +1,5 @@
#include <sstream> //debug (convert double to string)
-#include "windows.h" //debug (OutputDebugString)
+//#include "windows.h" //debug (OutputDebugString)
#include <iostream>
@@ -12,9 +12,10 @@
#include <osg/MatrixTransform>
#include <osg/Notify>
-#include "osgMain.h"
+#include "OSGMain.h"
#include "OSGCameraControls.h"
#include "OSGCameraControls2.h"
+#include <osgGA/KeySwitchMatrixManipulator>
#include "OSGConstants.h"
@@ -90,12 +91,12 @@ OSGMain::OSGMain(OpenDrive* openDrive)
* @param width,height Dimensions of the viewer
* @param window Window handler
*/
-void OSGMain::initViewer(int x, int y, int width, int height, HWND window)
+void OSGMain::initViewer(int x, int y, int width, int height/*, HWND window*/)
{
mViewer = new osgViewer::Viewer;
mViewer->setKeyEventSetsDone(0);
- createContext(x,y,width,height,window);
+ createContext(x,y,width,height/*,window*/);
//mViewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
@@ -180,7 +181,7 @@ void OSGMain::frame()
/**
* Creates the window context
*/
-void OSGMain::createContext(int x, int y, int width, int height, HWND window)
+void OSGMain::createContext(int x, int y, int width, int height/*, HWND window*/)
{
// Sets the properties of the window and prepares it for renderin
@@ -205,7 +206,7 @@ void OSGMain::createContext(int x, int y, int width, int height, HWND window)
traits->sampleBuffers = ds->getMultiSamples();
traits->samples = ds->getNumMultiSamples();
- traits->inheritedWindowData = new WindowData(window);
+ //traits->inheritedWindowData = new WindowData(window);
if (ds->getStereo())
{
@@ -295,9 +296,9 @@ void OSGMain::DrawRoadChordLine()
ss<<"Road ChordLine generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str.append(ss.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
}
@@ -369,9 +370,9 @@ void OSGMain::DrawRoads()
ss<<"Road generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str.append(ss.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
}
@@ -463,9 +464,9 @@ void OSGMain::DrawJunctions()
ss<<"Junction generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str.append(ss.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
}
/**
@@ -525,9 +526,9 @@ void OSGMain::DrawScenery(std::string heightMapFile, std::string terrainFile, do
ss<<"HeightMap generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str.append(ss.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
/////////////////////////////////////////////////////////////////////////////////////
//start Timer for statistics
@@ -549,9 +550,9 @@ void OSGMain::DrawScenery(std::string heightMapFile, std::string terrainFile, do
ss2<<"Scenery generation completed in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str2.append(ss2.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str2.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str2.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
}
/**
@@ -796,7 +797,7 @@ OSGObjectNode* OSGMain::PickNode(float x, float y)
if (!hit->nodePath.empty())
{
//Get the path to the picked node
- osg::NodePath* nodePath=&(hit->nodePath);
+ const osg::NodePath* nodePath=&(hit->nodePath);
//Get the selected object
osg::Node* node = nodePath->back();
@@ -916,9 +917,9 @@ OSGObjectNode* OSGMain::PickNode(float x, float y)
ss<<"Picked in "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
str.append(ss.str());
//Output to the debug window
- OutputDebugString( "\n" ) ;
- OutputDebugString( str.c_str() ) ;
- OutputDebugString( "\n" ) ;
+ //OutputDebugString( "\n" ) ;
+ //OutputDebugString( str.c_str() ) ;
+ //OutputDebugString( "\n" ) ;
}
///////////////////////////////////////////////
@@ -1587,4 +1588,4 @@ void OSGMain::Clear()
mOsgScenery=new OSGScenery;
mCurrentlySelected.ClearNodeInfoIndices();
-}
\ No newline at end of file
+}
diff --git a/OpenRoadEd/Osg/OSGMain.h b/OpenRoadEd/Osg/OSGMain.h
index 7797a0d..05d8d1b 100644
--- a/OpenRoadEd/Osg/OSGMain.h
+++ b/OpenRoadEd/Osg/OSGMain.h
@@ -9,18 +9,18 @@
#include <osgViewer/Viewer>
#include <osgViewer/GraphicsWindow>
#include <osgViewer/ViewerEventHandlers>
-#include <osgViewer/api/Win32/GraphicsWindowWin32>
+//#include <osgViewer/api/Win32/GraphicsWindowWin32>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
-#include <osgGA/KeySwitchMatrixManipulator>
+//#include <osgGA/KeySwitchMatrixManipulator>
#include <osgGA/StateSetManipulator>
#include <osgGA/AnimationPathManipulator>
#include <osgGA/TerrainManipulator>
-typedef osgViewer::GraphicsWindowWin32::WindowData WindowData;
+//typedef osgViewer::GraphicsWindowWin32::WindowData WindowData;
#include "../OpenDrive/OpenDrive.h"
@@ -91,7 +91,7 @@ private:
/**
*
*/
- void createContext(int x, int y, int widht, int height, HWND window);
+ void createContext(int x, int y, int widht, int height/*, HWND window*/);
public:
//--------------
@@ -109,7 +109,7 @@ public:
* @param width,height Dimensions of the viewer
* @param window Window handler
*/
- void initViewer(int x, int y, int width, int height, HWND window);
+ void initViewer(int x, int y, int width, int height/*, HWND window*/);
/**
* Load a mode
@@ -238,7 +238,7 @@ public:
* Pick a 3D object from the viewport
* @param x, y coordinates of the cursor at which to pick the objects
*/
- OSGObjectNode* OSGMain::PickNode(float x, float y);
+ OSGObjectNode* PickNode(float x, float y);
/**
* Depending on the node type and the hierarchycal index array, find it in the structure
diff --git a/OpenRoadEd/Osg/OSGObjectNode.h b/OpenRoadEd/Osg/OSGObjectNode.h
index 15d9932..2a1457d 100644
--- a/OpenRoadEd/Osg/OSGObjectNode.h
+++ b/OpenRoadEd/Osg/OSGObjectNode.h
@@ -4,7 +4,7 @@
#include <osg/Node>
#include <osg/Geode>
#include <osg/Billboard>
-#include <Vector>
+#include <vector>
/**
* Enumeration type that contains all the OpenDRIVE available records
diff --git a/OpenRoadEd/Osg/OSGRoad.cpp b/OpenRoadEd/Osg/OSGRoad.cpp
index cfd2e66..22dd98a 100644
--- a/OpenRoadEd/Osg/OSGRoad.cpp
+++ b/OpenRoadEd/Osg/OSGRoad.cpp
@@ -2,7 +2,7 @@
#include <fstream>
#include <iostream>
#include <sstream> //debug (convert double to string)
-#include "windows.h" //debug (OutputDebugString)
+//#include "windows.h" //debug (OutputDebugString)
#include <osg/Point>
#include <osg/Material>
#include <osg/Texture2D>
diff --git a/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h b/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
index 8368915..d558a88 100644
--- a/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
+++ b/OpenRoadEd/Qt/ConfigDialogs/ReferencePlaneDialog.h
@@ -93,4 +93,4 @@ private slots:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h b/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
index 4d50a85..ce0bf56 100644
--- a/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
+++ b/OpenRoadEd/Qt/ConfigDialogs/SceneryDialog.h
@@ -81,4 +81,4 @@ private slots:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h b/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
index c2a1b52..a01d5f9 100644
--- a/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
+++ b/OpenRoadEd/Qt/CreationWidgets/CreationAllRoad.h
@@ -8,7 +8,7 @@
#include "../../OpenDrive/OpenDrive.h"
#include "../../OpenDrive/RoadGeometry.h"
#include "../Tree/RoadTree.h"
-#include "../../Osg/OsgMain.h"
+#include "../../Osg/OSGMain.h"
/**
* Class that holds all the buttons used to create road related records
@@ -106,4 +106,4 @@ signals:
void RoadChanged(bool recalculateRoad);
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/CreationPage.h b/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
index 83ed0e4..a25224e 100644
--- a/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
+++ b/OpenRoadEd/Qt/CreationWidgets/CreationPage.h
@@ -7,7 +7,7 @@
#include "../../OpenDrive/OpenDrive.h"
#include "../Tree/RoadTree.h"
-#include "../../Osg/OsgMain.h"
+#include "../../Osg/OSGMain.h"
#include "CreationAllRoad.h"
#include "CreationAllJunction.h"
@@ -67,4 +67,4 @@ signals:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h b/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
index 9820053..b44a91e 100644
--- a/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
+++ b/OpenRoadEd/Qt/CreationWidgets/DeleteAll.h
@@ -62,4 +62,4 @@ signals:
void RoadChanged(bool recalculateRoad);
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/MainWindow.h b/OpenRoadEd/Qt/MainWindow.h
index 78f10de..02d4a68 100644
--- a/OpenRoadEd/Qt/MainWindow.h
+++ b/OpenRoadEd/Qt/MainWindow.h
@@ -213,4 +213,4 @@ private slots:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/QOSGWidget.cpp b/OpenRoadEd/Qt/QOSGWidget.cpp
index 8790b91..f247748 100644
--- a/OpenRoadEd/Qt/QOSGWidget.cpp
+++ b/OpenRoadEd/Qt/QOSGWidget.cpp
@@ -29,7 +29,7 @@ void QOSGWidget::Init(RoadTree *roadTree)
mRoadTree=roadTree;
// Updates the size of the 3D viewport
- mOsgMain->initViewer(x(),y(),width(),height(),winId());
+ mOsgMain->initViewer(x(),y(),width(),height()/*,winId()*/);
setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_NoSystemBackground);
@@ -354,4 +354,4 @@ void QOSGWidget::OnRoadRecalculated(unsigned int index)
// Redraw the recalculated road and it's chord line
mOsgMain->RedrawRoad(index);
mOsgMain->RedrawRoadChordLine(index);
-}
\ No newline at end of file
+}
diff --git a/OpenRoadEd/Qt/QOSGWidget.h b/OpenRoadEd/Qt/QOSGWidget.h
index 7d1e4e5..6172a4f 100644
--- a/OpenRoadEd/Qt/QOSGWidget.h
+++ b/OpenRoadEd/Qt/QOSGWidget.h
@@ -9,7 +9,6 @@ using Qt::WindowFlags;
#include "Tree/RoadTree.h"
#include "../Osg/OSGMain.h"
-
/**
* OSG widget class used as a 3D viewport
*
@@ -111,4 +110,4 @@ private slots:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h b/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
index 5c488f7..af1d6f2 100644
--- a/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
+++ b/OpenRoadEd/Qt/ToolsDialogs/LoadingDialog.h
@@ -6,7 +6,6 @@
#include <QtCore/QSettings>
#include "../../Osg/OSGMain.h"
-
/**
* "Loading" dialog
*
@@ -23,4 +22,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff --git a/OpenRoadEd/main.cpp b/OpenRoadEd/main.cpp
index 569c791..3a76050 100644
--- a/OpenRoadEd/main.cpp
+++ b/OpenRoadEd/main.cpp
@@ -33,4 +33,4 @@ int main(int argc, char *argv[])
// Runs the application
return app.exec();
-}
\ No newline at end of file
+}
--
GitLab