From 597ed14014df71748f24d42dbb937cdedc963fe6 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 13 May 2015 19:33:34 +0200 Subject: [PATCH] Fixing CREDITS file Removing many of clang warnings --- CREDITS | 6 ++++-- ext/ghoul | 2 +- gui/timelineview/CMakeLists.txt | 2 +- include/openspace/engine/openspaceengine.h | 1 - include/openspace/interaction/controller.h | 2 +- include/openspace/interaction/keyboardcontroller.h | 1 + include/openspace/interaction/mousecontroller.h | 1 + include/openspace/rendering/renderabletrail.h | 1 - src/engine/openspaceengine.cpp | 3 +-- src/gui/gui.cpp | 2 -- src/gui/guiperformancecomponent.cpp | 2 +- src/properties/selectionproperty.cpp | 6 ++---- src/rendering/model/renderablemodel.cpp | 12 ++++++------ src/rendering/model/wavefrontgeometry.cpp | 3 +-- src/rendering/planets/renderableplanet.cpp | 4 ++-- src/rendering/planets/renderableplanetprojection.cpp | 6 +++--- src/rendering/renderable.cpp | 12 ++++++------ src/rendering/renderablecrawlingline.cpp | 2 ++ src/rendering/renderablefieldlines.cpp | 8 ++++---- src/rendering/renderablefov.cpp | 2 +- src/rendering/renderablepath.cpp | 7 +++---- src/rendering/renderableplane.cpp | 2 +- src/rendering/renderableplaneprojection.cpp | 8 +++----- src/rendering/renderabletrail.cpp | 9 ++++----- src/rendering/renderablevolumegl.cpp | 4 ++-- src/rendering/renderengine.cpp | 4 ++-- src/scene/scenegraphnode.cpp | 2 +- src/util/camera.cpp | 10 +++++----- src/util/hongkangparser.cpp | 2 -- 29 files changed, 59 insertions(+), 67 deletions(-) diff --git a/CREDITS b/CREDITS index 29a39a8c52..d29402c4fb 100644 --- a/CREDITS +++ b/CREDITS @@ -1,4 +1,6 @@ Alexander Bock -Patric Ljung +Joakim Kilby Jonas Strandstedt -Hans-Christian Helltegen \ No newline at end of file +Hans-Christian Helltegen +Michal Marcinkowski +Anton Arbring \ No newline at end of file diff --git a/ext/ghoul b/ext/ghoul index e036e21f0f..bf2ab81efb 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit e036e21f0fb297cdd8aca0632478108ea5c0c063 +Subproject commit bf2ab81efbb379a7a4fd92c6d87dd10ca530c575 diff --git a/gui/timelineview/CMakeLists.txt b/gui/timelineview/CMakeLists.txt index 502487c9ed..f9687382ab 100644 --- a/gui/timelineview/CMakeLists.txt +++ b/gui/timelineview/CMakeLists.txt @@ -8,4 +8,4 @@ find_package(Qt5Widgets) find_package(Qt5Network) add_executable(TimelineView main.cpp mainwindow.cpp configurationwidget.cpp informationwidget.cpp controlwidget.cpp timelinewidget.cpp) #add_executable(TimelineView WIN32 main.cpp mainwindow.cpp configurationwidget.cpp informationwidget.cpp controlwidget.cpp timelinewidget.cpp) -target_link_libraries(TimelineView Qt5::Widgets Qt5::Network) \ No newline at end of file +target_link_libraries(TimelineView Qt5::Widgets Qt5::Network) diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h index 155a9f9e33..4e85dee7c3 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -117,7 +117,6 @@ private: ghoul::cmdparser::CommandlineParser* _commandlineParser; LuaConsole* _console; gui::GUI* _gui; - double _dt; bool _isMaster; SyncBuffer* _syncBuffer; diff --git a/include/openspace/interaction/controller.h b/include/openspace/interaction/controller.h index 0ddd97c67a..d1af77b0a3 100644 --- a/include/openspace/interaction/controller.h +++ b/include/openspace/interaction/controller.h @@ -40,7 +40,7 @@ public: Controller() : _handler(nullptr) {} - + void setHandler(InteractionHandler* handler); protected: diff --git a/include/openspace/interaction/keyboardcontroller.h b/include/openspace/interaction/keyboardcontroller.h index abad186567..5e2f01c26c 100644 --- a/include/openspace/interaction/keyboardcontroller.h +++ b/include/openspace/interaction/keyboardcontroller.h @@ -34,6 +34,7 @@ namespace interaction { class KeyboardController : public Controller { public: + virtual ~KeyboardController() {}; virtual void keyPressed(KeyAction action, Key key, KeyModifier modifier) = 0; }; diff --git a/include/openspace/interaction/mousecontroller.h b/include/openspace/interaction/mousecontroller.h index b3b6206a13..25b93ddf92 100644 --- a/include/openspace/interaction/mousecontroller.h +++ b/include/openspace/interaction/mousecontroller.h @@ -37,6 +37,7 @@ namespace interaction { class MouseController : public Controller { public: MouseController(); + virtual ~MouseController() {} virtual void button(MouseAction action, MouseButton button) = 0; virtual void move(float x, float y) = 0; diff --git a/include/openspace/rendering/renderabletrail.h b/include/openspace/rendering/renderabletrail.h index ed17ea3a21..38a66a5070 100644 --- a/include/openspace/rendering/renderabletrail.h +++ b/include/openspace/rendering/renderabletrail.h @@ -87,7 +87,6 @@ private: float _increment; double _oldTime = 0.0; - float _time; float _distanceFade; }; diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 0d32e117c4..bd846fcaec 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -98,8 +98,8 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName) , _commandlineParser(new ghoul::cmdparser::CommandlineParser(programName, true)) , _console(new LuaConsole) , _gui(new gui::GUI) - , _syncBuffer(nullptr) , _isMaster(false) + , _syncBuffer(nullptr) { SpiceManager::initialize(); Time::initialize(); @@ -592,7 +592,6 @@ void OpenSpaceEngine::preSynchronization() { void OpenSpaceEngine::postSynchronizationPreDraw() { Time::ref().postSynchronizationPreDraw(); - bool d = Time::ref().timeJumped(); _scriptEngine->postSynchronizationPreDraw(); _renderEngine->postSynchronizationPreDraw(); diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index a9414883ce..f022906ac1 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -115,7 +115,6 @@ namespace { for (int n = 0; n < nCommandLists; ++n) { const ImDrawList* cmd_list = commandLists[n]; int vtx_offset = cmd_offset; - const ImDrawCmd* pcmd_end = cmd_list->commands.end(); for (auto pcmd : cmd_list->commands) { glScissor((int)pcmd.clip_rect.x, (int)(height - pcmd.clip_rect.w), (int)(pcmd.clip_rect.z - pcmd.clip_rect.x), (int)(pcmd.clip_rect.w - pcmd.clip_rect.y)); glDrawArrays(GL_TRIANGLES, vtx_offset, pcmd.vtx_count); @@ -273,7 +272,6 @@ void GUI::startFrame(float deltaTime, } void GUI::endFrame() { - static bool show = true; renderMainWindow(); if (_property.isEnabled()) diff --git a/src/gui/guiperformancecomponent.cpp b/src/gui/guiperformancecomponent.cpp index 986bdad7f6..eca3734915 100644 --- a/src/gui/guiperformancecomponent.cpp +++ b/src/gui/guiperformancecomponent.cpp @@ -49,7 +49,7 @@ void GuiPerformanceComponent::deinitialize() { void GuiPerformanceComponent::render() { // Copy and paste from renderengine.cpp::storePerformanceMeasurements method - const int8_t Version = 0; +// const int8_t Version = 0; const int nValues = 250; const int lengthName = 256; const int maxValues = 256; diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp index 31fde408d1..56bcf2abd0 100644 --- a/src/properties/selectionproperty.cpp +++ b/src/properties/selectionproperty.cpp @@ -67,16 +67,14 @@ std::vector PropertyDelegate>>::fromLuaVa std::vector result; - if (!lua_istable(state, -1)) { + if (!lua_istable(state, VAL)) { LERROR("Parameter passed to the property is not a table"); success = false; return result; } lua_pushnil(state); - while (lua_next(state, -2) != 0) { - int valueType = lua_type(state, VAL); - + while (lua_next(state, KEY) != 0) { if (lua_isnumber(state, VAL)) { int number = static_cast(lua_tonumber(state, VAL)); result.push_back(number); diff --git a/src/rendering/model/renderablemodel.cpp b/src/rendering/model/renderablemodel.cpp index edea55ff3c..56077fcc63 100644 --- a/src/rendering/model/renderablemodel.cpp +++ b/src/rendering/model/renderablemodel.cpp @@ -63,14 +63,14 @@ namespace openspace { RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _colorTexturePath("colorTexture", "Color Texture") + , _performFade("performFading", "Perform Fading", false) + , _fading("fading", "Fade", 0) , _programObject(nullptr) , _texture(nullptr) - , _geometry(nullptr) - , _isGhost(false) - , _performShading("performShading", "Perform Shading", true) - , _alpha(1.f) - , _fading("fading", "Fade", 0) - , _performFade("performFading", "Perform Fading", false) + , _geometry(nullptr) + , _alpha(1.f) + , _isGhost(false) + , _performShading("performShading", "Perform Shading", true) { std::string name; bool success = dictionary.getValue(constants::scenegraphnode::keyName, name); diff --git a/src/rendering/model/wavefrontgeometry.cpp b/src/rendering/model/wavefrontgeometry.cpp index 23e88ab9f8..4d7df39c73 100644 --- a/src/rendering/model/wavefrontgeometry.cpp +++ b/src/rendering/model/wavefrontgeometry.cpp @@ -31,7 +31,7 @@ namespace { const std::string _loggerCat = "WavefrontGeometry"; const std::string keyObjFile = "ObjFile"; - const int8_t CurrentCacheVersion = 3; +// const int8_t CurrentCacheVersion = 3; } namespace openspace { @@ -87,7 +87,6 @@ bool WavefrontGeometry::loadModel(const std::string& filename) { // We add all shapes of the model into the same vertex array, one after the other // The _shapeCounts array stores for each shape, how many vertices that shape has size_t currentPosition = 0; - int currentIndices = 0; size_t p = 0; for (int i = 0; i < shapes.size(); ++i) { for (int j = 0; j < shapes[i].mesh.positions.size() / 3; ++j) { diff --git a/src/rendering/planets/renderableplanet.cpp b/src/rendering/planets/renderableplanet.cpp index 76fcf69dc9..3eddfe5e7b 100644 --- a/src/rendering/planets/renderableplanet.cpp +++ b/src/rendering/planets/renderableplanet.cpp @@ -56,15 +56,15 @@ namespace openspace { RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _colorTexturePath("colorTexture", "Color Texture") - , _nightTexturePath("") , _programObject(nullptr) , _texture(nullptr) , _nightTexture(nullptr) , _geometry(nullptr) , _performShading("performShading", "Perform Shading", true) , _rotation("rotation", "Rotation", 0, 0, 360) - , _hasNightTexture(false) , _alpha(1.f) + , _nightTexturePath("") + , _hasNightTexture(false) { std::string name; bool success = dictionary.getValue(constants::scenegraphnode::keyName, name); diff --git a/src/rendering/planets/renderableplanetprojection.cpp b/src/rendering/planets/renderableplanetprojection.cpp index 7251e347c5..cd60bde3e9 100644 --- a/src/rendering/planets/renderableplanetprojection.cpp +++ b/src/rendering/planets/renderableplanetprojection.cpp @@ -86,16 +86,16 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& : Renderable(dictionary) , _colorTexturePath("planetTexture", "RGB Texture") , _projectionTexturePath("projectionTexture", "RGB Texture") + , _rotation("rotation", "Rotation", 0, 0, 360) , _fadeProjection("fadeProjections", "Image Fading Factor", 0.f, 0.f, 1.f) + , _performProjection("performProjection", "Perform Projections", true) , _programObject(nullptr) , _fboProgramObject(nullptr) , _texture(nullptr) - , _textureProj(nullptr) , _textureOriginal(nullptr) + , _textureProj(nullptr) , _textureWhiteSquare(nullptr) , _geometry(nullptr) - , _rotation("rotation", "Rotation", 0, 0, 360) - , _performProjection("performProjection", "Perform Projections", true) { std::string name; bool success = dictionary.getValue(constants::scenegraphnode::keyName, name); diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 480ad11ebc..1f9e0780fb 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -71,12 +71,12 @@ Renderable* Renderable::createFromDictionary(const ghoul::Dictionary& dictionary } Renderable::Renderable(const ghoul::Dictionary& dictionary) - : _enabled("enabled", "Is Enabled", true), - _hasTimeInterval(false), - _startTime(""), - _endTime(""), - _targetBody(""), - _hasBody(false) + : _enabled("enabled", "Is Enabled", true) + , _startTime("") + , _endTime("") + , _targetBody("") + , _hasBody(false) + , _hasTimeInterval(false) { setName("renderable"); #ifndef NDEBUG diff --git a/src/rendering/renderablecrawlingline.cpp b/src/rendering/renderablecrawlingline.cpp index 125e9c4b5a..6daa76d840 100644 --- a/src/rendering/renderablecrawlingline.cpp +++ b/src/rendering/renderablecrawlingline.cpp @@ -165,6 +165,8 @@ void RenderableCrawlingLine::update(const UpdateData& data) { glm::dvec3 boresight; bool found = openspace::SpiceManager::ref().getFieldOfView(_source, shape, instrument, boresight, bounds); + if (!found) + LERROR("Could not find field of view for instrument"); glm::vec4 target(boresight[0], boresight[1], boresight[2], 14); target = tmp * target; diff --git a/src/rendering/renderablefieldlines.cpp b/src/rendering/renderablefieldlines.cpp index 4baa19bacb..06babef237 100644 --- a/src/rendering/renderablefieldlines.cpp +++ b/src/rendering/renderablefieldlines.cpp @@ -84,12 +84,12 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary) ) , _seedPointSource("source", "SeedPoint Source") , _seedPointSourceFile("sourceFile", "SeedPoint File") + , _program(nullptr) + , _programIsDirty(false) , _seedPointsAreDirty(true) , _fieldLinesAreDirty(true) - , _fieldlineVAO(0) - , _vertexPositionBuffer(0) - , _program(nullptr) - , _programIsDirty(false) + , _fieldlineVAO(0) + , _vertexPositionBuffer(0) { ghoul_assert( dictionary.hasKeyAndValue(constants::scenegraphnode::keyName), diff --git a/src/rendering/renderablefov.cpp b/src/rendering/renderablefov.cpp index a81d41c5ba..7f4f3fd54b 100644 --- a/src/rendering/renderablefov.cpp +++ b/src/rendering/renderablefov.cpp @@ -70,9 +70,9 @@ namespace openspace { RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _lineWidth("lineWidth", "Line Width", 1.f, 1.f, 20.f) + , _drawSolid("solidDraw", "Draw as Quads", false) , _programObject(nullptr) , _texture(nullptr) - , _drawSolid("solidDraw", "Draw as Quads", false) , _mode(GL_LINES) { bool success = dictionary.getValue(keyBody, _spacecraft); diff --git a/src/rendering/renderablepath.cpp b/src/rendering/renderablepath.cpp index 319b09998f..a5185ece21 100644 --- a/src/rendering/renderablepath.cpp +++ b/src/rendering/renderablepath.cpp @@ -60,13 +60,13 @@ RenderablePath::RenderablePath(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _lineFade("lineFade", "Line Fade", 0.75f, 0.f, 5.f) , _lineWidth("lineWidth", "Line Width", 2.f, 1.f, 20.f) + , _drawLine("drawline", "Draw Line", false) , _programObject(nullptr) , _programIsDirty(true) + , _successfullDictionaryFetch(true) , _vaoID(0) , _vBufferID(0) - , _successfullDictionaryFetch(true) , _needsSweep(true) - , _drawLine("drawline", "Draw Line", false) , _start(0.0) , _stop(0.0) { @@ -80,7 +80,7 @@ RenderablePath::RenderablePath(const ghoul::Dictionary& dictionary) dictionary.getValue(keyColor, color); _lineColor = color; - bool drawLine; + bool drawLine = false; if (dictionary.hasKeyAndValue(keyDrawLine)) dictionary.getValue(keyDrawLine, drawLine); _drawLine = drawLine; @@ -217,7 +217,6 @@ void RenderablePath::calculatePath(std::string observer) { //float r, g, b; //float g = _lineColor[1]; //float b = _lineColor[2]; - float a = 1.f; for (int i = 0; i < segments; i++) { correctPosition = SpiceManager::ref().getTargetPosition(_target, observer, _frame, "NONE", currentTime, pscPos, lightTime); pscPos[3] += 3; diff --git a/src/rendering/renderableplane.cpp b/src/rendering/renderableplane.cpp index 2212d527f3..a986c10985 100644 --- a/src/rendering/renderableplane.cpp +++ b/src/rendering/renderableplane.cpp @@ -55,8 +55,8 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary) , _origin(Origin::Center) , _shader(nullptr) , _programIsDirty(false) - , _texture(nullptr) , _textureIsDirty(false) + , _texture(nullptr) , _quad(0) , _vertexPositionBuffer(0) { diff --git a/src/rendering/renderableplaneprojection.cpp b/src/rendering/renderableplaneprojection.cpp index 57c85fb131..011423dc97 100644 --- a/src/rendering/renderableplaneprojection.cpp +++ b/src/rendering/renderableplaneprojection.cpp @@ -49,17 +49,16 @@ using namespace constants::renderableplaneprojection; RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& dictionary) : Renderable(dictionary) + , _texturePath("") + , _planeIsDirty(false) , _shader(nullptr) , _programIsDirty(false) + , _textureIsDirty(false) , _texture(nullptr) - , _textureIsDirty(false) , _quad(0) , _vertexPositionBuffer(0) , _name("ImagePlane") - , _texturePath("") - , _planeIsDirty(false) { - dictionary.getValue(keySpacecraft, _spacecraft); dictionary.getValue(keyInstrument, _instrument); dictionary.getValue(keyMoving, _moving); @@ -127,7 +126,6 @@ void RenderablePlaneProjection::render(const RenderData& data) { _shader->setUniform("ModelTransform", transform); setPscUniforms(_shader, &data.camera, data.position); - data.position; ghoul::opengl::TextureUnit unit; unit.activate(); _texture->bind(); diff --git a/src/rendering/renderabletrail.cpp b/src/rendering/renderabletrail.cpp index 9e6233131c..ac95eaa658 100644 --- a/src/rendering/renderabletrail.cpp +++ b/src/rendering/renderabletrail.cpp @@ -62,14 +62,14 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary) , _lineColor("lineColor", "Line Color") , _lineFade("lineFade", "Line Fade", 0.75f, 0.f, 5.f) , _lineWidth("lineWidth", "Line Width", 2.f, 1.f, 20.f) + , _showTimestamps("timestamps", "Show Timestamps", false) , _programObject(nullptr) , _programIsDirty(true) + , _successfullDictionaryFetch(true) , _vaoID(0) , _vBufferID(0) - , _oldTime(std::numeric_limits::max()) - , _successfullDictionaryFetch(true) , _needsSweep(true) - , _showTimestamps("timestamps", "Show Timestamps", false) + , _oldTime(std::numeric_limits::max()) { _successfullDictionaryFetch &= dictionary.getValue(keyBody, _target); _successfullDictionaryFetch &= dictionary.getValue(keyObserver, _observer); @@ -213,7 +213,7 @@ void RenderableTrail::update(const UpdateData& data) { // keep the first entry in the array floating and always pointing to the current date // As soon as the time difference between the current time and the last time is bigger // than the fixed distance, we need to create a new fixed point - double deltaTime = abs(data.time - _oldTime); + double deltaTime = std::abs(data.time - _oldTime); int nValues = static_cast(floor(deltaTime / _increment)); // Update the floating current time @@ -283,7 +283,6 @@ void RenderableTrail::fullYearSweep(double time) { _oldTime = time; psc pscPos; - bool validPosition = true; _vertexArray.resize(segments+2); for (int i = 0; i < segments+2; i++) { if (start > time) diff --git a/src/rendering/renderablevolumegl.cpp b/src/rendering/renderablevolumegl.cpp index b288ee45dc..80a2a583a8 100644 --- a/src/rendering/renderablevolumegl.cpp +++ b/src/rendering/renderablevolumegl.cpp @@ -52,10 +52,10 @@ RenderableVolumeGL::RenderableVolumeGL(const ghoul::Dictionary& dictionary) : RenderableVolume(dictionary) , _transferFunctionName("") , _volumeName("") - , _boxArray(0) - , _vertexPositionBuffer(0) , _volume(nullptr) , _transferFunction(nullptr) + , _boxArray(0) + , _vertexPositionBuffer(0) , _boxProgram(nullptr) , _boxScaling(1.0, 1.0, 1.0) , _w(0.f) diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index b547b90c63..c86e637293 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -223,13 +223,13 @@ namespace openspace { , _takeScreenshot(false) , _doPerformanceMeasurements(false) , _performanceMemory(nullptr) - , _visualizeABuffer(false) - , _visualizer(nullptr) , _globalBlackOutFactor(0.f) , _fadeDuration(2.f) , _currentFadeTime(0.f) , _fadeDirection(0) , _sgctRenderStatisticsVisible(false) + , _visualizeABuffer(false) + , _visualizer(nullptr) { _onScreenInformation = { glm::vec2(0.f), diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index d57109125e..f0e13470fa 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -126,10 +126,10 @@ SceneGraphNode* SceneGraphNode::createFromDictionary(const ghoul::Dictionary& di SceneGraphNode::SceneGraphNode() : _parent(nullptr) , _ephemeris(new StaticEphemeris) + , _performanceRecord({0, 0, 0}) , _renderable(nullptr) , _renderableVisible(false) , _boundingSphereVisible(false) - , _performanceRecord({0, 0, 0}) { } diff --git a/src/util/camera.cpp b/src/util/camera.cpp index b7625c4826..3ee138bfd4 100644 --- a/src/util/camera.cpp +++ b/src/util/camera.cpp @@ -38,23 +38,23 @@ namespace openspace { Camera::Camera() : _maxFov(0.f) , _sinMaxFov(0.f) - , _localPosition() , _viewProjectionMatrix() , _modelMatrix() , _viewMatrix() , _projectionMatrix() , _viewDirection(0,0,-1) , _cameraDirection(0.f, 0.f, 0.f) - , _localScaling(1.f, 0.f) + , _focusPosition() //, _viewRotation(glm::quat(glm::vec3(0.f, 0.f, 0.f))) , _localViewRotationMatrix(1.f) + , _localScaling(1.f, 0.f) + , _localPosition() + , _sharedScaling(1.f, 0.f) , _sharedPosition() - , _sharedScaling(1.f, 0.f) , _sharedViewRotationMatrix(1.f) - , _syncedPosition() , _syncedScaling(1.f, 0.f) + , _syncedPosition() , _syncedViewRotationMatrix(1.f) - , _focusPosition() { } diff --git a/src/util/hongkangparser.cpp b/src/util/hongkangparser.cpp index b168f0e1a1..5622183ec5 100644 --- a/src/util/hongkangparser.cpp +++ b/src/util/hongkangparser.cpp @@ -129,8 +129,6 @@ void HongKangParser::create(){ std::string cameraTarget = "VOID"; std::string scannerTarget = "VOID"; - int counter = 0; - while (!file.eof()){//only while inte do, FIX std::getline(file, line);