From 375e5c656192c4dcc4ab8f3858f0809acc8bcb33 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 1 Mar 2023 11:48:21 -0700 Subject: [PATCH] Tracy Update (#2534) * Update the Tracy repository * Update submodules --- apps/OpenSpace/ext/sgct | 2 +- apps/OpenSpace/main.cpp | 90 +++++++++---------- ext/ghoul | 2 +- .../rendering/atmospheredeferredcaster.cpp | 30 +++---- .../rendering/renderableatmosphere.cpp | 2 +- modules/base/dashboard/dashboarditemangle.cpp | 4 +- modules/base/dashboard/dashboarditemdate.cpp | 4 +- .../base/dashboard/dashboarditemdistance.cpp | 4 +- .../dashboard/dashboarditemelapsedtime.cpp | 4 +- .../base/dashboard/dashboarditemframerate.cpp | 4 +- .../dashboard/dashboarditeminputstate.cpp | 4 +- .../base/dashboard/dashboarditemmission.cpp | 4 +- .../dashboarditemparallelconnection.cpp | 4 +- .../dashboard/dashboarditempropertyvalue.cpp | 4 +- .../dashboarditemsimulationincrement.cpp | 4 +- modules/base/dashboard/dashboarditemtext.cpp | 4 +- .../base/dashboard/dashboarditemvelocity.cpp | 4 +- .../lightsource/scenegraphlightsource.cpp | 2 +- modules/base/rendering/renderablelabel.cpp | 2 +- modules/base/rendering/renderablemodel.cpp | 4 +- modules/base/rendering/renderableplane.cpp | 8 +- .../rendering/renderableplaneimagelocal.cpp | 4 +- .../renderableplanetimevaryingimage.cpp | 2 +- modules/base/rendering/renderabletrail.cpp | 6 +- modules/base/rotation/fixedrotation.cpp | 2 +- modules/cefwebgui/cefwebguimodule.cpp | 20 ++--- .../rendering/renderablebillboardscloud.cpp | 18 ++-- .../rendering/renderableplanescloud.cpp | 4 +- .../rendering/renderablepoints.cpp | 4 +- modules/galaxy/rendering/galaxyraycaster.cpp | 2 +- modules/galaxy/rendering/renderablegalaxy.cpp | 4 +- modules/globebrowsing/globebrowsingmodule.cpp | 8 +- .../src/asynctiledataprovider.cpp | 8 +- .../src/dashboarditemglobelocation.cpp | 4 +- modules/globebrowsing/src/gdalwrapper.cpp | 2 +- .../src/globelabelscomponent.cpp | 2 +- modules/globebrowsing/src/gpulayergroup.cpp | 2 +- modules/globebrowsing/src/layer.cpp | 6 +- modules/globebrowsing/src/layergroup.cpp | 8 +- modules/globebrowsing/src/layermanager.cpp | 16 ++-- modules/globebrowsing/src/lrucache.inl | 2 +- .../src/memoryawaretilecache.cpp | 18 ++-- .../globebrowsing/src/rawtiledatareader.cpp | 8 +- modules/globebrowsing/src/renderableglobe.cpp | 62 ++++++------- modules/globebrowsing/src/ringscomponent.cpp | 6 +- modules/globebrowsing/src/shadowcomponent.cpp | 4 +- .../src/tileprovider/defaulttileprovider.cpp | 6 +- .../imagesequencetileprovider.cpp | 4 +- .../tileprovider/singleimagetileprovider.cpp | 4 +- .../sizereferencetileprovider.cpp | 4 +- .../src/tileprovider/spoutimageprovider.cpp | 6 +- .../src/tileprovider/temporaltileprovider.cpp | 14 +-- .../src/tileprovider/texttileprovider.cpp | 10 +-- .../tileprovider/tileindextileprovider.cpp | 2 +- .../src/tileprovider/tileprovider.cpp | 14 +-- .../src/tileprovider/tileproviderbyindex.cpp | 4 +- .../src/tileprovider/tileproviderbylevel.cpp | 6 +- modules/globebrowsing/src/timequantizer.cpp | 4 +- modules/imgui/imguimodule.cpp | 10 +-- modules/iswa/iswamodule.cpp | 2 +- modules/server/servermodule.cpp | 10 +-- modules/server/src/connection.cpp | 8 +- modules/server/src/topics/timetopic.cpp | 2 +- modules/server/src/topics/topic.cpp | 4 +- .../skybrowser/src/renderableskytarget.cpp | 2 +- .../dashboard/dashboarditeminstruments.cpp | 2 +- .../spacecraftinstrumentsmodule.cpp | 2 +- modules/touch/src/directinputsolver.cpp | 2 +- modules/webbrowser/src/browserinstance.cpp | 4 +- modules/webbrowser/src/cefhost.cpp | 2 +- modules/webbrowser/webbrowsermodule.cpp | 8 +- modules/webgui/webguimodule.cpp | 2 +- src/documentation/documentationengine.cpp | 2 +- src/engine/globals.cpp | 11 ++- src/engine/globalscallbacks.cpp | 2 +- src/engine/moduleengine.cpp | 10 +-- src/engine/openspaceengine.cpp | 72 +++++++-------- src/engine/syncengine.cpp | 4 +- src/interaction/keybindingmanager.cpp | 2 +- src/interaction/sessionrecording.cpp | 4 +- src/navigation/navigationhandler.cpp | 4 +- src/network/parallelpeer.cpp | 2 +- src/properties/propertyowner.cpp | 4 +- src/rendering/dashboard.cpp | 2 +- src/rendering/framebufferrenderer.cpp | 48 +++++----- src/rendering/helper.cpp | 4 +- src/rendering/loadingscreen.cpp | 6 +- src/rendering/luaconsole.cpp | 8 +- src/rendering/renderable.cpp | 2 +- src/rendering/renderengine.cpp | 44 ++++----- src/rendering/screenspacerenderable.cpp | 2 +- src/scene/asset.cpp | 8 +- src/scene/assetmanager.cpp | 30 +++---- src/scene/profile.cpp | 8 +- src/scene/scene.cpp | 12 +-- src/scene/scenegraphnode.cpp | 26 +++--- src/scene/scenelicensewriter.cpp | 2 +- src/scripting/scriptengine.cpp | 34 +++---- src/util/openspacemodule.cpp | 16 ++-- src/util/spicemanager.cpp | 2 +- src/util/syncbuffer.cpp | 4 +- src/util/time.cpp | 2 +- src/util/timemanager.cpp | 16 ++-- 103 files changed, 472 insertions(+), 471 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 6f24259a55..364b647fbc 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 6f24259a5560116e06f46f010c54a72ad620e80f +Subproject commit 364b647fbcdae10741e7cb3cbf1010f6404cbc2d diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index beb302cd68..b954fba28a 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include @@ -275,7 +275,7 @@ bool isGuiWindow(sgct::Window* window) { // Init function // void mainInitFunc(GLFWwindow*) { - ZoneScoped + ZoneScoped; LTRACE("main::mainInitFunc(begin)"); @@ -392,7 +392,7 @@ void mainInitFunc(GLFWwindow*) { void mainPreSyncFunc() { - ZoneScoped + ZoneScoped; LTRACE("main::mainPreSyncFunc(begin)"); try { @@ -412,7 +412,7 @@ void mainPreSyncFunc() { void mainPostSyncPreDrawFunc() { - ZoneScoped + ZoneScoped; #ifdef OPENSPACE_HAS_NVTOOLS nvtxRangePush("postSyncPreDraw"); @@ -438,7 +438,7 @@ void mainPostSyncPreDrawFunc() { void mainRenderFunc(const sgct::RenderData& data) { - ZoneScoped + ZoneScoped; #ifdef OPENSPACE_HAS_NVTOOLS nvtxRangePush("render"); @@ -526,7 +526,7 @@ void mainRenderFunc(const sgct::RenderData& data) { void mainDraw2DFunc(const sgct::RenderData& data) { - ZoneScoped + ZoneScoped; LTRACE("main::mainDraw2DFunc(begin)"); currentWindow = &data.window; @@ -551,7 +551,7 @@ void mainDraw2DFunc(const sgct::RenderData& data) { void mainPostDrawFunc() { - ZoneScoped + ZoneScoped; LTRACE("main::mainPostDrawFunc(begin)"); #ifdef OPENVR_SUPPORT @@ -571,7 +571,7 @@ void mainPostDrawFunc() { void mainKeyboardCallback(sgct::Key key, sgct::Modifier modifiers, sgct::Action action, int, sgct::Window* window) { - ZoneScoped + ZoneScoped; LTRACE("main::mainKeyboardCallback(begin)"); const openspace::Key k = openspace::Key(key); @@ -589,7 +589,7 @@ void mainKeyboardCallback(sgct::Key key, sgct::Modifier modifiers, sgct::Action void mainMouseButtonCallback(sgct::MouseButton key, sgct::Modifier modifiers, sgct::Action action, sgct::Window* window) { - ZoneScoped + ZoneScoped; LTRACE("main::mainMouseButtonCallback(begin)"); const openspace::MouseButton k = openspace::MouseButton(key); @@ -605,7 +605,7 @@ void mainMouseButtonCallback(sgct::MouseButton key, sgct::Modifier modifiers, void mainMousePosCallback(double x, double y, sgct::Window* window) { - ZoneScoped + ZoneScoped; const IsGuiWindow isGui = IsGuiWindow(isGuiWindow(window)); global::openSpaceEngine->mousePositionCallback(x, y, isGui); } @@ -613,7 +613,7 @@ void mainMousePosCallback(double x, double y, sgct::Window* window) { void mainMouseScrollCallback(double posX, double posY, sgct::Window* window) { - ZoneScoped + ZoneScoped; LTRACE("main::mainMouseScrollCallback(begin"); const IsGuiWindow isGui = IsGuiWindow(isGuiWindow(window)); @@ -625,7 +625,7 @@ void mainMouseScrollCallback(double posX, double posY, sgct::Window* window) { void mainCharCallback(unsigned int codepoint, int modifiers, sgct::Window* window) { - ZoneScoped + ZoneScoped; const KeyModifier m = KeyModifier(modifiers); const IsGuiWindow isGui = IsGuiWindow(isGuiWindow(window)); @@ -647,7 +647,7 @@ void mainDropCallback(int amount, const char** paths) { std::vector mainEncodeFun() { - ZoneScoped + ZoneScoped; LTRACE("main::mainEncodeFun(begin)"); std::vector data = global::openSpaceEngine->encode(); @@ -659,7 +659,7 @@ std::vector mainEncodeFun() { void mainDecodeFun(const std::vector& data) { - ZoneScoped + ZoneScoped; LTRACE("main::mainDecodeFun(begin)"); global::openSpaceEngine->decode(data); @@ -670,7 +670,7 @@ void mainDecodeFun(const std::vector& data) { void mainLogCallback(Log::Level level, std::string_view message) { - ZoneScoped + ZoneScoped; switch (level) { case Log::Level::Debug: @@ -694,52 +694,52 @@ void setSgctDelegateFunctions() { WindowDelegate& sgctDelegate = *global::windowDelegate; sgctDelegate.terminate = []() { Engine::instance().terminate(); }; sgctDelegate.setBarrier = [](bool enabled) { - ZoneScoped + ZoneScoped; sgct::Window::setBarrier(enabled); }; sgctDelegate.setSynchronization = [](bool enabled) { - ZoneScoped + ZoneScoped; sgct::ClusterManager::instance().setUseIgnoreSync(enabled); }; sgctDelegate.windowHasResized = []() { - ZoneScoped + ZoneScoped; return currentWindow->isWindowResized(); }; sgctDelegate.averageDeltaTime = []() { - ZoneScoped + ZoneScoped; return Engine::instance().statistics().avgDt(); }; sgctDelegate.minDeltaTime = []() { - ZoneScoped + ZoneScoped; return Engine::instance().statistics().minDt(); }; sgctDelegate.maxDeltaTime = []() { - ZoneScoped + ZoneScoped; return Engine::instance().statistics().maxDt(); }; sgctDelegate.deltaTime = []() { - ZoneScoped + ZoneScoped; return Engine::instance().statistics().dt(); }; sgctDelegate.applicationTime = []() { - ZoneScoped + ZoneScoped; return time(); }; sgctDelegate.currentWindowSize = []() { - ZoneScoped + ZoneScoped; return glm::ivec2(currentWindow->resolution().x, currentWindow->resolution().y); }; sgctDelegate.currentSubwindowSize = []() { - ZoneScoped + ZoneScoped; if (currentWindow->viewports().size() > 1) { const Viewport& viewport = *currentWindow->viewports().front(); @@ -769,7 +769,7 @@ void setSgctDelegateFunctions() { } }; sgctDelegate.currentDrawBufferResolution = []() { - ZoneScoped + ZoneScoped; Viewport* viewport = currentWindow->viewports().front().get(); if (viewport != nullptr) { @@ -791,7 +791,7 @@ void setSgctDelegateFunctions() { return glm::ivec2(-1, -1); }; sgctDelegate.currentViewportSize = []() { - ZoneScoped + ZoneScoped; if (currentViewport != nullptr) { vec2 size = currentViewport->size(); @@ -800,13 +800,13 @@ void setSgctDelegateFunctions() { return glm::ivec2(-1, -1); }; sgctDelegate.dpiScaling = []() { - ZoneScoped + ZoneScoped; vec2 scale = currentWindow->scale(); return glm::vec2(scale.x, scale.y); }; sgctDelegate.osDpiScaling = []() { - ZoneScoped + ZoneScoped; // Detect which DPI scaling to use // 1. If there is a GUI window, use the GUI window's content scale value @@ -836,7 +836,7 @@ void setSgctDelegateFunctions() { return scale.x; }; sgctDelegate.hasGuiWindow = []() { - ZoneScoped + ZoneScoped; for (const std::unique_ptr& window : Engine::instance().windows()) { if (window->hasTag("GUI")) { @@ -846,70 +846,70 @@ void setSgctDelegateFunctions() { return false; }; sgctDelegate.isGuiWindow = []() { - ZoneScoped + ZoneScoped; return currentWindow->hasTag("GUI"); }; sgctDelegate.isMaster = []() { - ZoneScoped + ZoneScoped; return Engine::instance().isMaster(); }; sgctDelegate.modelMatrix = []() { - ZoneScoped + ZoneScoped; return currentModelMatrix; }; sgctDelegate.setNearFarClippingPlane = [](float nearPlane, float farPlane) { - ZoneScoped + ZoneScoped; Engine::instance().setNearAndFarClippingPlanes(nearPlane, farPlane); }; sgctDelegate.isFisheyeRendering = []() { - ZoneScoped + ZoneScoped; return dynamic_cast( currentWindow->viewports().front()->nonLinearProjection() ) != nullptr; }; sgctDelegate.takeScreenshot = [](bool applyWarping, std::vector windowIds) { - ZoneScoped + ZoneScoped; Settings::instance().setCaptureFromBackBuffer(applyWarping); Engine::instance().takeScreenshot(std::move(windowIds)); return Engine::instance().screenShotNumber(); }; sgctDelegate.swapBuffer = []() { - ZoneScoped + ZoneScoped; GLFWwindow* w = glfwGetCurrentContext(); glfwSwapBuffers(w); glfwPollEvents(); }; sgctDelegate.nWindows = []() { - ZoneScoped + ZoneScoped; return static_cast(Engine::instance().windows().size()); }; sgctDelegate.currentWindowId = []() { - ZoneScoped + ZoneScoped; return currentWindow->id(); }; sgctDelegate.openGLProcedureAddress = [](const char* func) { - ZoneScoped + ZoneScoped; return glfwGetProcAddress(func); }; sgctDelegate.getHorizFieldOfView = []() { - ZoneScoped + ZoneScoped; return static_cast( Engine::instance().windows().front()->horizFieldOfViewDegrees() ); }; sgctDelegate.setHorizFieldOfView = [](float hFovDeg) { - ZoneScoped + ZoneScoped; for (std::unique_ptr const& w : Engine::instance().windows()) { w->setHorizFieldOfView(hFovDeg); @@ -917,7 +917,7 @@ void setSgctDelegateFunctions() { }; #ifdef WIN32 sgctDelegate.getNativeWindowHandle = [](size_t windowIndex) -> void* { - ZoneScoped + ZoneScoped; Window* w = Engine::instance().windows()[windowIndex].get(); if (w) { @@ -928,7 +928,7 @@ void setSgctDelegateFunctions() { }; #endif // WIN32 sgctDelegate.frustumMode = []() { - ZoneScoped + ZoneScoped; switch (currentFrustumMode) { default: @@ -938,7 +938,7 @@ void setSgctDelegateFunctions() { } }; sgctDelegate.swapGroupFrameNumber = []() -> uint64_t { - ZoneScoped + ZoneScoped; return currentWindow->swapGroupFrameNumber(); }; diff --git a/ext/ghoul b/ext/ghoul index 81a4ac0d8a..8fc0ae3d16 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 81a4ac0d8a0e5fad4a46854aa698e8d0b6335936 +Subproject commit 8fc0ae3d165c3a33542e2f81ae1202770d2833a6 diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp index 78300e61b9..7fc66f32b7 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -252,7 +252,7 @@ AtmosphereDeferredcaster::AtmosphereDeferredcaster(float textureScale, } void AtmosphereDeferredcaster::initialize() { - ZoneScoped + ZoneScoped; _transmittanceTableTexture = createTexture(_transmittanceTableSize, "Transmittance"); _irradianceTableTexture = createTexture(_irradianceTableSize, "Irradiance"); @@ -261,7 +261,7 @@ void AtmosphereDeferredcaster::initialize() { } void AtmosphereDeferredcaster::deinitialize() { - ZoneScoped + ZoneScoped; glDeleteTextures(1, &_transmittanceTableTexture); glDeleteTextures(1, &_irradianceTableTexture); @@ -273,7 +273,7 @@ void AtmosphereDeferredcaster::update(const UpdateData&) {} void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const DeferredcastData&, ghoul::opengl::ProgramObject& prg) { - ZoneScoped + ZoneScoped; // Atmosphere Frustum Culling glm::dvec3 tPlanetPos = glm::dvec3(_modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0)); @@ -473,7 +473,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const Deferred void AtmosphereDeferredcaster::postRaycast(const RenderData&, const DeferredcastData&, ghoul::opengl::ProgramObject&) { - ZoneScoped + ZoneScoped; // Deactivate the texture units _transmittanceTableTextureUnit.deactivate(); @@ -537,7 +537,7 @@ void AtmosphereDeferredcaster::setHardShadows(bool enabled) { } void AtmosphereDeferredcaster::calculateTransmittance() { - ZoneScoped + ZoneScoped; glFramebufferTexture( GL_FRAMEBUFFER, @@ -574,7 +574,7 @@ void AtmosphereDeferredcaster::calculateTransmittance() { } GLuint AtmosphereDeferredcaster::calculateDeltaE() { - ZoneScoped + ZoneScoped; GLuint deltaE = createTexture(_deltaETableSize, "DeltaE"); glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0); @@ -603,7 +603,7 @@ GLuint AtmosphereDeferredcaster::calculateDeltaE() { } std::pair AtmosphereDeferredcaster::calculateDeltaS() { - ZoneScoped + ZoneScoped; GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3); glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0); @@ -657,7 +657,7 @@ std::pair AtmosphereDeferredcaster::calculateDeltaS() { } void AtmosphereDeferredcaster::calculateIrradiance() { - ZoneScoped + ZoneScoped; glFramebufferTexture( GL_FRAMEBUFFER, @@ -686,7 +686,7 @@ void AtmosphereDeferredcaster::calculateIrradiance() { void AtmosphereDeferredcaster::calculateInscattering(GLuint deltaSRayleigh, GLuint deltaSMie) { - ZoneScoped + ZoneScoped; glFramebufferTexture( GL_FRAMEBUFFER, @@ -734,7 +734,7 @@ void AtmosphereDeferredcaster::calculateDeltaJ(int scatteringOrder, GLuint deltaJ, GLuint deltaE, GLuint deltaSRayleigh, GLuint deltaSMie) { - ZoneScoped + ZoneScoped; glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaJ, 0); glViewport(0, 0, _textureSize.x, _textureSize.y); @@ -792,7 +792,7 @@ void AtmosphereDeferredcaster::calculateDeltaE(int scatteringOrder, GLuint deltaE, GLuint deltaSRayleigh, GLuint deltaSMie) { - ZoneScoped + ZoneScoped; glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0); glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y); @@ -831,7 +831,7 @@ void AtmosphereDeferredcaster::calculateDeltaS(int scatteringOrder, ghoul::opengl::ProgramObject& program, GLuint deltaSRayleigh, GLuint deltaJ) { - ZoneScoped + ZoneScoped; glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0); glViewport(0, 0, _textureSize.x, _textureSize.y); @@ -871,7 +871,7 @@ void AtmosphereDeferredcaster::calculateIrradiance(int scatteringOrder, ghoul::opengl::ProgramObject& program, GLuint deltaE) { - ZoneScoped + ZoneScoped; glFramebufferTexture( GL_FRAMEBUFFER, @@ -903,7 +903,7 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder, GLuint deltaSRayleigh) { - ZoneScoped + ZoneScoped; glFramebufferTexture( GL_FRAMEBUFFER, @@ -936,7 +936,7 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder, } void AtmosphereDeferredcaster::calculateAtmosphereParameters() { - ZoneScoped + ZoneScoped; using ProgramObject = ghoul::opengl::ProgramObject; std::unique_ptr deltaJProgram = ProgramObject::Build( diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index ece56b8bfb..e6bd488770 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -428,7 +428,7 @@ glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(const TransformData } void RenderableAtmosphere::render(const RenderData& data, RendererTasks& renderTask) { - ZoneScoped + ZoneScoped; DeferredcasterTask task{ _deferredcaster.get(), data }; renderTask.deferredcasterTasks.push_back(task); diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp index 79ee6fe1db..9557f92524 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -279,7 +279,7 @@ std::pair DashboardItemAngle::positionAndLabel( } void DashboardItemAngle::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; std::pair sourceInfo = positionAndLabel(_source); std::pair referenceInfo = positionAndLabel(_reference); @@ -316,7 +316,7 @@ void DashboardItemAngle::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemAngle::size() const { - ZoneScoped + ZoneScoped; constexpr double Angle = 120; return _font->boundingBox("Angle: " + std::to_string(Angle)); diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp index 67be97a6e8..f5fc9d29ee 100644 --- a/modules/base/dashboard/dashboarditemdate.cpp +++ b/modules/base/dashboard/dashboarditemdate.cpp @@ -83,7 +83,7 @@ DashboardItemDate::DashboardItemDate(const ghoul::Dictionary& dictionary) } void DashboardItemDate::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; std::string time = SpiceManager::ref().dateFromEphemerisTime( global::timeManager->time().j2000Seconds(), @@ -104,7 +104,7 @@ void DashboardItemDate::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemDate::size() const { - ZoneScoped + ZoneScoped; std::string_view time = global::timeManager->time().UTC(); return _font->boundingBox(fmt::format(fmt::runtime(_formatString.value()), time)); diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index 733b528dcb..fd99b8814e 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -335,7 +335,7 @@ std::pair DashboardItemDistance::positionAndLabel( } void DashboardItemDistance::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; std::pair sourceInfo = positionAndLabel( _source, @@ -375,7 +375,7 @@ void DashboardItemDistance::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemDistance::size() const { - ZoneScoped + ZoneScoped; const double d = glm::length(1e20); std::pair dist; diff --git a/modules/base/dashboard/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp index a9298ab610..6406bf97e8 100644 --- a/modules/base/dashboard/dashboarditemelapsedtime.cpp +++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp @@ -132,7 +132,7 @@ DashboardItemElapsedTime::DashboardItemElapsedTime(const ghoul::Dictionary& dict } void DashboardItemElapsedTime::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000; @@ -175,7 +175,7 @@ void DashboardItemElapsedTime::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemElapsedTime::size() const { - ZoneScoped + ZoneScoped; const double delta = global::timeManager->time().j2000Seconds() - _referenceJ2000; return _font->boundingBox(fmt::format(fmt::runtime(_formatString.value()), delta)); diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index 26ec6c0c21..6380dbfa9b 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -203,7 +203,7 @@ DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictiona } void DashboardItemFramerate::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; if (_shouldClearCache) { _minDeltaTimeCache = 1.0; @@ -243,7 +243,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemFramerate::size() const { - ZoneScoped + ZoneScoped; const FrametimeType t = FrametimeType(_frametimeType.value()); char* end = format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache); diff --git a/modules/base/dashboard/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp index 956cbb5ea7..d3b0210e17 100644 --- a/modules/base/dashboard/dashboarditeminputstate.cpp +++ b/modules/base/dashboard/dashboarditeminputstate.cpp @@ -119,7 +119,7 @@ DashboardItemInputState::DashboardItemInputState(const ghoul::Dictionary& dictio } void DashboardItemInputState::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; std::vector text; if (_showKeyboard) { @@ -169,7 +169,7 @@ void DashboardItemInputState::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemInputState::size() const { - ZoneScoped + ZoneScoped; std::vector text; if (_showKeyboard) { diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index 6d0f9e3937..8957571a58 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -67,7 +67,7 @@ DashboardItemMission::DashboardItemMission(const ghoul::Dictionary& dictionary) {} void DashboardItemMission::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; if (!global::missionManager->hasCurrentMission()) { return; @@ -184,7 +184,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemMission::size() const { - ZoneScoped + ZoneScoped; // @TODO fix this up ---abock return { 0.f, 0.f }; diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp index b437f2ac15..720c907110 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.cpp +++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp @@ -51,7 +51,7 @@ DashboardItemParallelConnection::DashboardItemParallelConnection( {} void DashboardItemParallelConnection::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; const ParallelConnection::Status status = global::parallelPeer->status(); const size_t nConnections = global::parallelPeer->nConnections(); @@ -106,7 +106,7 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemParallelConnection::size() const { - ZoneScoped + ZoneScoped; ParallelConnection::Status status = global::parallelPeer->status(); size_t nConnections = global::parallelPeer->nConnections(); diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp index 54b4adce3b..cd8706bf63 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.cpp +++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp @@ -85,7 +85,7 @@ DashboardItemPropertyValue::DashboardItemPropertyValue( } void DashboardItemPropertyValue::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; if (_propertyIsDirty) { _property = openspace::property(_propertyUri); @@ -104,7 +104,7 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemPropertyValue::size() const { - ZoneScoped + ZoneScoped; return _font->boundingBox(_displayString.value()); } diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp index d70db523b4..69f38c65c8 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp +++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp @@ -151,7 +151,7 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement( } void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; const double targetDt = global::timeManager->targetDeltaTime(); const double currentDt = global::timeManager->deltaTime(); @@ -215,7 +215,7 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemSimulationIncrement::size() const { - ZoneScoped + ZoneScoped; double t = global::timeManager->targetDeltaTime(); std::pair deltaTime; diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp index 5cc7fd9f28..7dea51bd91 100644 --- a/modules/base/dashboard/dashboarditemtext.cpp +++ b/modules/base/dashboard/dashboarditemtext.cpp @@ -66,14 +66,14 @@ DashboardItemText::DashboardItemText(const ghoul::Dictionary& dictionary) } void DashboardItemText::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; RenderFont(*_font, penPosition, _text.value()); penPosition.y -= _font->height(); } glm::vec2 DashboardItemText::size() const { - ZoneScoped + ZoneScoped; return _font->boundingBox(_text.value()); } diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp index c5e3e86168..599e67b837 100644 --- a/modules/base/dashboard/dashboarditemvelocity.cpp +++ b/modules/base/dashboard/dashboarditemvelocity.cpp @@ -120,7 +120,7 @@ DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary } void DashboardItemVelocity::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; const glm::dvec3 currentPos = global::renderEngine->scene()->camera()->positionVec3(); const glm::dvec3 dt = currentPos - _prevPosition; @@ -153,7 +153,7 @@ void DashboardItemVelocity::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemVelocity::size() const { - ZoneScoped + ZoneScoped; const double d = glm::length(1e20); std::pair dist; diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp index 61b35ffafe..53837b21c5 100644 --- a/modules/base/lightsource/scenegraphlightsource.cpp +++ b/modules/base/lightsource/scenegraphlightsource.cpp @@ -83,7 +83,7 @@ SceneGraphLightSource::SceneGraphLightSource(const ghoul::Dictionary& dictionary } bool SceneGraphLightSource::initialize() { - ZoneScoped + ZoneScoped; _sceneGraphNode = global::renderEngine->scene()->sceneGraphNode(_sceneGraphNodeReference); diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp index 7c9ba8c967..cda0245757 100644 --- a/modules/base/rendering/renderablelabel.cpp +++ b/modules/base/rendering/renderablelabel.cpp @@ -362,7 +362,7 @@ bool RenderableLabel::isReady() const { } void RenderableLabel::initialize() { - ZoneScoped + ZoneScoped; setRenderBin(Renderable::RenderBin::PreDeferredTransparent); } diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 8f6a826150..04210ff701 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -490,7 +490,7 @@ bool RenderableModel::isReady() const { } void RenderableModel::initialize() { - ZoneScoped + ZoneScoped; if (_geometry->hasAnimation() && _enableAnimation && _animationStart.empty()) { LWARNING("Model with animation not given any start time"); @@ -507,7 +507,7 @@ void RenderableModel::initialize() { } void RenderableModel::initializeGL() { - ZoneScoped + ZoneScoped; std::string program = std::string(ProgramName); if (!_vertexShaderPath.empty()) { diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index 9eff195a2e..647fe4818b 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -175,7 +175,7 @@ bool RenderablePlane::isReady() const { } void RenderablePlane::initializeGL() { - ZoneScoped + ZoneScoped; glGenVertexArrays(1, &_quad); // generate array glGenBuffers(1, &_vertexPositionBuffer); // generate buffer @@ -194,7 +194,7 @@ void RenderablePlane::initializeGL() { } void RenderablePlane::deinitializeGL() { - ZoneScoped + ZoneScoped; glDeleteVertexArrays(1, &_quad); _quad = 0; @@ -212,7 +212,7 @@ void RenderablePlane::deinitializeGL() { } void RenderablePlane::render(const RenderData& data, RendererTasks&) { - ZoneScoped + ZoneScoped; _shader->activate(); _shader->setUniform("opacity", opacity()); @@ -287,7 +287,7 @@ void RenderablePlane::bindTexture() {} void RenderablePlane::unbindTexture() {} void RenderablePlane::update(const UpdateData&) { - ZoneScoped + ZoneScoped; if (_shader->isDirty()) { _shader->rebuildFromFile(); diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp index 17f9a9ad49..fc6961a28d 100644 --- a/modules/base/rendering/renderableplaneimagelocal.cpp +++ b/modules/base/rendering/renderableplaneimagelocal.cpp @@ -119,7 +119,7 @@ void RenderablePlaneImageLocal::bindTexture() { } void RenderablePlaneImageLocal::update(const UpdateData& data) { - ZoneScoped + ZoneScoped; RenderablePlane::update(data); @@ -130,7 +130,7 @@ void RenderablePlaneImageLocal::update(const UpdateData& data) { } void RenderablePlaneImageLocal::loadTexture() { - ZoneScoped + ZoneScoped; if (!_texturePath.value().empty()) { ghoul::opengl::Texture* t = _texture; diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp index 586797c2d0..c63add8148 100644 --- a/modules/base/rendering/renderableplanetimevaryingimage.cpp +++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp @@ -195,7 +195,7 @@ void RenderablePlaneTimeVaryingImage::bindTexture() { } void RenderablePlaneTimeVaryingImage::update(const UpdateData& data) { - ZoneScoped + ZoneScoped; RenderablePlane::update(data); if (!_enabled || _startTimes.empty()) { diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 40d3b3fe74..6dd70af5bb 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -227,7 +227,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary) } void RenderableTrail::initializeGL() { - ZoneScoped + ZoneScoped; #ifdef __APPLE__ _programObject = BaseModule::ProgramObjectManager.request( @@ -275,7 +275,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints, const glm::dmat4& modelTransform, RenderInformation& info, int nVertices, int offset) { - ZoneScoped + ZoneScoped; // We pass in the model view transformation matrix as double in order to maintain // high precision for vertices; especially for the trails, a high vertex precision @@ -375,7 +375,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints, } void RenderableTrail::render(const RenderData& data, RendererTasks&) { - ZoneScoped + ZoneScoped; _programObject->activate(); _programObject->setUniform(_uniformCache.opacity, opacity()); diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp index 480c41816f..92d963d453 100644 --- a/modules/base/rotation/fixedrotation.cpp +++ b/modules/base/rotation/fixedrotation.cpp @@ -390,7 +390,7 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary) } bool FixedRotation::initialize() { - ZoneScoped + ZoneScoped; // We have already checked this before, but still const Parameters p = codegen::bake(_constructorDictionary); diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index 17da14fa30..ef6372f448 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -87,7 +87,7 @@ CefWebGuiModule::CefWebGuiModule() } void CefWebGuiModule::startOrStopGui() { - ZoneScoped + ZoneScoped; WebBrowserModule* webBrowserModule = global::moduleEngine->module(); @@ -127,7 +127,7 @@ void CefWebGuiModule::startOrStopGui() { } void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) { - ZoneScoped + ZoneScoped; WebBrowserModule* webBrowserModule = global::moduleEngine->module(); @@ -139,13 +139,13 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) } _enabled.onChange([this]() { - ZoneScopedN("CefWebGuiModule::enabled") + ZoneScopedN("CefWebGuiModule::enabled"); startOrStopGui(); }); _url.onChange([this]() { - ZoneScopedN("CefWebGuiModule::url") + ZoneScopedN("CefWebGuiModule::url"); if (_instance) { _instance->loadUrl(_url); @@ -153,7 +153,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) }); _reload.onChange([this]() { - ZoneScopedN("CefWebGuiModule::reload") + ZoneScopedN("CefWebGuiModule::reload"); if (_instance) { _instance->reloadBrowser(); @@ -161,7 +161,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) }); _guiScale.onChange([this]() { - ZoneScopedN("CefWebGuiModule::guiScale") + ZoneScopedN("CefWebGuiModule::guiScale"); if (_instance) { _instance->setZoom(_guiScale); @@ -169,7 +169,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) }); _visible.onChange([this, webBrowserModule]() { - ZoneScopedN("CefWebGuiModule::visible") + ZoneScopedN("CefWebGuiModule::visible"); if (_visible && _instance) { webBrowserModule->attachEventHandler(_instance.get()); @@ -189,7 +189,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) _endpointCallback = webGuiModule->addEndpointChangeCallback( [this](const std::string& endpoint, bool exists) { - ZoneScopedN("CefWebGuiModule::endpointCallback") + ZoneScopedN("CefWebGuiModule::endpointCallback"); if (exists && endpoint == "frontend" && _instance) { _instance->reloadBrowser(); } @@ -213,7 +213,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) }); global::callback::draw2D->emplace_back([this](){ - ZoneScopedN("CefWebGuiModule") + ZoneScopedN("CefWebGuiModule"); const bool isGuiWindow = global::windowDelegate->hasGuiWindow() ? @@ -236,7 +236,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) }); global::callback::deinitializeGL->emplace_back([this]() { - ZoneScopedN("CefWebGuiModule") + ZoneScopedN("CefWebGuiModule"); if (_endpointCallback != -1) { WebGuiModule* m = global::moduleEngine->module(); diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 8918d2f34e..6456f2cf60 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -511,7 +511,7 @@ bool RenderableBillboardsCloud::isReady() const { } void RenderableBillboardsCloud::initialize() { - ZoneScoped + ZoneScoped; if (_hasSpeckFile) { _dataset = speck::data::loadFileWithCache(_speckFile); @@ -536,7 +536,7 @@ void RenderableBillboardsCloud::initialize() { } void RenderableBillboardsCloud::initializeGL() { - ZoneScoped + ZoneScoped; _program = DigitalUniverseModule::ProgramObjectManager.request( "RenderableBillboardsCloud", @@ -727,11 +727,11 @@ void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) { } void RenderableBillboardsCloud::update(const UpdateData&) { - ZoneScoped + ZoneScoped; if (_dataIsDirty && _hasSpeckFile) { - ZoneScopedN("Data dirty") - TracyGpuZone("Data dirty") + ZoneScopedN("Data dirty"); + TracyGpuZone("Data dirty"); LDEBUG("Regenerating data"); std::vector slice = createDataSlice(); @@ -848,8 +848,8 @@ void RenderableBillboardsCloud::update(const UpdateData&) { if (_hasSpriteTexture && _spriteTextureIsDirty && !_spriteTexturePath.value().empty()) { - ZoneScopedN("Sprite texture") - TracyGpuZone("Sprite texture") + ZoneScopedN("Sprite texture"); + TracyGpuZone("Sprite texture"); ghoul::opengl::Texture* texture = _spriteTexture; @@ -875,7 +875,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) { } std::vector RenderableBillboardsCloud::createDataSlice() { - ZoneScoped + ZoneScoped; if (_dataset.entries.empty()) { return std::vector(); @@ -1045,7 +1045,7 @@ std::vector RenderableBillboardsCloud::createDataSlice() { } void RenderableBillboardsCloud::createPolygonTexture() { - ZoneScoped + ZoneScoped; LDEBUG("Creating Polygon Texture"); diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index 4b2c015f49..580eadb530 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -305,7 +305,7 @@ bool RenderablePlanesCloud::isReady() const { } void RenderablePlanesCloud::initialize() { - ZoneScoped + ZoneScoped; if (_hasSpeckFile && std::filesystem::is_regular_file(_speckFile)) { _dataset = speck::data::loadFileWithCache(_speckFile); @@ -321,7 +321,7 @@ void RenderablePlanesCloud::initialize() { } void RenderablePlanesCloud::initializeGL() { - ZoneScoped + ZoneScoped; _program = DigitalUniverseModule::ProgramObjectManager.request( "RenderablePlanesCloud", diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp index 14ffaf4663..62db7cda17 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -172,7 +172,7 @@ bool RenderablePoints::isReady() const { } void RenderablePoints::initialize() { - ZoneScoped + ZoneScoped; _dataset = speck::data::loadFileWithCache(_speckFile); @@ -182,7 +182,7 @@ void RenderablePoints::initialize() { } void RenderablePoints::initializeGL() { - ZoneScoped + ZoneScoped; if (_hasSpriteTexture) { _program = DigitalUniverseModule::ProgramObjectManager.request( diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp index ffa564a6ec..7aa2334963 100644 --- a/modules/galaxy/rendering/galaxyraycaster.cpp +++ b/modules/galaxy/rendering/galaxyraycaster.cpp @@ -50,7 +50,7 @@ GalaxyRaycaster::GalaxyRaycaster(ghoul::opengl::Texture& texture) {} void GalaxyRaycaster::initialize() { - ZoneScoped + ZoneScoped; _boundingBox.initialize(); } diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index a43ffc3f61..ef756112df 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -326,7 +326,7 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary) } void RenderableGalaxy::initialize() { - ZoneScoped + ZoneScoped; // Aspect is currently hardcoded to cubic voxels. glm::vec3 d = _volumeDimensions; @@ -383,7 +383,7 @@ void RenderableGalaxy::initialize() { } void RenderableGalaxy::initializeGL() { - ZoneScoped + ZoneScoped; _texture = std::make_unique( _volumeDimensions, diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 97e7f28a4b..20c04f5e60 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -249,7 +249,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) { // Initialize global::callback::initializeGL->emplace_back([&]() { - ZoneScopedN("GlobeBrowsingModule") + ZoneScopedN("GlobeBrowsingModule"); _tileCache = std::make_unique(_tileCacheSizeMB); addPropertySubOwner(_tileCache.get()); @@ -265,21 +265,21 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) { }); global::callback::deinitializeGL->emplace_back([]() { - ZoneScopedN("GlobeBrowsingModule") + ZoneScopedN("GlobeBrowsingModule"); TileProvider::deinitializeDefaultTile(); }); // Render global::callback::render->emplace_back([&]() { - ZoneScopedN("GlobeBrowsingModule") + ZoneScopedN("GlobeBrowsingModule"); _tileCache->update(); }); // Deinitialize global::callback::deinitialize->emplace_back([&]() { - ZoneScopedN("GlobeBrowsingModule") + ZoneScopedN("GlobeBrowsingModule"); GdalWrapper::destroy(); }); diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp index 3cfc087485..8ef3690872 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.cpp +++ b/modules/globebrowsing/src/asynctiledataprovider.cpp @@ -45,7 +45,7 @@ AsyncTileDataProvider::AsyncTileDataProvider(std::string name, , _rawTileDataReader(std::move(rawTileDataReader)) , _concurrentJobManager(LRUThreadPool(1, 10)) { - ZoneScoped + ZoneScoped; performReset(ResetRawTileDataReader::No); } @@ -55,7 +55,7 @@ const RawTileDataReader& AsyncTileDataProvider::rawTileDataReader() const { } bool AsyncTileDataProvider::enqueueTileIO(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; if (_resetMode == ResetMode::ShouldNotReset && satisfiesEnqueueCriteria(tileIndex)) { auto job = std::make_unique(*_rawTileDataReader, tileIndex); @@ -95,7 +95,7 @@ std::optional AsyncTileDataProvider::popFinishedRawTile() { } bool AsyncTileDataProvider::satisfiesEnqueueCriteria(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; // Only satisfies if it is not already enqueued. Also bumps the request to the top. const bool alreadyEnqueued = _concurrentJobManager.touch(tileIndex.hashKey()); @@ -185,7 +185,7 @@ bool AsyncTileDataProvider::shouldBeDeleted() { } void AsyncTileDataProvider::performReset(ResetRawTileDataReader resetRawTileDataReader) { - ZoneScoped + ZoneScoped; ghoul_assert(_enqueuedTileRequests.empty(), "No enqueued requests left"); diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp index fe0780c6c4..cbbfaff0dc 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp +++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp @@ -138,7 +138,7 @@ DashboardItemGlobeLocation::DashboardItemGlobeLocation( } void DashboardItemGlobeLocation::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; GlobeBrowsingModule* module = global::moduleEngine->module(); @@ -200,7 +200,7 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemGlobeLocation::size() const { - ZoneScoped + ZoneScoped; return _font->boundingBox( fmt::format("Position: {}, {} Altitude: {}", 1.f, 1.f, 1.f) diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp index 067eb535c8..5e2019342d 100644 --- a/modules/globebrowsing/src/gdalwrapper.cpp +++ b/modules/globebrowsing/src/gdalwrapper.cpp @@ -99,7 +99,7 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize 1 // Step: One MB ) { - ZoneScoped + ZoneScoped; addProperty(_logGdalErrors); addProperty(_gdalMaximumCacheSize); diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp index 89745bb4a3..c8c13a0d60 100644 --- a/modules/globebrowsing/src/globelabelscomponent.cpp +++ b/modules/globebrowsing/src/globelabelscomponent.cpp @@ -249,7 +249,7 @@ GlobeLabelsComponent::GlobeLabelsComponent() void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary, globebrowsing::RenderableGlobe* globe) { - ZoneScoped + ZoneScoped; _globe = globe; const Parameters p = codegen::bake(dictionary); diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp index da878cc7e9..981fa0c006 100644 --- a/modules/globebrowsing/src/gpulayergroup.cpp +++ b/modules/globebrowsing/src/gpulayergroup.cpp @@ -35,7 +35,7 @@ namespace openspace::globebrowsing { void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program, const LayerGroup& layerGroup, const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; ghoul_assert( layerGroup.activeLayers().size() == _gpuActiveLayers.size(), diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp index 9be2909914..14fe55707a 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -365,7 +365,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou } void Layer::initialize() { - ZoneScoped + ZoneScoped; if (_tileProvider) { _tileProvider->initialize(); @@ -379,7 +379,7 @@ void Layer::deinitialize() { } ChunkTilePile Layer::chunkTilePile(const TileIndex& tileIndex, int pileSize) const { - ZoneScoped + ZoneScoped; if (_tileProvider) { return _tileProvider->chunkTilePile(tileIndex, pileSize); @@ -445,7 +445,7 @@ void Layer::onChange(std::function callback) { } void Layer::update() { - ZoneScoped + ZoneScoped; if (_tileProvider) { _tileProvider->update(); diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp index d434bab58c..22dbea9ac8 100644 --- a/modules/globebrowsing/src/layergroup.cpp +++ b/modules/globebrowsing/src/layergroup.cpp @@ -69,7 +69,7 @@ void LayerGroup::setLayersFromDict(const ghoul::Dictionary& dict) { } void LayerGroup::initialize() { - ZoneScoped + ZoneScoped; for (const std::unique_ptr& l : _layers) { l->initialize(); @@ -77,7 +77,7 @@ void LayerGroup::initialize() { } void LayerGroup::deinitialize() { - ZoneScoped + ZoneScoped; for (const std::unique_ptr& l : _layers) { l->deinitialize(); @@ -85,7 +85,7 @@ void LayerGroup::deinitialize() { } void LayerGroup::update() { - ZoneScoped + ZoneScoped; _activeLayers.clear(); @@ -98,7 +98,7 @@ void LayerGroup::update() { } Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) { - ZoneScoped + ZoneScoped; documentation::TestResult res = documentation::testSpecification( Layer::Documentation(), diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp index 03b7cb5c43..df3ce27a73 100644 --- a/modules/globebrowsing/src/layermanager.cpp +++ b/modules/globebrowsing/src/layermanager.cpp @@ -54,7 +54,7 @@ documentation::Documentation LayerManager::Documentation() { LayerManager::LayerManager() : properties::PropertyOwner({ "Layers" }) {} void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) { - ZoneScoped + ZoneScoped; // First create empty layer groups in case not all are specified for (size_t i = 0; i < _layerGroups.size(); ++i) { @@ -91,7 +91,7 @@ void LayerManager::deinitialize() { } Layer* LayerManager::addLayer(layers::Group::ID id, const ghoul::Dictionary& layerDict) { - ZoneScoped + ZoneScoped; ghoul_assert(id != layers::Group::ID::Unknown, "Layer group ID must be known"); @@ -109,7 +109,7 @@ Layer* LayerManager::addLayer(layers::Group::ID id, const ghoul::Dictionary& lay } void LayerManager::deleteLayer(layers::Group::ID id, const std::string& layerName) { - ZoneScoped + ZoneScoped; ghoul_assert(id != layers::Group::ID::Unknown, "Layer group ID must be known"); _layerGroups[static_cast(id)]->deleteLayer(layerName); @@ -124,7 +124,7 @@ const LayerGroup& LayerManager::layerGroup(layers::Group::ID groupId) const { } bool LayerManager::hasAnyBlendingLayersEnabled() const { - ZoneScoped + ZoneScoped; return std::any_of( _layerGroups.begin(), @@ -136,7 +136,7 @@ bool LayerManager::hasAnyBlendingLayersEnabled() const { } std::array LayerManager::layerGroups() const { - ZoneScoped + ZoneScoped; std::array res = {}; for (size_t i = 0; i < NumLayerGroups; ++i) { @@ -146,7 +146,7 @@ std::array LayerManager::layerGroups( } void LayerManager::update() { - ZoneScoped + ZoneScoped; for (std::unique_ptr& layerGroup : _layerGroups) { layerGroup->update(); @@ -154,7 +154,7 @@ void LayerManager::update() { } void LayerManager::reset(bool includeDisabled) { - ZoneScoped + ZoneScoped; for (std::unique_ptr& layerGroup : _layerGroups) { for (Layer* layer : layerGroup->layers()) { @@ -166,7 +166,7 @@ void LayerManager::reset(bool includeDisabled) { } void LayerManager::onChange(std::function callback) { - ZoneScoped + ZoneScoped; for (std::unique_ptr& layerGroup : _layerGroups) { layerGroup->onChange(callback); diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl index b03180b8d8..82a78d90c6 100644 --- a/modules/globebrowsing/src/lrucache.inl +++ b/modules/globebrowsing/src/lrucache.inl @@ -59,7 +59,7 @@ bool LRUCache::exist(const KeyType& key) const { template bool LRUCache::touch(const KeyType& key) { - ZoneScoped + ZoneScoped; const auto it = _itemMap.find(key); if (it != _itemMap.end()) { diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp index 37af6a38e5..945a692c5e 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.cpp +++ b/modules/globebrowsing/src/memoryawaretilecache.cpp @@ -195,14 +195,14 @@ MemoryAwareTileCache::TextureContainer::TextureContainer(TileTextureInitData ini : _initData(std::move(initData)) , _numTextures(numTextures) { - ZoneScoped + ZoneScoped; _textures.reserve(_numTextures); reset(); } void MemoryAwareTileCache::TextureContainer::reset() { - ZoneScoped + ZoneScoped; _textures.clear(); _freeTexture = 0; @@ -228,7 +228,7 @@ void MemoryAwareTileCache::TextureContainer::reset() { } void MemoryAwareTileCache::TextureContainer::reset(size_t numTextures) { - ZoneScoped + ZoneScoped; _numTextures = numTextures; reset(); @@ -268,7 +268,7 @@ MemoryAwareTileCache::MemoryAwareTileCache(int tileCacheSize) , _applyTileCacheSize(ApplyTileCacheInfo) , _clearTileCache(ClearTileCacheInfo) { - ZoneScoped + ZoneScoped; createDefaultTextureContainers(); @@ -313,7 +313,7 @@ void MemoryAwareTileCache::clear() { } void MemoryAwareTileCache::createDefaultTextureContainers() { - ZoneScoped + ZoneScoped; for (const layers::Group& gi : layers::Groups) { TileTextureInitData initData = tileTextureInitData(gi.id, true); @@ -324,7 +324,7 @@ void MemoryAwareTileCache::createDefaultTextureContainers() { void MemoryAwareTileCache::assureTextureContainerExists( const TileTextureInitData& initData) { - ZoneScoped + ZoneScoped; TileTextureInitData::HashKey initDataKey = initData.hashKey; if (_textureContainerMap.find(initDataKey) == _textureContainerMap.end()) { @@ -339,7 +339,7 @@ void MemoryAwareTileCache::assureTextureContainerExists( } void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) { - ZoneScoped + ZoneScoped; ghoul_assert(!_textureContainerMap.empty(), "Texture containers must exist"); LDEBUG("Resetting tile cache size"); @@ -366,7 +366,7 @@ void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) { } void MemoryAwareTileCache::resetTextureContainerSize(size_t numTexturesPerTextureType) { - ZoneScoped + ZoneScoped; _numTextureBytesAllocatedOnCPU = 0; for (std::pair(GDALOpen(content.c_str(), GA_ReadOnly)); if (!_dataset) { throw ghoul::RuntimeError(fmt::format( diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index b23bc233ae..dd0119a9eb 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -318,7 +318,7 @@ using ChunkTileVector = ChunkTileVector tilesAndSettingsUnsorted(const LayerGroup& layerGroup, const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; #if defined(__APPLE__) || (defined(__linux__) && defined(__clang__)) ChunkTileVector tilesAndSettings; @@ -338,7 +338,7 @@ ChunkTileVector tilesAndSettingsUnsorted(const LayerGroup& layerGroup, } BoundingHeights boundingHeightsForChunk(const Chunk& chunk, const LayerManager& lm) { - ZoneScoped + ZoneScoped; using ChunkTileSettingsPair = std::pair; @@ -403,7 +403,7 @@ BoundingHeights boundingHeightsForChunk(const Chunk& chunk, const LayerManager& } bool colorAvailableForChunk(const Chunk& chunk, const LayerManager& lm) { - ZoneScoped + ZoneScoped; const LayerGroup& colorLayers = lm.layerGroup(layers::Group::ID::ColorLayers); for (Layer* lyr : colorLayers.activeLayers()) { @@ -422,7 +422,7 @@ std::array boundingCornersForChunk(const Chunk& chunk, const Ellipsoid& ellipsoid, const BoundingHeights& heights) { - ZoneScoped + ZoneScoped; // assume worst case const double patchCenterRadius = ellipsoid.maximumRadius(); @@ -807,7 +807,7 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask } void RenderableGlobe::update(const UpdateData& data) { - ZoneScoped + ZoneScoped; if (_localRenderer.program && _localRenderer.program->isDirty()) { _localRenderer.program->rebuildFromFile(); @@ -914,7 +914,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&, const ShadowComponent::ShadowMapData& shadowData, bool renderGeomOnly) { - ZoneScoped + ZoneScoped; if (_layerManagerDirty) { @@ -1147,7 +1147,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&, int& iGlobal, std::vector& local, int& iLocal, int cutoff, std::vector& traversalMemory) { - ZoneScopedN("traversal") + ZoneScopedN("traversal"); traversalMemory.clear(); @@ -1244,8 +1244,8 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData& const ShadowComponent::ShadowMapData& shadowData, bool renderGeomOnly) { - ZoneScoped - TracyGpuZone("renderChunkGlobally") + ZoneScoped; + TracyGpuZone("renderChunkGlobally"); const TileIndex& tileIndex = chunk.tileIndex; ghoul::opengl::ProgramObject& program = *_globalRenderer.program; @@ -1335,8 +1335,8 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d const ShadowComponent::ShadowMapData& shadowData, bool renderGeomOnly) { - ZoneScoped - TracyGpuZone("renderChunkLocally") + ZoneScoped; + TracyGpuZone("renderChunkLocally"); //PerfMeasure("locally"); const TileIndex& tileIndex = chunk.tileIndex; @@ -1473,7 +1473,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d void RenderableGlobe::debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp, bool renderBounds) const { - ZoneScoped + ZoneScoped; const std::array& modelSpaceCorners = chunk.corners; @@ -1511,7 +1511,7 @@ void RenderableGlobe::setCommonUniforms(ghoul::opengl::ProgramObject& programObj { using namespace layers; - ZoneScoped + ZoneScoped; if (_generalProperties.useAccurateNormals && !_layerManager.layerGroup(Group::ID::HeightLayers).activeLayers().empty()) @@ -1559,7 +1559,7 @@ void RenderableGlobe::setCommonUniforms(ghoul::opengl::ProgramObject& programObj } void RenderableGlobe::recompileShaders() { - ZoneScoped + ZoneScoped; struct LayerShaderPreprocessingData { struct LayerGroupPreprocessingData { @@ -1787,7 +1787,7 @@ void RenderableGlobe::recompileShaders() { SurfacePositionHandle RenderableGlobe::calculateSurfacePositionHandle( const glm::dvec3& targetModelSpace) const { - ZoneScoped + ZoneScoped; glm::dvec3 centerToEllipsoidSurface = _ellipsoid.geodeticSurfaceProjection(targetModelSpace); @@ -1820,7 +1820,7 @@ bool RenderableGlobe::testIfCullable(const Chunk& chunk, const BoundingHeights& heights, const glm::dmat4& mvp) const { - ZoneScoped + ZoneScoped; return (PreformHorizonCulling && isCullableByHorizon(chunk, renderData, heights)) || (PerformFrustumCulling && isCullableByFrustum(chunk, renderData, mvp)); @@ -1829,7 +1829,7 @@ bool RenderableGlobe::testIfCullable(const Chunk& chunk, int RenderableGlobe::desiredLevel(const Chunk& chunk, const RenderData& renderData, const BoundingHeights& heights) const { - ZoneScoped + ZoneScoped; const int desiredLevel = _debugProperties.levelByProjectedAreaElseDistance ? desiredLevelByProjectedArea(chunk, renderData, heights) : @@ -1846,7 +1846,7 @@ int RenderableGlobe::desiredLevel(const Chunk& chunk, const RenderData& renderDa } float RenderableGlobe::getHeight(const glm::dvec3& position) const { - ZoneScoped + ZoneScoped; float height = 0; @@ -1996,7 +1996,7 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const { void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& programObject, const RenderData& data, ShadowCompType stype) { - ZoneScoped + ZoneScoped; constexpr double KM_TO_M = 1000.0; @@ -2159,7 +2159,7 @@ int RenderableGlobe::desiredLevelByDistance(const Chunk& chunk, const RenderData& data, const BoundingHeights& heights) const { - ZoneScoped + ZoneScoped; // Calculations are done in the reference frame of the globe // (model space). Hence, the camera position needs to be transformed @@ -2195,7 +2195,7 @@ int RenderableGlobe::desiredLevelByProjectedArea(const Chunk& chunk, const RenderData& data, const BoundingHeights& heights) const { - ZoneScoped + ZoneScoped; // Calculations are done in the reference frame of the globe // (model space). Hence, the camera position needs to be transformed @@ -2277,7 +2277,7 @@ int RenderableGlobe::desiredLevelByProjectedArea(const Chunk& chunk, } int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const { - ZoneScoped + ZoneScoped; const int currLevel = chunk.tileIndex.level; @@ -2302,7 +2302,7 @@ bool RenderableGlobe::isCullableByFrustum(const Chunk& chunk, const RenderData&, const glm::dmat4& mvp) const { - ZoneScoped + ZoneScoped; const std::array& corners = chunk.corners; @@ -2323,7 +2323,7 @@ bool RenderableGlobe::isCullableByHorizon(const Chunk& chunk, const RenderData& renderData, const BoundingHeights& heights) const { - ZoneScoped + ZoneScoped; // Calculations are done in the reference frame of the globe. Hence, the camera // position needs to be transformed with the inverse model matrix @@ -2394,7 +2394,7 @@ bool RenderableGlobe::isCullableByHorizon(const Chunk& chunk, ////////////////////////////////////////////////////////////////////////////////////////// void RenderableGlobe::splitChunkNode(Chunk& cn, int depth) { - ZoneScoped + ZoneScoped; if (depth > 0 && isLeaf(cn)) { std::vector memory = _chunkPool.allocate( @@ -2424,7 +2424,7 @@ void RenderableGlobe::splitChunkNode(Chunk& cn, int depth) { } void RenderableGlobe::freeChunkNode(Chunk* n) { - ZoneScoped + ZoneScoped; _chunkPool.free(n); for (Chunk* c : n->children) { @@ -2436,7 +2436,7 @@ void RenderableGlobe::freeChunkNode(Chunk* n) { } void RenderableGlobe::mergeChunkNode(Chunk& cn) { - ZoneScoped + ZoneScoped; for (Chunk* child : cn.children) { if (child) { @@ -2450,7 +2450,7 @@ void RenderableGlobe::mergeChunkNode(Chunk& cn) { bool RenderableGlobe::updateChunkTree(Chunk& cn, const RenderData& data, const glm::dmat4& mvp) { - ZoneScoped + ZoneScoped; // abock: I tried turning this into a queue and use iteration, rather than recursion // but that made the code harder to understand as the breadth-first traversal @@ -2458,7 +2458,7 @@ bool RenderableGlobe::updateChunkTree(Chunk& cn, const RenderData& data, // children and then again it self to be processed after the children finish). // In addition, this didn't even improve performance --- 2018-10-04 if (isLeaf(cn)) { - ZoneScopedN("leaf") + ZoneScopedN("leaf"); updateChunk(cn, data, mvp); if (cn.status == Chunk::Status::WantSplit) { @@ -2472,7 +2472,7 @@ bool RenderableGlobe::updateChunkTree(Chunk& cn, const RenderData& data, return cn.status == Chunk::Status::WantMerge; } else { - ZoneScopedN("!leaf") + ZoneScopedN("!leaf"); char requestedMergeMask = 0; for (int i = 0; i < 4; ++i) { if (updateChunkTree(*cn.children[i], data, mvp)) { @@ -2500,7 +2500,7 @@ bool RenderableGlobe::updateChunkTree(Chunk& cn, const RenderData& data, void RenderableGlobe::updateChunk(Chunk& chunk, const RenderData& data, const glm::dmat4& mvp) const { - ZoneScoped + ZoneScoped; const BoundingHeights& heights = boundingHeightsForChunk(chunk, _layerManager); chunk.heightTileOK = heights.tileOK; diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp index 2e1083dfa6..c7e706e180 100644 --- a/modules/globebrowsing/src/ringscomponent.cpp +++ b/modules/globebrowsing/src/ringscomponent.cpp @@ -241,7 +241,7 @@ RingsComponent::RingsComponent(const ghoul::Dictionary& dictionary) } void RingsComponent::initialize() { - ZoneScoped + ZoneScoped; using ghoul::filesystem::File; @@ -328,7 +328,7 @@ bool RingsComponent::isReady() const { } void RingsComponent::initializeGL() { - ZoneScoped + ZoneScoped; loadTexture(); compileShadowShader(); @@ -582,7 +582,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass, } void RingsComponent::update(const UpdateData& data) { - ZoneScoped + ZoneScoped; if (_shader && _shader->isDirty()) { compileShadowShader(); diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp index 1cbfde7041..49d843694a 100644 --- a/modules/globebrowsing/src/shadowcomponent.cpp +++ b/modules/globebrowsing/src/shadowcomponent.cpp @@ -204,7 +204,7 @@ bool ShadowComponent::isReady() const { } void ShadowComponent::initializeGL() { - ZoneScoped + ZoneScoped; createDepthTexture(); createShadowFBO(); @@ -353,7 +353,7 @@ void ShadowComponent::end() { } void ShadowComponent::update(const UpdateData&) { - ZoneScoped + ZoneScoped; SceneGraphNode* sun = global::renderEngine->scene()->sceneGraphNode("Sun"); if (sun) { diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp index 61a190908f..44635e21e8 100644 --- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp @@ -84,7 +84,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary) : _filePath(FilePathInfo, "") , _tilePixelSize(TilePixelSizeInfo, 32, 32, 2048) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -116,7 +116,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary) } void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData) { - ZoneScoped + ZoneScoped; _asyncTextureDataProvider = std::make_unique( name, @@ -129,7 +129,7 @@ void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData) } Tile DefaultTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; ghoul_assert(_asyncTextureDataProvider, "No data provider"); if (tileIndex.level > maxLevel()) { diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp index 440cd2eacc..02bce73b58 100644 --- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp @@ -71,7 +71,7 @@ ImageSequenceTileProvider::ImageSequenceTileProvider(const ghoul::Dictionary& di , _folderPath(FolderPathInfo) , _initDict(dictionary) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -90,7 +90,7 @@ ImageSequenceTileProvider::ImageSequenceTileProvider(const ghoul::Dictionary& di } Tile ImageSequenceTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; return _currentTileProvider ? _currentTileProvider->tile(tileIndex) : Tile(); } diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp index 1edb321baf..bbb31b053b 100644 --- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp @@ -51,7 +51,7 @@ documentation::Documentation SingleImageProvider::Documentation() { SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary) : _filePath(FilePathInfo) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -62,7 +62,7 @@ SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary) } Tile SingleImageProvider::tile(const TileIndex&) { - ZoneScoped + ZoneScoped; return _tile; } diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp index 9d911b321c..350d73258a 100644 --- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp @@ -47,7 +47,7 @@ documentation::Documentation SizeReferenceTileProvider::Documentation() { SizeReferenceTileProvider::SizeReferenceTileProvider(const ghoul::Dictionary& dictionary) : TextTileProvider(tileTextureInitData(layers::Group::ID::ColorLayers, false)) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -65,7 +65,7 @@ SizeReferenceTileProvider::SizeReferenceTileProvider(const ghoul::Dictionary& di } Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; const GeodeticPatch patch(tileIndex); const bool aboveEquator = patch.isNorthern(); diff --git a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp index 1aae72f3c8..2e3b44cdad 100644 --- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp @@ -52,7 +52,7 @@ documentation::Documentation SpoutImageProvider::Documentation() { SpoutImageProvider::SpoutImageProvider( [[maybe_unused]] const ghoul::Dictionary& dictionary) { - ZoneScoped + ZoneScoped; #ifdef OPENSPACE_HAS_SPOUT spoutReceiver = std::make_unique( @@ -159,7 +159,7 @@ SpoutImageProvider::SpoutImageProvider( } void SpoutImageProvider::internalInitialize() { - ZoneScoped + ZoneScoped; #ifdef OPENSPACE_HAS_SPOUT spoutReceiver->updateReceiver(); @@ -173,7 +173,7 @@ void SpoutImageProvider::internalDeinitialize() { } Tile SpoutImageProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; spoutUpdate = true; return tiles[tileIndex.x]; diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp index 7020b42a45..1b7752e987 100644 --- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp @@ -132,7 +132,7 @@ namespace { #include "temporaltileprovider_codegen.cpp" std::string_view timeStringify(const std::string& format, const openspace::Time& t) { - ZoneScoped + ZoneScoped; constexpr int BufferSize = 64; ghoul_assert(format.size() < BufferSize, "Format string too long"); @@ -165,7 +165,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary) , _useFixedTime(UseFixedTimeInfo, false) , _fixedTime(FixedTimeInfo) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -314,7 +314,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary) } Tile TemporalTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; if (!_currentTileProvider) { update(); } @@ -389,7 +389,7 @@ float TemporalTileProvider::noDataValueAsFloat() { DefaultTileProvider TemporalTileProvider::createTileProvider( std::string_view timekey) const { - ZoneScoped + ZoneScoped; std::string value; switch (_mode) { @@ -425,7 +425,7 @@ DefaultTileProvider TemporalTileProvider::createTileProvider( } DefaultTileProvider* TemporalTileProvider::retrieveTileProvider(const Time& t) { - ZoneScoped + ZoneScoped; const double time = t.j2000Seconds(); if (const auto it = _tileProviderMap.find(time); it != _tileProviderMap.end()) { @@ -665,7 +665,7 @@ TileProvider* TemporalTileProvider::tileProvider(const Time& time) { TemporalTileProvider::InterpolateTileProvider::InterpolateTileProvider( const ghoul::Dictionary&) { - ZoneScoped + ZoneScoped; glGenFramebuffers(1, &fbo); glGenVertexArrays(1, &vaoQuad); @@ -712,7 +712,7 @@ TemporalTileProvider::InterpolateTileProvider::~InterpolateTileProvider() { } Tile TemporalTileProvider::InterpolateTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; TracyGpuZone("tile"); // prev and next are the two tiles to interpolate between diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp index 8918543afe..2624ac21d8 100644 --- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp @@ -39,7 +39,7 @@ TextTileProvider::TextTileProvider(TileTextureInitData initData_, size_t fontSiz : initData(std::move(initData_)) , fontSize(fontSize_) { - ZoneScoped + ZoneScoped; tileCache = global::moduleEngine->module()->tileCache(); } @@ -47,7 +47,7 @@ TextTileProvider::TextTileProvider(TileTextureInitData initData_, size_t fontSiz TextTileProvider::~TextTileProvider() {} void TextTileProvider::internalInitialize() { - ZoneScoped + ZoneScoped; font = global::fontManager->font("Mono", static_cast(fontSize)); fontRenderer = ghoul::fontrendering::FontRenderer::createDefault(); @@ -62,8 +62,8 @@ void TextTileProvider::internalDeinitialize() { Tile TextTileProvider::renderTile(const TileIndex& tileIndex, const std::string& text, const glm::vec2& position, const glm::vec4& color) { - ZoneScoped - TracyGpuZone("tile") + ZoneScoped; + TracyGpuZone("tile"); cache::ProviderTileKey key = { tileIndex, uniqueIdentifier }; Tile tile = tileCache->get(key); @@ -101,7 +101,7 @@ Tile TextTileProvider::renderTile(const TileIndex& tileIndex, const std::string& } void TextTileProvider::reset() { - ZoneScoped + ZoneScoped; tileCache->clear(); } diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp index a2bf5c54ef..8323cc62c7 100644 --- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp @@ -31,7 +31,7 @@ TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary&) {} Tile TileIndexTileProvider::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; std::string text = fmt::format( "level: {}\nx: {}\ny: {}", tileIndex.level, tileIndex.x, tileIndex.y ); diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp index 4cc1ecb54a..ea7be68be1 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp @@ -73,7 +73,7 @@ std::unique_ptr TileProvider::createFromDictionary( layers::Layer::ID layerTypeID, const ghoul::Dictionary& dictionary) { - ZoneScoped + ZoneScoped; std::string_view type = layers::Layers[static_cast(layerTypeID)].identifier; @@ -86,9 +86,9 @@ std::unique_ptr TileProvider::createFromDictionary( } void TileProvider::initializeDefaultTile() { - ZoneScoped + ZoneScoped; - ghoul_assert(!DefaultTile.texture, "Default tile should not have been created"); + ghoul_assert(!DefaultTile.texture, "Default tile should not have been created"); using namespace ghoul::opengl; // Create pixel data @@ -123,7 +123,7 @@ TileProvider::TileProvider() {} void TileProvider::initialize() { - ZoneScoped + ZoneScoped; ghoul_assert(!isInitialized, "TileProvider can only be initialized once"); @@ -147,7 +147,7 @@ void TileProvider::initialize() { } void TileProvider::deinitialize() { - ZoneScoped + ZoneScoped; internalDeinitialize(); } @@ -156,7 +156,7 @@ void TileProvider::internalInitialize() {} void TileProvider::internalDeinitialize() {} ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) { - ZoneScoped + ZoneScoped; ghoul_assert(isInitialized, "TileProvider was not initialized"); @@ -213,7 +213,7 @@ ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParen } ChunkTilePile TileProvider::chunkTilePile(TileIndex tileIndex, int pileSize) { - ZoneScoped + ZoneScoped; ghoul_assert(isInitialized, "TileProvider was not initialized"); ghoul_assert(pileSize >= 0, "pileSize must be positive"); diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp index 483a65840c..30428e5724 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp +++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp @@ -65,7 +65,7 @@ documentation::Documentation TileProviderByIndex::Documentation() { } TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -108,7 +108,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) { } Tile TileProviderByIndex::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; const auto it = _providers.find(tileIndex.hashKey()); const bool hasProvider = it != _providers.end(); return hasProvider ? it->second->tile(tileIndex) : Tile(); diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp index 2444930378..da1228fa40 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp +++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp @@ -46,7 +46,7 @@ documentation::Documentation TileProviderByLevel::Documentation() { } TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) { - ZoneScoped + ZoneScoped; const Parameters p = codegen::bake(dictionary); @@ -107,7 +107,7 @@ void TileProviderByLevel::internalDeinitialize() { } Tile TileProviderByLevel::tile(const TileIndex& tileIndex) { - ZoneScoped + ZoneScoped; TileProvider* provider = levelProvider(tileIndex.level); if (provider) { @@ -124,7 +124,7 @@ Tile::Status TileProviderByLevel::tileStatus(const TileIndex& index) { } TileProvider* TileProviderByLevel::levelProvider(int level) const { - ZoneScoped + ZoneScoped; if (!_levelTileProviders.empty()) { int clampedLevel = glm::clamp( diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp index ba485293a9..b51ddcf2cc 100644 --- a/modules/globebrowsing/src/timequantizer.cpp +++ b/modules/globebrowsing/src/timequantizer.cpp @@ -479,7 +479,7 @@ double TimeQuantizer::computeSecondsFromResolution(const int valueIn, const char } bool TimeQuantizer::quantize(Time& t, bool clamp) { - ZoneScoped + ZoneScoped; constexpr const char Format[] = "YYYY-MM-DDTHR:MN:SC.###"; constexpr int BufferSize = sizeof(Format); @@ -551,7 +551,7 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) { void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, double value, char unit) { - ZoneScoped + ZoneScoped; switch (unit) { case 'y': diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp index a7c178bf1a..50c634fccc 100644 --- a/modules/imgui/imguimodule.cpp +++ b/modules/imgui/imguimodule.cpp @@ -126,7 +126,7 @@ ImGUIModule::ImGUIModule() } global::callback::draw2D->emplace_back([&]() { - ZoneScopedN("ImGUI") + ZoneScopedN("ImGUI"); if (!_isEnabled) { return; @@ -156,7 +156,7 @@ ImGUIModule::ImGUIModule() [&](Key key, KeyModifier mod, KeyAction action, IsGuiWindow isGuiWindow) -> bool { - ZoneScopedN("ImGUI") + ZoneScopedN("ImGUI"); if (!isGuiWindow || !_isEnabled) { return false; @@ -169,7 +169,7 @@ ImGUIModule::ImGUIModule() [&](unsigned int codepoint, KeyModifier modifier, IsGuiWindow isGuiWindow) -> bool { - ZoneScopedN("ImGUI") + ZoneScopedN("ImGUI"); if (!isGuiWindow || !_isEnabled) { return false; @@ -191,7 +191,7 @@ ImGUIModule::ImGUIModule() [&](MouseButton button, MouseAction action, KeyModifier, IsGuiWindow isGuiWindow) -> bool { - ZoneScopedN("ImGUI") + ZoneScopedN("ImGUI"); if (!isGuiWindow) { return false; @@ -210,7 +210,7 @@ ImGUIModule::ImGUIModule() global::callback::mouseScrollWheel->emplace_back( [&](double, double posY, IsGuiWindow isGuiWindow) -> bool { - ZoneScopedN("ImGUI") + ZoneScopedN("ImGUI"); if (!isGuiWindow || !_isEnabled) { return false; diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index 4024424b77..599d396b59 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -44,7 +44,7 @@ namespace openspace { IswaModule::IswaModule() : OpenSpaceModule(Name) { global::callback::initialize->push_back([]() { - ZoneScopedN("IswaModule") + ZoneScopedN("IswaModule"); IswaManager::initialize(); }); } diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp index 86fa11a7f2..424ad59747 100644 --- a/modules/server/servermodule.cpp +++ b/modules/server/servermodule.cpp @@ -88,7 +88,7 @@ int ServerModule::skyBrowserUpdateTime() const { void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) { global::callback::preSync->emplace_back([this]() { - ZoneScopedN("ServerModule") + ZoneScopedN("ServerModule"); preSync(); }); @@ -173,7 +173,7 @@ void ServerModule::preSync() { } void ServerModule::cleanUpFinishedThreads() { - ZoneScoped + ZoneScoped; for (ConnectionData& connectionData : _connections) { Connection& connection = *connectionData.connection; @@ -194,7 +194,7 @@ void ServerModule::cleanUpFinishedThreads() { } void ServerModule::disconnectAll() { - ZoneScoped + ZoneScoped; for (std::unique_ptr& serverInterface : _interfaces) { serverInterface->deinitialize(); @@ -211,7 +211,7 @@ void ServerModule::disconnectAll() { } void ServerModule::handleConnection(std::shared_ptr connection) { - ZoneScoped + ZoneScoped; std::string messageString; messageString.reserve(256); @@ -222,7 +222,7 @@ void ServerModule::handleConnection(std::shared_ptr connection) { } void ServerModule::consumeMessages() { - ZoneScoped + ZoneScoped; std::lock_guard lock(_messageQueueMutex); while (!_messageQueue.empty()) { diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp index 5700ea12fa..05b3c9d50a 100644 --- a/modules/server/src/connection.cpp +++ b/modules/server/src/connection.cpp @@ -99,7 +99,7 @@ Connection::Connection(std::unique_ptr s, std::string address } void Connection::handleMessage(const std::string& message) { - ZoneScoped + ZoneScoped; try { nlohmann::json j = nlohmann::json::parse(message.c_str()); @@ -140,7 +140,7 @@ void Connection::handleMessage(const std::string& message) { } void Connection::handleJson(const nlohmann::json& json) { - ZoneScoped + ZoneScoped; auto topicJson = json.find(MessageKeyTopic); auto payloadJson = json.find(MessageKeyPayload); @@ -196,13 +196,13 @@ void Connection::handleJson(const nlohmann::json& json) { } void Connection::sendMessage(const std::string& message) { - ZoneScoped + ZoneScoped; _socket->putMessage(message); } void Connection::sendJson(const nlohmann::json& json) { - ZoneScoped + ZoneScoped; sendMessage(json.dump()); } diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp index 98ecc5720a..1ed325c15d 100644 --- a/modules/server/src/topics/timetopic.cpp +++ b/modules/server/src/topics/timetopic.cpp @@ -133,7 +133,7 @@ const json TimeTopic::getNextPrevDeltaTimeStepJson() { } void TimeTopic::sendCurrentTime() { - ZoneScoped + ZoneScoped; const json timeJson = { { "time", global::timeManager->time().ISO8601() } diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp index 04c39600e5..bce34c07e4 100644 --- a/modules/server/src/topics/topic.cpp +++ b/modules/server/src/topics/topic.cpp @@ -36,7 +36,7 @@ void Topic::initialize(std::shared_ptr connection, size_t topicId) { } nlohmann::json Topic::wrappedPayload(const nlohmann::json& payload) const { - ZoneScoped + ZoneScoped; // TODO: add message time nlohmann::json j = { @@ -47,7 +47,7 @@ nlohmann::json Topic::wrappedPayload(const nlohmann::json& payload) const { } nlohmann::json Topic::wrappedError(std::string message, int code) { - ZoneScoped + ZoneScoped; nlohmann::json j = { { "topic", _topicId }, diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp index ffafd90740..342589ce45 100644 --- a/modules/skybrowser/src/renderableskytarget.cpp +++ b/modules/skybrowser/src/renderableskytarget.cpp @@ -185,7 +185,7 @@ void RenderableSkyTarget::applyRoll() { } void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) { - ZoneScoped + ZoneScoped; const bool showRectangle = _verticalFov > _showRectangleThreshold; glm::vec4 color = glm::vec4(glm::vec3(_borderColor) / 255.f, 1.0); diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index a2559daee9..bdb34c7444 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -116,7 +116,7 @@ DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dict } void DashboardItemInstruments::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; double currentTime = global::timeManager->time().j2000Seconds(); diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp index d0fb479773..2ce8cfd89c 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp @@ -44,7 +44,7 @@ ghoul::opengl::ProgramObjectManager SpacecraftInstrumentsModule::ProgramObjectMa SpacecraftInstrumentsModule::SpacecraftInstrumentsModule() : OpenSpaceModule(Name) {} void SpacecraftInstrumentsModule::internalInitialize(const ghoul::Dictionary&) { - ZoneScoped + ZoneScoped; ImageSequencer::initialize(); diff --git a/modules/touch/src/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp index 89360bfb3c..e6b0515e37 100644 --- a/modules/touch/src/directinputsolver.cpp +++ b/modules/touch/src/directinputsolver.cpp @@ -212,7 +212,7 @@ bool DirectInputSolver::solve(const std::vector& list, const std::vector& selectedBodies, std::vector* parameters, const Camera& camera) { - ZoneScopedN("Direct touch input solver") + ZoneScopedN("Direct touch input solver"); ghoul_assert( selectedBodies.size() >= list.size(), diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp index 81e7e249ab..c52d7877ce 100644 --- a/modules/webbrowser/src/browserinstance.cpp +++ b/modules/webbrowser/src/browserinstance.cpp @@ -110,14 +110,14 @@ bool BrowserInstance::loadLocalPath(std::string path) { } void BrowserInstance::reshape(const glm::ivec2& windowSize) { - ZoneScoped + ZoneScoped; _renderHandler->reshape(windowSize.x, windowSize.y); _browser->GetHost()->WasResized(); } void BrowserInstance::draw() { - ZoneScoped + ZoneScoped; if (_zoomLevel != _browser->GetHost()->GetZoomLevel()) { _browser->GetHost()->SetZoomLevel(_zoomLevel); diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp index 3e7cd9fa51..1d76f6b86e 100644 --- a/modules/webbrowser/src/cefhost.cpp +++ b/modules/webbrowser/src/cefhost.cpp @@ -88,7 +88,7 @@ void CefHost::attachDebugSettings(CefSettings &settings) { } void CefHost::doMessageLoopWork() { - ZoneScoped + ZoneScoped; CefDoMessageLoopWork(); } diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp index 0c62a50c46..cbb4bbf57e 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -78,7 +78,7 @@ WebBrowserModule::WebBrowserModule() , _eventHandler(new EventHandler) { global::callback::deinitialize->emplace_back([this]() { - ZoneScopedN("WebBrowserModule") + ZoneScopedN("WebBrowserModule"); deinitialize(); }); @@ -103,7 +103,7 @@ WebBrowserModule::WebBrowserModule() } void WebBrowserModule::internalDeinitialize() { - ZoneScoped + ZoneScoped; if (!_enabled) { return; @@ -128,7 +128,7 @@ std::filesystem::path WebBrowserModule::findHelperExecutable() { } void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) { - ZoneScoped + ZoneScoped; if (dictionary.hasValue("WebHelperLocation")) { _webHelperLocation = absPath(dictionary.value("WebHelperLocation")); @@ -166,7 +166,7 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) { } void WebBrowserModule::addBrowser(BrowserInstance* browser) { - ZoneScoped + ZoneScoped; if (_enabled) { _browsers.push_back(browser); diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp index 737a0dd8ae..b334a39a77 100644 --- a/modules/webgui/webguimodule.cpp +++ b/modules/webgui/webguimodule.cpp @@ -224,7 +224,7 @@ void WebGuiModule::notifyEndpointListeners(const std::string& endpoint, bool exi } void WebGuiModule::startProcess() { - ZoneScoped + ZoneScoped; _endpoints.clear(); diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp index 02f41a9043..67a09af822 100644 --- a/src/documentation/documentationengine.cpp +++ b/src/documentation/documentationengine.cpp @@ -194,7 +194,7 @@ std::vector DocumentationEngine::documentations() const { void DocumentationEngine::writeDocumentationHtml(const std::string& path, std::string data) { - ZoneScoped + ZoneScoped; std::ifstream handlebarsInput; handlebarsInput.exceptions(~std::ofstream::goodbit); diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp index 6c10a99b75..0d88e41d5f 100644 --- a/src/engine/globals.cpp +++ b/src/engine/globals.cpp @@ -111,7 +111,7 @@ namespace { namespace openspace::global { void create() { - ZoneScoped + ZoneScoped; callback::create(); @@ -380,7 +380,7 @@ void create() { } void initialize() { - ZoneScoped + ZoneScoped; rootPropertyOwner->addPropertySubOwner(global::moduleEngine); @@ -405,8 +405,7 @@ void initialize() { } void initializeGL() { - ZoneScoped - + ZoneScoped; } void destroy() { @@ -631,7 +630,7 @@ void destroy() { } void deinitialize() { - ZoneScoped + ZoneScoped; for (std::unique_ptr& ssr : *screenSpaceRenderables) { ssr->deinitialize(); @@ -646,7 +645,7 @@ void deinitialize() { } void deinitializeGL() { - ZoneScoped + ZoneScoped; for (std::unique_ptr& ssr : *screenSpaceRenderables) { ssr->deinitializeGL(); diff --git a/src/engine/globalscallbacks.cpp b/src/engine/globalscallbacks.cpp index df482d18d1..076dfef258 100644 --- a/src/engine/globalscallbacks.cpp +++ b/src/engine/globalscallbacks.cpp @@ -58,7 +58,7 @@ namespace { } // namespace void create() { - ZoneScoped + ZoneScoped; #ifdef WIN32 std::fill(DataStorage.begin(), DataStorage.end(), std::byte(0)); diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp index 334d2a6241..e2fe9f2a3b 100644 --- a/src/engine/moduleengine.cpp +++ b/src/engine/moduleengine.cpp @@ -59,7 +59,7 @@ ModuleEngine::ModuleEngine() void ModuleEngine::initialize( const std::map& moduleConfigurations) { - ZoneScoped + ZoneScoped; std::vector modules = AllModules(); @@ -91,7 +91,7 @@ void ModuleEngine::initialize( } void ModuleEngine::initializeGL() { - ZoneScoped + ZoneScoped; LDEBUG("Initializing OpenGL of modules"); for (std::unique_ptr& m : _modules) { @@ -102,7 +102,7 @@ void ModuleEngine::initializeGL() { } void ModuleEngine::deinitialize() { - ZoneScoped + ZoneScoped; LDEBUG("Deinitializing modules"); @@ -122,7 +122,7 @@ void ModuleEngine::deinitialize() { } void ModuleEngine::deinitializeGL() { - ZoneScoped + ZoneScoped; LDEBUG("Deinitializing OpenGL of modules"); for (auto mIt = _modules.rbegin(); mIt != _modules.rend(); ++mIt) { @@ -134,7 +134,7 @@ void ModuleEngine::deinitializeGL() { } void ModuleEngine::registerModule(std::unique_ptr mod) { - ZoneScoped + ZoneScoped; ghoul_assert(mod, "Module must not be nullptr"); diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 5fec1e031b..74a956a502 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -202,7 +202,7 @@ void OpenSpaceEngine::registerPathTokens() { } void OpenSpaceEngine::initialize() { - ZoneScoped + ZoneScoped; LTRACE("OpenSpaceEngine::initialize(begin)"); @@ -379,7 +379,7 @@ void OpenSpaceEngine::initialize() { global::renderEngine->initialize(); for (const std::function& func : *global::callback::initialize) { - ZoneScopedN("[Module] initialize") + ZoneScopedN("[Module] initialize"); func(); } @@ -388,7 +388,7 @@ void OpenSpaceEngine::initialize() { } void OpenSpaceEngine::initializeGL() { - ZoneScoped + ZoneScoped; LTRACE("OpenSpaceEngine::initializeGL(begin)"); @@ -663,7 +663,7 @@ void OpenSpaceEngine::initializeGL() { for (const std::function& func : *global::callback::initializeGL) { - ZoneScopedN("[Module] initializeGL") + ZoneScopedN("[Module] initializeGL"); func(); } @@ -673,7 +673,7 @@ void OpenSpaceEngine::initializeGL() { } void OpenSpaceEngine::loadAssets() { - ZoneScoped + ZoneScoped; LTRACE("OpenSpaceEngine::loadAsset(begin)"); @@ -731,7 +731,7 @@ void OpenSpaceEngine::loadAssets() { _assetManager->allSynchronizations(); for (const ResourceSynchronization* sync : allSyncs) { - ZoneScopedN("Update resource synchronization") + ZoneScopedN("Update resource synchronization"); if (sync->isSyncing()) { LoadingScreen::ProgressInfo progressInfo; @@ -869,7 +869,7 @@ void OpenSpaceEngine::loadAssets() { } void OpenSpaceEngine::deinitialize() { - ZoneScoped + ZoneScoped; LTRACE("OpenSpaceEngine::deinitialize(begin)"); @@ -913,7 +913,7 @@ void OpenSpaceEngine::deinitialize() { } void OpenSpaceEngine::deinitializeGL() { - ZoneScoped + ZoneScoped; LTRACE("OpenSpaceEngine::deinitializeGL(begin)"); @@ -953,7 +953,7 @@ void OpenSpaceEngine::createUserDirectoriesIfNecessary() { } void OpenSpaceEngine::runGlobalCustomizationScripts() { - ZoneScoped + ZoneScoped; LINFO("Running Global initialization scripts"); ghoul::lua::LuaState state; @@ -1006,7 +1006,7 @@ void OpenSpaceEngine::loadFonts() { } void OpenSpaceEngine::writeDocumentation() { - ZoneScoped + ZoneScoped; // Write documentation to json files if config file supplies path for doc files std::string path = global::configuration->documentation.path; @@ -1085,8 +1085,8 @@ void OpenSpaceEngine::writeDocumentation() { } void OpenSpaceEngine::preSynchronization() { - ZoneScoped - TracyGpuZone("preSynchronization") + ZoneScoped; + TracyGpuZone("preSynchronization"); LTRACE("OpenSpaceEngine::preSynchronization(begin)"); @@ -1147,7 +1147,7 @@ void OpenSpaceEngine::preSynchronization() { } for (const std::function& func : *global::callback::preSync) { - ZoneScopedN("[Module] preSync") + ZoneScopedN("[Module] preSync"); func(); } @@ -1173,8 +1173,8 @@ void OpenSpaceEngine::preSynchronization() { } void OpenSpaceEngine::postSynchronizationPreDraw() { - ZoneScoped - TracyGpuZone("postSynchronizationPreDraw") + ZoneScoped; + TracyGpuZone("postSynchronizationPreDraw"); LTRACE("OpenSpaceEngine::postSynchronizationPreDraw(begin)"); bool master = global::windowDelegate->isMaster(); @@ -1213,7 +1213,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() { } for (const std::function& func : *global::callback::postSyncPreDraw) { - ZoneScopedN("[Module] postSyncPreDraw") + ZoneScopedN("[Module] postSyncPreDraw"); func(); } @@ -1243,14 +1243,14 @@ void OpenSpaceEngine::postSynchronizationPreDraw() { void OpenSpaceEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix, const glm::mat4& projectionMatrix) { - ZoneScoped - TracyGpuZone("Render") + ZoneScoped; + TracyGpuZone("Render"); LTRACE("OpenSpaceEngine::render(begin)"); global::renderEngine->render(sceneMatrix, viewMatrix, projectionMatrix); for (const std::function& func : *global::callback::render) { - ZoneScopedN("[Module] render") + ZoneScopedN("[Module] render"); func(); } @@ -1259,8 +1259,8 @@ void OpenSpaceEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& view } void OpenSpaceEngine::drawOverlays() { - ZoneScoped - TracyGpuZone("Draw2D") + ZoneScoped; + TracyGpuZone("Draw2D"); LTRACE("OpenSpaceEngine::drawOverlays(begin)"); const bool isGuiWindow = @@ -1275,7 +1275,7 @@ void OpenSpaceEngine::drawOverlays() { } for (const std::function& func : *global::callback::draw2D) { - ZoneScopedN("[Module] draw2D") + ZoneScopedN("[Module] draw2D"); func(); } @@ -1283,14 +1283,14 @@ void OpenSpaceEngine::drawOverlays() { } void OpenSpaceEngine::postDraw() { - ZoneScoped - TracyGpuZone("postDraw") + ZoneScoped; + TracyGpuZone("postDraw"); LTRACE("OpenSpaceEngine::postDraw(begin)"); global::renderEngine->postDraw(); for (const std::function& func : *global::callback::postDraw) { - ZoneScopedN("[Module] postDraw") + ZoneScopedN("[Module] postDraw"); func(); } @@ -1324,7 +1324,7 @@ void OpenSpaceEngine::postDraw() { } void OpenSpaceEngine::resetPropertyChangeFlags() { - ZoneScoped + ZoneScoped; std::vector nodes = global::renderEngine->scene()->allSceneGraphNodes(); @@ -1345,7 +1345,7 @@ void OpenSpaceEngine::resetPropertyChangeFlagsOfSubowners(properties::PropertyOw void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction action, IsGuiWindow isGuiWindow) { - ZoneScoped + ZoneScoped; if (_loadingScreen) { // If the loading screen object exists, we are currently loading and want key @@ -1396,7 +1396,7 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier, IsGuiWindow isGuiWindow) { - ZoneScoped + ZoneScoped; using F = global::callback::CharacterCallback; for (const F& func : *global::callback::character) { @@ -1420,7 +1420,7 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier, void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action, KeyModifier mods, IsGuiWindow isGuiWindow) { - ZoneScoped + ZoneScoped; if (_disableAllMouseInputs) { return; @@ -1465,7 +1465,7 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action } void OpenSpaceEngine::mousePositionCallback(double x, double y, IsGuiWindow isGuiWindow) { - ZoneScoped + ZoneScoped; if (_disableAllMouseInputs) { return; @@ -1485,7 +1485,7 @@ void OpenSpaceEngine::mousePositionCallback(double x, double y, IsGuiWindow isGu void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY, IsGuiWindow isGuiWindow) { - ZoneScoped + ZoneScoped; if (_disableAllMouseInputs) { return; @@ -1504,7 +1504,7 @@ void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY, } void OpenSpaceEngine::touchDetectionCallback(TouchInput input) { - ZoneScoped + ZoneScoped; using F = std::function; for (const F& func : *global::callback::touchDetected) { @@ -1516,7 +1516,7 @@ void OpenSpaceEngine::touchDetectionCallback(TouchInput input) { } void OpenSpaceEngine::touchUpdateCallback(TouchInput input) { - ZoneScoped + ZoneScoped; using F = std::function; for (const F& func : *global::callback::touchUpdated) { @@ -1528,7 +1528,7 @@ void OpenSpaceEngine::touchUpdateCallback(TouchInput input) { } void OpenSpaceEngine::touchExitCallback(TouchInput input) { - ZoneScoped + ZoneScoped; using F = std::function; for (const F& func : *global::callback::touchExit) { @@ -1582,13 +1582,13 @@ void OpenSpaceEngine::handleDragDrop(std::filesystem::path file) { } std::vector OpenSpaceEngine::encode() { - ZoneScoped + ZoneScoped; return global::syncEngine->encodeSyncables(); } void OpenSpaceEngine::decode(std::vector data) { - ZoneScoped + ZoneScoped; global::syncEngine->decodeSyncables(std::move(data)); } diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp index bd5b77e34e..5815645218 100644 --- a/src/engine/syncengine.cpp +++ b/src/engine/syncengine.cpp @@ -59,7 +59,7 @@ void SyncEngine::decodeSyncables(std::vector data) { } void SyncEngine::preSynchronization(IsMaster isMaster) { - ZoneScoped + ZoneScoped; for (Syncable* syncable : _syncables) { syncable->preSync(isMaster); @@ -67,7 +67,7 @@ void SyncEngine::preSynchronization(IsMaster isMaster) { } void SyncEngine::postSynchronization(IsMaster isMaster) { - ZoneScoped + ZoneScoped; for (Syncable* syncable : _syncables) { syncable->postSync(isMaster); diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp index 7dc6d83ef8..50dda095db 100644 --- a/src/interaction/keybindingmanager.cpp +++ b/src/interaction/keybindingmanager.cpp @@ -120,7 +120,7 @@ const std::multimap& KeybindingManager::keyBinding } std::string KeybindingManager::generateJson() const { - ZoneScoped + ZoneScoped; std::stringstream json; json << "["; diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp index f43eca5b69..cc25f89000 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -973,7 +973,7 @@ bool SessionRecording::isPropertyAllowedForBaseline(const std::string& propStrin } void SessionRecording::preSynchronization() { - ZoneScoped + ZoneScoped; if (_state == SessionState::Recording) { saveCameraKeyframeToTimeline(); @@ -1003,7 +1003,7 @@ void SessionRecording::preSynchronization() { } void SessionRecording::render() { - ZoneScoped + ZoneScoped; if (!(_renderPlaybackInformation && isPlayingBack())) { return; diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index eda88cf974..e91f761e54 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -107,7 +107,7 @@ NavigationHandler::NavigationHandler() NavigationHandler::~NavigationHandler() {} void NavigationHandler::initialize() { - ZoneScoped + ZoneScoped; global::parallelPeer->connectionEvent().subscribe( "NavigationHandler", @@ -120,7 +120,7 @@ void NavigationHandler::initialize() { } void NavigationHandler::deinitialize() { - ZoneScoped + ZoneScoped; global::parallelPeer->connectionEvent().unsubscribe("NavigationHandler"); } diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index 5221421dbc..60bd016d3d 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -539,7 +539,7 @@ void ParallelPeer::resetTimeOffset() { } void ParallelPeer::preSynchronization() { - ZoneScoped + ZoneScoped; std::unique_lock unlock(_receiveBufferMutex); while (!_receiveBuffer.empty()) { diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp index 102efe135f..7a342787ca 100644 --- a/src/properties/propertyowner.cpp +++ b/src/properties/propertyowner.cpp @@ -41,7 +41,7 @@ namespace { constexpr std::string_view _loggerCat = "PropertyOwner"; void createJson(openspace::properties::PropertyOwner* owner, std::vector& buf) { - ZoneScoped + ZoneScoped; using namespace openspace; @@ -416,7 +416,7 @@ void PropertyOwner::removeTag(const std::string& tag) { } std::string PropertyOwner::generateJson() const { - ZoneScoped + ZoneScoped; std::vector res; res.reserve(5 * 51024 * 1024); // 5 MB diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp index a1db949730..d2b99fcdaf 100644 --- a/src/rendering/dashboard.cpp +++ b/src/rendering/dashboard.cpp @@ -131,7 +131,7 @@ void Dashboard::clearDashboardItems() { } void Dashboard::render(glm::vec2& penPosition) { - ZoneScoped + ZoneScoped; if (!_isEnabled) { return; diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index aec9577c4e..e126b424de 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -88,7 +88,7 @@ namespace { namespace openspace { void FramebufferRenderer::initialize() { - ZoneScoped + ZoneScoped; TracyGpuZone("Rendering initialize"); LDEBUG("Initializing FramebufferRenderer"); @@ -377,8 +377,8 @@ void FramebufferRenderer::initialize() { } void FramebufferRenderer::deinitialize() { - ZoneScoped - TracyGpuZone("Renderer deinitialize") + ZoneScoped; + TracyGpuZone("Renderer deinitialize"); LINFO("Deinitializing FramebufferRenderer"); @@ -424,8 +424,8 @@ void FramebufferRenderer::deferredcastersChanged(Deferredcaster&, } void FramebufferRenderer::applyTMO(float blackoutFactor, const glm::ivec4& viewport) { - ZoneScoped - TracyGpuZone("applyTMO") + ZoneScoped; + TracyGpuZone("applyTMO"); _hdrFilteringProgram->activate(); @@ -693,8 +693,8 @@ void FramebufferRenderer::update() { } void FramebufferRenderer::updateResolution() { - ZoneScoped - TracyGpuZone("Renderer updateResolution") + ZoneScoped; + TracyGpuZone("Renderer updateResolution"); glBindTexture(GL_TEXTURE_2D, _gBuffers.colorTexture); glTexImage2D( @@ -950,7 +950,7 @@ void FramebufferRenderer::updateResolution() { } void FramebufferRenderer::updateRaycastData() { - ZoneScoped + ZoneScoped; _raycastData.clear(); _exitPrograms.clear(); @@ -962,7 +962,7 @@ void FramebufferRenderer::updateRaycastData() { int nextId = 0; for (VolumeRaycaster* raycaster : raycasters) { - ZoneScopedN("raycaster") + ZoneScopedN("raycaster"); RaycastData data = { .id = nextId++, .namespaceName = "Helper" }; @@ -1070,7 +1070,7 @@ void FramebufferRenderer::updateDeferredcastData() { void FramebufferRenderer::updateHDRAndFiltering() { - ZoneScoped + ZoneScoped; _hdrFilteringProgram = ghoul::opengl::ProgramObject::Build( "HDR and Filtering Program", @@ -1080,7 +1080,7 @@ void FramebufferRenderer::updateHDRAndFiltering() { } void FramebufferRenderer::updateFXAA() { - ZoneScoped + ZoneScoped; _fxaaProgram = ghoul::opengl::ProgramObject::Build( "FXAA Program", @@ -1090,7 +1090,7 @@ void FramebufferRenderer::updateFXAA() { } void FramebufferRenderer::updateDownscaledVolume() { - ZoneScoped + ZoneScoped; _downscaledVolumeProgram = ghoul::opengl::ProgramObject::Build( "Write Downscaled Volume Program", @@ -1100,8 +1100,8 @@ void FramebufferRenderer::updateDownscaledVolume() { } void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFactor) { - ZoneScoped - TracyGpuZone("FramebufferRenderer") + ZoneScoped; + TracyGpuZone("FramebufferRenderer"); glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO); global::renderEngine->openglStateCache().setDefaultFramebuffer(_defaultFBO); @@ -1122,8 +1122,8 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac { // deferred g-buffer - ZoneScopedN("Deferred G-Buffer") - TracyGpuZone("Deferred G-Buffer") + ZoneScopedN("Deferred G-Buffer"); + TracyGpuZone("Deferred G-Buffer"); glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer); glDrawBuffers(3, ColorAttachmentArray); @@ -1186,7 +1186,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac glEnablei(GL_BLEND, 0); { - TracyGpuZone("PostDeferredTransparent") + TracyGpuZone("PostDeferredTransparent"); ghoul::GLDebugGroup group("PostDeferredTransparent"); data.renderBinMask = static_cast( Renderable::RenderBin::PostDeferredTransparent @@ -1195,7 +1195,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac } { - TracyGpuZone("Overlay") + TracyGpuZone("Overlay"); ghoul::GLDebugGroup group("Overlay"); data.renderBinMask = static_cast(Renderable::RenderBin::Overlay); scene->render(data, tasks); @@ -1220,7 +1220,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac { // Apply the selected TMO on the results and resolve the result to the default FBO - TracyGpuZone("Apply TMO") + TracyGpuZone("Apply TMO"); ghoul::GLDebugGroup group("Apply TMO"); applyTMO(blackoutFactor, viewport); @@ -1237,10 +1237,10 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac void FramebufferRenderer::performRaycasterTasks(const std::vector& tasks, const glm::ivec4& viewport) { - ZoneScoped + ZoneScoped; for (const RaycasterTask& raycasterTask : tasks) { - TracyGpuZone("Raycaster") + TracyGpuZone("Raycaster"); VolumeRaycaster* raycaster = raycasterTask.raycaster; @@ -1374,10 +1374,10 @@ void FramebufferRenderer::performDeferredTasks( const std::vector& tasks, const glm::ivec4& viewport) { - ZoneScoped + ZoneScoped; for (const DeferredcasterTask& deferredcasterTask : tasks) { - TracyGpuZone("Deferredcaster") + TracyGpuZone("Deferredcaster"); Deferredcaster* deferredcaster = deferredcasterTask.deferredcaster; @@ -1500,7 +1500,7 @@ void FramebufferRenderer::enableFXAA(bool enable) { } void FramebufferRenderer::updateRendererData() { - ZoneScoped + ZoneScoped; ghoul::Dictionary dict; dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath)); diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp index b6f1c9c105..61c841be35 100644 --- a/src/rendering/helper.cpp +++ b/src/rendering/helper.cpp @@ -144,8 +144,8 @@ VertexObjects& gVertexObjectsConstructor() { } // namespace detail void initialize() { - ZoneScoped - TracyGpuZone("helper::initialize") + ZoneScoped; + TracyGpuZone("helper::initialize"); ghoul_assert(!isInitialized, "Rendering Helper initialized twice"); diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp index 3b081b05da..73ceb3841c 100644 --- a/src/rendering/loadingscreen.cpp +++ b/src/rendering/loadingscreen.cpp @@ -153,8 +153,8 @@ LoadingScreen::~LoadingScreen() { } void LoadingScreen::render() { - ZoneScoped - FrameMarkStart("Loading") + ZoneScoped; + FrameMarkStart("Loading"); if (_phase == Phase::PreStart) { return; @@ -479,7 +479,7 @@ void LoadingScreen::render() { std::this_thread::sleep_for(RefreshRate); global::windowDelegate->swapBuffer(); - FrameMarkEnd("Loading") + FrameMarkEnd("Loading"); } void LoadingScreen::postMessage(std::string message) { diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index be93a7c9b0..3c2404ec48 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -169,7 +169,7 @@ LuaConsole::LuaConsole() LuaConsole::~LuaConsole() {} void LuaConsole::initialize() { - ZoneScoped + ZoneScoped; const std::filesystem::path filename = FileSys.cacheManager()->cachedFilename( HistoryFile, @@ -234,7 +234,7 @@ void LuaConsole::initialize() { } void LuaConsole::deinitialize() { - ZoneScoped + ZoneScoped; const std::filesystem::path filename = FileSys.cacheManager()->cachedFilename( HistoryFile, @@ -603,7 +603,7 @@ void LuaConsole::charCallback(unsigned int codepoint, } void LuaConsole::update() { - ZoneScoped + ZoneScoped; // Compute the height by simulating _historyFont number of lines and checking // what the bounding box for that text would be. @@ -639,7 +639,7 @@ void LuaConsole::update() { } void LuaConsole::render() { - ZoneScoped + ZoneScoped; using namespace ghoul::fontrendering; diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index bfdae64f07..ccfc3dbbce 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -161,7 +161,7 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary) , _renderableType(RenderableTypeInfo, "Renderable") , _dimInAtmosphere(DimInAtmosphereInfo, false) { - ZoneScoped + ZoneScoped; // I can't come up with a good reason not to do this for all renderables registerUpdateRenderBinFromOpacity(); diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 39766cfe1b..a5cac6229b 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -414,7 +414,7 @@ RenderEngine::RenderEngine() RenderEngine::~RenderEngine() {} void RenderEngine::initialize() { - ZoneScoped + ZoneScoped; // We have to perform these initializations here as the OsEng has not been initialized // in our constructor @@ -458,7 +458,7 @@ void RenderEngine::initialize() { } void RenderEngine::initializeGL() { - ZoneScoped + ZoneScoped; LTRACE("RenderEngine::initializeGL(begin)"); @@ -477,8 +477,8 @@ void RenderEngine::initializeGL() { configuration::Configuration::FontSizes fontSize = global::configuration->fontSize; { - ZoneScopedN("Fonts") - TracyGpuZone("Fonts") + ZoneScopedN("Fonts"); + TracyGpuZone("Fonts"); _fontFrameInfo = global::fontManager->font(KeyFontMono, fontSize.frameInfo); _fontShutdown = global::fontManager->font(KeyFontMono, fontSize.shutdown); _fontCameraInfo = global::fontManager->font(KeyFontMono, fontSize.cameraInfo); @@ -487,7 +487,7 @@ void RenderEngine::initializeGL() { } { - ZoneScopedN("Log") + ZoneScopedN("Log"); LINFO("Initializing Log"); auto log = std::make_unique(ScreenLogTimeToLive); _log = log.get(); @@ -499,13 +499,13 @@ void RenderEngine::initializeGL() { } void RenderEngine::deinitializeGL() { - ZoneScoped + ZoneScoped; _renderer.deinitialize(); } void RenderEngine::updateScene() { - ZoneScoped + ZoneScoped; if (!_scene) { return; @@ -526,7 +526,7 @@ void RenderEngine::updateScene() { } void RenderEngine::updateShaderPrograms() { - ZoneScoped + ZoneScoped; for (ghoul::opengl::ProgramObject* program : _programs) { try { @@ -541,7 +541,7 @@ void RenderEngine::updateShaderPrograms() { } void RenderEngine::updateRenderer() { - ZoneScoped + ZoneScoped; const bool windowResized = global::windowDelegate->windowHasResized(); @@ -560,7 +560,7 @@ void RenderEngine::updateRenderer() { } void RenderEngine::updateScreenSpaceRenderables() { - ZoneScoped + ZoneScoped; for (std::unique_ptr& ssr : *global::screenSpaceRenderables) { ssr->update(); @@ -621,7 +621,7 @@ uint64_t RenderEngine::frameNumber() const { void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix, const glm::mat4& projectionMatrix) { - ZoneScoped + ZoneScoped; LTRACE("RenderEngine::render(begin)"); @@ -661,7 +661,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat } if (_showFrameInformation) { - ZoneScopedN("Show Frame Information") + ZoneScopedN("Show Frame Information"); glm::vec2 penPosition = glm::vec2( fontResolution().x / 2 - 50, @@ -691,7 +691,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat } if (renderingEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) { - ZoneScopedN("Render Screenspace Renderable") + ZoneScopedN("Render Screenspace Renderable"); std::vector ssrs; ssrs.reserve(global::screenSpaceRenderables->size()); @@ -771,7 +771,7 @@ bool RenderEngine::mouseActivationCallback(const glm::dvec2& mousePosition) cons } void RenderEngine::renderOverlays(const ShutdownInformation& shutdownInfo) { - ZoneScoped + ZoneScoped; const bool isMaster = global::windowDelegate->isMaster(); if (isMaster || _showOverlayOnClients) { @@ -810,7 +810,7 @@ void RenderEngine::renderEndscreen() { } void RenderEngine::renderShutdownInformation(float timer, float fullTime) { - ZoneScoped + ZoneScoped; timer = std::max(timer, 0.f); @@ -853,7 +853,7 @@ void RenderEngine::renderShutdownInformation(float timer, float fullTime) { } void RenderEngine::renderDashboard() { - ZoneScoped + ZoneScoped; glm::vec2 dashboardStart = global::dashboard->getStartPositionOffset(); glm::vec2 penPosition = glm::vec2( @@ -865,7 +865,7 @@ void RenderEngine::renderDashboard() { } void RenderEngine::postDraw() { - ZoneScoped + ZoneScoped; ++_frameNumber; } @@ -1123,7 +1123,7 @@ std::vector RenderEngine::screenSpaceRenderables() const } void RenderEngine::renderCameraInformation() { - ZoneScoped + ZoneScoped; if (!_showCameraInfo) { return; @@ -1191,7 +1191,7 @@ void RenderEngine::renderCameraInformation() { } void RenderEngine::renderVersionInformation() { - ZoneScoped + ZoneScoped; if (!_showVersionInfo) { return; @@ -1227,7 +1227,7 @@ void RenderEngine::renderVersionInformation() { // If we have Tracy enabled, we should inform the user about it that the // application will crash after a while if no profiler is attached - ZoneScopedN("Tracy Information") + ZoneScopedN("Tracy Information"); const glm::vec2 tracyBox = _fontVersionInfo->boundingBox("TRACY PROFILING"); const glm::vec2 penPosition = glm::vec2( @@ -1246,7 +1246,7 @@ void RenderEngine::renderVersionInformation() { } void RenderEngine::renderScreenLog() { - ZoneScoped + ZoneScoped; if (!_showLog) { return; @@ -1265,7 +1265,7 @@ void RenderEngine::renderScreenLog() { size_t nRows = 1; const auto now = std::chrono::steady_clock::now(); for (size_t i = 1; i <= std::min(MaxNumberMessages, entries.size()); i += 1) { - ZoneScopedN("Entry") + ZoneScopedN("Entry"); const ScreenLog::LogEntry& it = entries[entries.size() - i]; diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index d6607c9857..ec1c53ed18 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -412,7 +412,7 @@ bool ScreenSpaceRenderable::deinitializeGL() { } void ScreenSpaceRenderable::render() { - ZoneScoped + ZoneScoped; draw( globalRotationMatrix() * diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp index d2977ce879..b8e3fe806c 100644 --- a/src/scene/asset.cpp +++ b/src/scene/asset.cpp @@ -59,7 +59,7 @@ std::filesystem::path Asset::path() const { } void Asset::setState(State state) { - ZoneScoped + ZoneScoped; if (_state == state) { return; @@ -109,7 +109,7 @@ void Asset::addSynchronization(ResourceSynchronization* synchronization) { } void Asset::setSynchronizationStateResolved() { - ZoneScoped + ZoneScoped; if (!isSynchronized() && isSyncResolveReady()) { setState(State::Synchronized); @@ -117,7 +117,7 @@ void Asset::setSynchronizationStateResolved() { } void Asset::setSynchronizationStateRejected() { - ZoneScoped + ZoneScoped; setState(State::SyncRejected); } @@ -270,7 +270,7 @@ void Asset::unload() { } void Asset::initialize() { - ZoneScoped + ZoneScoped; if (isInitialized()) { return; diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index 98b27c19d1..85e56e4836 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -141,7 +141,7 @@ AssetManager::~AssetManager() { } void AssetManager::deinitialize() { - ZoneScoped + ZoneScoped; for (Asset* asset : _rootAssets) { if (!asset->hasInitializedParent()) { @@ -153,11 +153,11 @@ void AssetManager::deinitialize() { } void AssetManager::update() { - ZoneScoped + ZoneScoped; // Delete all the assets that have been marked for deletion in the previous frame { - ZoneScopedN("Deleting assets") + ZoneScopedN("Deleting assets"); _toBeDeleted.clear(); } @@ -165,7 +165,7 @@ void AssetManager::update() { // Initialize all assets that have been loaded and synchronized but that not yet // initialized for (auto it = _toBeInitialized.cbegin(); it != _toBeInitialized.cend(); ++it) { - ZoneScopedN("Initializing queued assets") + ZoneScopedN("Initializing queued assets"); Asset* a = *it; if (a->isInitialized() || !a->isSynchronized()) { @@ -187,7 +187,7 @@ void AssetManager::update() { // Add all assets that have been queued for loading since the last `update` call for (const std::string& asset : _assetAddQueue) { - ZoneScopedN("Adding queued assets") + ZoneScopedN("Adding queued assets"); std::filesystem::path path = generateAssetPath(_assetRootDirectory, asset); Asset* a = nullptr; @@ -224,7 +224,7 @@ void AssetManager::update() { // Remove assets for (const std::string& asset : _assetRemoveQueue) { - ZoneScopedN("Removing queued assets") + ZoneScopedN("Removing queued assets"); std::filesystem::path path = generateAssetPath(_assetRootDirectory, asset); const auto it = std::find_if( @@ -493,7 +493,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; Asset* thisAsset = ghoul::lua::userData(L, 1); ghoul::lua::checkArgumentsAndThrow(L, { 0, 1 }, "lua::localResourceLua"); @@ -517,7 +517,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* thisAsset = ghoul::lua::userData(L, 2); @@ -561,7 +561,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* parent = ghoul::lua::userData(L, 2); @@ -623,7 +623,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* thisAsset = ghoul::lua::userData(L, 2); @@ -649,7 +649,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* thisAsset = ghoul::lua::userData(L, 2); @@ -731,7 +731,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* thisAsset = ghoul::lua::userData(L, 2); @@ -753,7 +753,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { lua_pushcclosure( *_luaState, [](lua_State* L) { - ZoneScoped + ZoneScoped; AssetManager* manager = ghoul::lua::userData(L, 1); Asset* thisAsset = ghoul::lua::userData(L, 2); @@ -831,7 +831,7 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path, } void AssetManager::callOnInitialize(Asset* asset) const { - ZoneScoped + ZoneScoped; ghoul_precondition(asset, "Asset must not be nullptr"); auto it = _onInitializeFunctionRefs.find(asset); @@ -854,7 +854,7 @@ void AssetManager::callOnInitialize(Asset* asset) const { } void AssetManager::callOnDeinitialize(Asset* asset) const { - ZoneScoped + ZoneScoped; ghoul_precondition(asset, "Asset must not be nullptr"); auto it = _onDeinitializeFunctionRefs.find(asset); diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp index f85dcc948a..fb0c3c355e 100644 --- a/src/scene/profile.cpp +++ b/src/scene/profile.cpp @@ -632,7 +632,7 @@ void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& root } void Profile::addAsset(const std::string& path) { - ZoneScoped + ZoneScoped; if (ignoreUpdates) { return; @@ -645,7 +645,7 @@ void Profile::addAsset(const std::string& path) { } void Profile::removeAsset(const std::string& path) { - ZoneScoped + ZoneScoped; if (ignoreUpdates) { return; @@ -740,7 +740,9 @@ Profile::Profile(const std::string& content) { profile["keybindings"].get_to(keybindings); } if (profile.find("time") != profile.end()) { - time = profile["time"].get