From 6a07af9e468143f48b1141525bdfcd7e0842a911 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Wed, 16 Dec 2020 15:15:40 +1100 Subject: [PATCH 10/23] remove assert() statements that reference non-existant variables --- src/Skybolt/SkyboltEngine/EntityFactory.cpp | 2 -- .../Sequence/JulianDateSequenceController.cpp | 1 - .../SkyboltSim/CameraController/CameraController.cpp | 2 +- src/Skybolt/SkyboltVis/RenderTarget/Viewport.cpp | 2 -- .../Renderable/Planet/Features/PlanetFeatures.cpp | 1 - .../SkyboltVis/Renderable/Planet/Tile/OsgTileFactory.cpp | 8 -------- 6 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/Skybolt/SkyboltEngine/EntityFactory.cpp b/src/Skybolt/SkyboltEngine/EntityFactory.cpp index 65c6113..53fbe22 100644 --- a/src/Skybolt/SkyboltEngine/EntityFactory.cpp +++ b/src/Skybolt/SkyboltEngine/EntityFactory.cpp @@ -465,8 +465,6 @@ EntityFactory::EntityFactory(const EntityFactory::Context& context, const std::v assert(context.simWorld); assert(context.stats); assert(context.tileSourceFactory); - assert(context.Scene); - assert(context.visWindow); mBuiltinTemplates = { {"SunBillboard", [this] {return createSun(); }}, diff --git a/src/Skybolt/SkyboltEngine/Sequence/JulianDateSequenceController.cpp b/src/Skybolt/SkyboltEngine/Sequence/JulianDateSequenceController.cpp index 7abfba2..069c0ff 100644 --- a/src/Skybolt/SkyboltEngine/Sequence/JulianDateSequenceController.cpp +++ b/src/Skybolt/SkyboltEngine/Sequence/JulianDateSequenceController.cpp @@ -16,7 +16,6 @@ JulianDateSequenceController::JulianDateSequenceController(const std::shared_ptr StateSequenceControllerT(sequence), mScenario(scenario) { - assert(mEntity); mInterpolator = std::make_unique( [this] (int i) { return mSequence->values[i].value; }); } diff --git a/src/Skybolt/SkyboltSim/CameraController/CameraController.cpp b/src/Skybolt/SkyboltSim/CameraController/CameraController.cpp index a73df97..3f29ac7 100644 --- a/src/Skybolt/SkyboltSim/CameraController/CameraController.cpp +++ b/src/Skybolt/SkyboltSim/CameraController/CameraController.cpp @@ -48,6 +48,6 @@ void CameraController::setTarget(Entity* entity) void CameraController::onDestroy(Entity* entity) { - assert(object == mTarget); + assert(entity == mTarget); setTarget(nullptr); } diff --git a/src/Skybolt/SkyboltVis/RenderTarget/Viewport.cpp b/src/Skybolt/SkyboltVis/RenderTarget/Viewport.cpp index f0b5b65..3240d23 100644 --- a/src/Skybolt/SkyboltVis/RenderTarget/Viewport.cpp +++ b/src/Skybolt/SkyboltVis/RenderTarget/Viewport.cpp @@ -14,8 +14,6 @@ using namespace skybolt::vis; Viewport::Viewport() : RenderTarget(new osg::Camera) { - assert(mWindow); - mOsgCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); mOsgCamera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); mOsgCamera->setClearColor(osg::Vec4(0, 0, 0, 0)); diff --git a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeatures.cpp b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeatures.cpp index 273cfeb..f580155 100644 --- a/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeatures.cpp +++ b/src/Skybolt/SkyboltVis/Renderable/Planet/Features/PlanetFeatures.cpp @@ -210,7 +210,6 @@ PlanetFeatures::PlanetFeatures(const PlanetFeaturesParams& params) : mPlanetRadius(params.planetRadius), mFeatures(createTile) { - assert(mLatLonElevationProvider); assert(mScheduler); for (int i = 0; i < PlanetFeaturesParams::featureGroupsSize; ++i) diff --git a/src/Skybolt/SkyboltVis/Renderable/Planet/Tile/OsgTileFactory.cpp b/src/Skybolt/SkyboltVis/Renderable/Planet/Tile/OsgTileFactory.cpp index 4b1daea..2d676f5 100644 --- a/src/Skybolt/SkyboltVis/Renderable/Planet/Tile/OsgTileFactory.cpp +++ b/src/Skybolt/SkyboltVis/Renderable/Planet/Tile/OsgTileFactory.cpp @@ -45,14 +45,6 @@ OsgTileFactory::OsgTileFactory(const OsgTileFactoryConfig& config) : mForestGeoVisibilityRange(config.forestGeoVisibilityRange), mHasCloudShadows(config.hasCloudShadows) { - assert(scheduler); - assert(programs); - - // FIXME: textureCompiler is currently unused, remove. - // It was originally used to pre-compile textures before used by the renderer, - // but it was found to be unnecessary because we throttle the amount of terrain tiles - // created each frame which limits the amount of texture compilation requred. - assert(textureCompiler); } OsgTile OsgTileFactory::createOsgTile(const QuadTreeTileKey& key, const Box2d& latLonBounds, const TileImage& heightImage, osg::Image* landMaskImage, -- 2.29.2