From 29b5958e44291c034afb9d3baa95ef33e763ce0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mal=C3=BD?= Date: Mon, 14 Jan 2019 15:03:30 +0100 Subject: [PATCH] separate camera renderUpdate - this allows to process cameras in arbitrary order --- .../src/vts-browser-desktop/mainWindow.cpp | 3 +- browser/src/vts-browser-minimal-c/main.c | 5 +- browser/src/vts-browser-minimal-cpp/main.cpp | 5 +- browser/src/vts-browser-minimal-cs/Window.cs | 5 +- browser/src/vts-browser-two-cameras/main.cpp | 6 +- browser/src/vts-libbrowser-cs/Camera.cs | 6 + browser/src/vts-libbrowser-cs/Interop.cs | 7 +- browser/src/vts-libbrowser-cs/Map.cs | 8 +- browser/src/vts-libbrowser/camera/camera.cpp | 15 ++- browser/src/vts-libbrowser/camera/camera.hpp | 6 +- .../src/vts-libbrowser/camera/cameraApi.cpp | 5 + .../include/vts-browser/camera.h | 1 + .../include/vts-browser/camera.hpp | 2 + .../vts-libbrowser/include/vts-browser/map.h | 4 +- .../include/vts-browser/map.hpp | 4 +- browser/src/vts-libbrowser/map.cpp | 105 +++++++++++++++++- browser/src/vts-libbrowser/map.hpp | 7 +- browser/src/vts-libbrowser/mapApiC.cpp | 15 ++- browser/src/vts-libbrowser/mapApiCpp.cpp | 11 +- .../vts-libbrowser/navigation/navigation.cpp | 105 +----------------- .../src/vts-libbrowser/resources/manager.cpp | 4 +- 21 files changed, 185 insertions(+), 144 deletions(-) diff --git a/browser/src/vts-browser-desktop/mainWindow.cpp b/browser/src/vts-browser-desktop/mainWindow.cpp index b6a3d179..8a1e96d5 100644 --- a/browser/src/vts-browser-desktop/mainWindow.cpp +++ b/browser/src/vts-browser-desktop/mainWindow.cpp @@ -335,7 +335,8 @@ void MainWindow::run() try { updateWindowSize(); - map->renderTick(timingTotalFrame * 1e-3); + map->renderUpdate(timingTotalFrame * 1e-3); + camera->renderUpdate(); } catch (const vts::MapconfigException &e) { diff --git a/browser/src/vts-browser-minimal-c/main.c b/browser/src/vts-browser-minimal-c/main.c index 02bfbdb1..53ed7103 100644 --- a/browser/src/vts-browser-minimal-c/main.c +++ b/browser/src/vts-browser-minimal-c/main.c @@ -189,7 +189,7 @@ int main() } // update downloads - vtsMapDataTick(map); + vtsMapDataUpdate(map); check(); // check if the window has been resized @@ -197,7 +197,8 @@ int main() // update navigation etc. uint32 currentRenderTime = SDL_GetTicks(); - vtsMapRenderTick(map, (currentRenderTime - lastRenderTime) * 1e-3); + vtsMapRenderUpdate(map, (currentRenderTime - lastRenderTime) * 1e-3); + vtsCameraRenderUpdate(cam); check(); lastRenderTime = currentRenderTime; diff --git a/browser/src/vts-browser-minimal-cpp/main.cpp b/browser/src/vts-browser-minimal-cpp/main.cpp index 40b8c9a3..9dc5b4d3 100644 --- a/browser/src/vts-browser-minimal-cpp/main.cpp +++ b/browser/src/vts-browser-minimal-cpp/main.cpp @@ -158,14 +158,15 @@ int main(int, char *[]) } // update downloads - map->dataTick(); + map->dataUpdate(); // check if window size has changed updateResolution(); // update navigation etc. uint32 currentRenderTime = SDL_GetTicks(); - map->renderTick((currentRenderTime - lastRenderTime) * 1e-3); + map->renderUpdate((currentRenderTime - lastRenderTime) * 1e-3); + cam->renderUpdate(); lastRenderTime = currentRenderTime; // actually render the map diff --git a/browser/src/vts-browser-minimal-cs/Window.cs b/browser/src/vts-browser-minimal-cs/Window.cs index 942f1a92..4cb835de 100644 --- a/browser/src/vts-browser-minimal-cs/Window.cs +++ b/browser/src/vts-browser-minimal-cs/Window.cs @@ -76,9 +76,10 @@ public void Draw(object sender, EventArgs args) if (c.Width <= 0 || c.Height <= 0) return; + map.DataUpdate(); + map.RenderUpdate(0); cam.SetViewportSize((uint)c.Width, (uint)c.Height); - map.DataTick(); - map.RenderTick(0); + cam.RenderUpdate(); RenderOptions ro = renderer.Options; ro.width = (uint)c.Width; diff --git a/browser/src/vts-browser-two-cameras/main.cpp b/browser/src/vts-browser-two-cameras/main.cpp index d2286b63..c04f4822 100644 --- a/browser/src/vts-browser-two-cameras/main.cpp +++ b/browser/src/vts-browser-two-cameras/main.cpp @@ -141,8 +141,10 @@ int main(int, char *[]) } uint32 currentRenderTime = SDL_GetTicks(); - map->dataTick(); - map->renderTick((currentRenderTime - lastRenderTime) * 1e-3); + map->dataUpdate(); + map->renderUpdate((currentRenderTime - lastRenderTime) * 1e-3); + cam1->renderUpdate(); + cam2->renderUpdate(); lastRenderTime = currentRenderTime; auto &ro = render.options(); diff --git a/browser/src/vts-libbrowser-cs/Camera.cs b/browser/src/vts-libbrowser-cs/Camera.cs index eeea5d5b..43e64417 100644 --- a/browser/src/vts-libbrowser-cs/Camera.cs +++ b/browser/src/vts-libbrowser-cs/Camera.cs @@ -141,6 +141,12 @@ public void SetOptions(string json) Util.CheckInterop(); } + public void RenderUpdate() + { + BrowserInterop.vtsCameraRenderUpdate(Handle); + Util.CheckInterop(); + } + public void Dispose() { Dispose(true); diff --git a/browser/src/vts-libbrowser-cs/Interop.cs b/browser/src/vts-libbrowser-cs/Interop.cs index 40755a29..db4b91b3 100644 --- a/browser/src/vts-libbrowser-cs/Interop.cs +++ b/browser/src/vts-libbrowser-cs/Interop.cs @@ -101,6 +101,9 @@ public static class BrowserInterop [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] public static extern void vtsCameraSuggestedNearFar(IntPtr cam, ref double near_, ref double far_); +[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] +public static extern void vtsCameraRenderUpdate(IntPtr cam); + [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr vtsCameraGetCredits(IntPtr cam); @@ -262,7 +265,7 @@ public static class BrowserInterop public static extern void vtsMapDataInitialize(IntPtr map); [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] -public static extern void vtsMapDataTick(IntPtr map); +public static extern void vtsMapDataUpdate(IntPtr map); [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] public static extern void vtsMapDataFinalize(IntPtr map); @@ -274,7 +277,7 @@ public static class BrowserInterop public static extern void vtsMapRenderInitialize(IntPtr map); [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] -public static extern void vtsMapRenderTick(IntPtr map, double elapsedTime); +public static extern void vtsMapRenderUpdate(IntPtr map, double elapsedTime); [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)] public static extern void vtsMapRenderFinalize(IntPtr map); diff --git a/browser/src/vts-libbrowser-cs/Map.cs b/browser/src/vts-libbrowser-cs/Map.cs index fe30d1d1..63dc48c9 100644 --- a/browser/src/vts-libbrowser-cs/Map.cs +++ b/browser/src/vts-libbrowser-cs/Map.cs @@ -120,9 +120,9 @@ public void DataInitialize() Util.CheckInterop(); } - public void DataTick() + public void DataUpdate() { - BrowserInterop.vtsMapDataTick(Handle); + BrowserInterop.vtsMapDataUpdate(Handle); Util.CheckInterop(); } @@ -144,9 +144,9 @@ public void RenderInitialize() Util.CheckInterop(); } - public void RenderTick(double elapsedTime) + public void RenderUpdate(double elapsedTime) { - BrowserInterop.vtsMapRenderTick(Handle, elapsedTime); + BrowserInterop.vtsMapRenderUpdate(Handle, elapsedTime); Util.CheckInterop(); } diff --git a/browser/src/vts-libbrowser/camera/camera.cpp b/browser/src/vts-libbrowser/camera/camera.cpp index 1630a557..a9cea36c 100644 --- a/browser/src/vts-libbrowser/camera/camera.cpp +++ b/browser/src/vts-libbrowser/camera/camera.cpp @@ -466,10 +466,8 @@ bool operator == (const OldDraw &l, const OldDraw &r) } void CameraImpl::resolveBlending(TraverseNode *root, - CameraMapLayer &layer, float elapsedTime) + CameraMapLayer &layer) { - (void)elapsedTime; - if (options.lodBlending == 0) return; @@ -546,8 +544,15 @@ void CameraImpl::resolveBlending(TraverseNode *root, } } -void CameraImpl::updateCamera(double elapsedTime) +void CameraImpl::renderUpdate() { + clear(); + + if (!map->mapconfigReady) + return; + + updateNavigation(navigation, map->lastElapsedFrameTime); + if (windowWidth == 0 || windowHeight == 0) return; @@ -613,7 +618,7 @@ void CameraImpl::updateCamera(double elapsedTime) { traverseRender(it->traverseRoot.get()); // resolve blending - resolveBlending(it->traverseRoot.get(), layers[it], elapsedTime); + resolveBlending(it->traverseRoot.get(), layers[it]); // resolve subtile merging for (auto &os : opaqueSubtiles) os.second.resolve(os.first, this); diff --git a/browser/src/vts-libbrowser/camera/camera.hpp b/browser/src/vts-libbrowser/camera/camera.hpp index 17f2f55c..90bcf367 100644 --- a/browser/src/vts-libbrowser/camera/camera.hpp +++ b/browser/src/vts-libbrowser/camera/camera.hpp @@ -162,12 +162,14 @@ class CameraImpl void gridPreloadProcess(TraverseNode *trav, const std::vector &requests); void resolveBlending(TraverseNode *root, - CameraMapLayer &layer, float elapsedTime); + CameraMapLayer &layer); void sortOpaqueFrontToBack(); - void updateCamera(double elapsedTime); + void renderUpdate(); void suggestedNearFar(double &near_, double &far_); }; +void updateNavigation(std::weak_ptr nav, double elapsedTime); + } // namespace vts #endif diff --git a/browser/src/vts-libbrowser/camera/cameraApi.cpp b/browser/src/vts-libbrowser/camera/cameraApi.cpp index b3009c08..69bb1b46 100644 --- a/browser/src/vts-libbrowser/camera/cameraApi.cpp +++ b/browser/src/vts-libbrowser/camera/cameraApi.cpp @@ -118,6 +118,11 @@ void Camera::suggestedNearFar(double &near_, double &far_) near_ = far_ = 0; } +void Camera::renderUpdate() +{ + impl->renderUpdate(); +} + CameraStatistics &Camera::statistics() { return impl->statistics; diff --git a/browser/src/vts-libbrowser/include/vts-browser/camera.h b/browser/src/vts-libbrowser/include/vts-browser/camera.h index 3387d015..d61ba476 100644 --- a/browser/src/vts-libbrowser/include/vts-browser/camera.h +++ b/browser/src/vts-libbrowser/include/vts-browser/camera.h @@ -53,6 +53,7 @@ VTS_API void vtsCameraGetViewMatrix(vtsHCamera cam, double view[16]); VTS_API void vtsCameraGetProjMatrix(vtsHCamera cam, double proj[16]); VTS_API void vtsCameraSuggestedNearFar(vtsHCamera cam, double *near_, double *far_); +VTS_API void vtsCameraRenderUpdate(vtsHCamera cam); // credits VTS_API const char *vtsCameraGetCredits(vtsHCamera cam); diff --git a/browser/src/vts-libbrowser/include/vts-browser/camera.hpp b/browser/src/vts-libbrowser/include/vts-browser/camera.hpp index fb14615a..ab40666b 100644 --- a/browser/src/vts-libbrowser/include/vts-browser/camera.hpp +++ b/browser/src/vts-libbrowser/include/vts-browser/camera.hpp @@ -59,6 +59,8 @@ class VTS_API Camera void suggestedNearFar(double &near_, double &far_); + void renderUpdate(); + class CameraCredits &credits(); class CameraDraws &draws(); class CameraOptions &options(); diff --git a/browser/src/vts-libbrowser/include/vts-browser/map.h b/browser/src/vts-libbrowser/include/vts-browser/map.h index 782c4c59..8e530276 100644 --- a/browser/src/vts-libbrowser/include/vts-browser/map.h +++ b/browser/src/vts-libbrowser/include/vts-browser/map.h @@ -55,13 +55,13 @@ VTS_API double vtsMapGetRenderProgress(vtsHMap map); // data processing (may be run on a dedicated thread) VTS_API void vtsMapDataInitialize(vtsHMap map); -VTS_API void vtsMapDataTick(vtsHMap map); +VTS_API void vtsMapDataUpdate(vtsHMap map); VTS_API void vtsMapDataFinalize(vtsHMap map); VTS_API void vtsMapDataAllRun(vtsHMap map); // rendering VTS_API void vtsMapRenderInitialize(vtsHMap map); -VTS_API void vtsMapRenderTick(vtsHMap map, double elapsedTime); // seconds since last call +VTS_API void vtsMapRenderUpdate(vtsHMap map, double elapsedTime); // seconds since last call VTS_API void vtsMapRenderFinalize(vtsHMap map); // options and statistics diff --git a/browser/src/vts-libbrowser/include/vts-browser/map.hpp b/browser/src/vts-libbrowser/include/vts-browser/map.hpp index b34200f2..1d662323 100644 --- a/browser/src/vts-libbrowser/include/vts-browser/map.hpp +++ b/browser/src/vts-libbrowser/include/vts-browser/map.hpp @@ -80,7 +80,7 @@ class VTS_API Map // dataTick does at most MapOptions.maxResourceProcessesPerTick // operations and returns // you should call it periodically - void dataTick(); + void dataUpdate(); void dataFinalize(); // blocking alternative to: @@ -93,7 +93,7 @@ class VTS_API Map void dataAllRun(); void renderInitialize(); - void renderTick(double elapsedTime); // seconds since last call + void renderUpdate(double elapsedTime); // seconds since last call void renderFinalize(); // create new camera diff --git a/browser/src/vts-libbrowser/map.cpp b/browser/src/vts-libbrowser/map.cpp index 130685cd..43937657 100644 --- a/browser/src/vts-libbrowser/map.cpp +++ b/browser/src/vts-libbrowser/map.cpp @@ -27,18 +27,117 @@ #include #include "map.hpp" +#include "navigation/navigation.hpp" namespace vts { void MapImpl::renderInitialize() { - LOG(info3) << "Render initialize"; + LOG(info2) << "Render initialize"; } void MapImpl::renderFinalize() { - LOG(info3) << "Render finalize"; + LOG(info2) << "Render finalize"; +} + +void MapImpl::renderUpdate(double elapsedTime) +{ + lastElapsedFrameTime = elapsedTime; + + if (!prerequisitesCheck()) + return; + + assert(!resources.auth || *resources.auth); + assert(mapconfig && *mapconfig); + assert(convertor); + assert(!layers.empty()); + assert(layers[0]->traverseRoot); + + updateSearch(); + + cameras.erase(std::remove_if(cameras.begin(), cameras.end(), + [&](std::weak_ptr &camera) { + return !!camera.lock(); + }), cameras.end()); + + for (auto &it : layers) + traverseClearing(it->traverseRoot.get()); + + if (mapconfig->atmosphereDensityTexture) + updateAtmosphereDensity(); +} + +void MapImpl::initializeNavigation() +{ + for (auto &camera : cameras) + { + auto cam = camera.lock(); + if (cam) + { + auto nav = cam->navigation.lock(); + if (nav) + nav->initialize(); + } + } +} + +void MapImpl::purgeMapconfig() +{ + LOG(info2) << "Purge mapconfig"; + + if (resources.auth) + resources.auth->forceRedownload(); + resources.auth.reset(); + if (mapconfig) + mapconfig->forceRedownload(); + mapconfig.reset(); + mapconfigAvailable = false; + + credits.purge(); + resources.searchTasks.clear(); + convertor.reset(); + body = MapCelestialBody(); + purgeViewCache(); + + for (auto &camera : cameras) + { + auto cam = camera.lock(); + if (cam) + { + auto nav = cam->navigation.lock(); + if (nav) + { + nav->autoRotation = 0; + nav->resetNavigationMode(); + nav->lastPositionAltitude.reset(); + nav->positionAltitudeReset.reset(); + } + } + } +} + +void MapImpl::purgeViewCache() +{ + LOG(info2) << "Purge view cache"; + + if (mapconfig) + mapconfig->consolidateView(); + mapconfigReady = false; + mapconfigView = ""; + layers.clear(); + + for (auto &camera : cameras) + { + auto cam = camera.lock(); + if (cam) + { + cam->statistics = CameraStatistics(); + cam->draws = CameraDraws(); + cam->credits = CameraCredits(); + } + } } void MapImpl::setMapconfigPath(const std::string &mapconfigPath, @@ -121,7 +220,7 @@ bool MapImpl::prerequisitesCheck() return false; } - LOG(info2) << "Mapconfig is ready."; + LOG(info3) << "Mapconfig is ready."; mapconfigReady = true; if (callbacks.mapconfigReady) callbacks.mapconfigReady(); // this may change mapconfigReady diff --git a/browser/src/vts-libbrowser/map.hpp b/browser/src/vts-libbrowser/map.hpp index 924f5665..ab7f98e6 100644 --- a/browser/src/vts-libbrowser/map.hpp +++ b/browser/src/vts-libbrowser/map.hpp @@ -575,6 +575,7 @@ class MapImpl std::vector> cameras; std::string mapconfigPath; std::string mapconfigView; + double lastElapsedFrameTime; uint32 renderTickIndex; bool mapconfigAvailable; bool mapconfigReady; @@ -622,7 +623,7 @@ class MapImpl // rendering void renderInitialize(); void renderFinalize(); - void renderTick(double elapsedTime); + void renderUpdate(double elapsedTime); bool prerequisitesCheck(); void initializeNavigation(); bool getPositionAltitude(double &result, const vec3 &navPos, @@ -639,11 +640,11 @@ class MapImpl // resources methods void resourceDataInitialize(); void resourceDataFinalize(); - void resourceDataTick(); + void resourceDataUpdate(); void resourceDataRun(); void resourceRenderInitialize(); void resourceRenderFinalize(); - void resourceRenderTick(); + void resourceRenderUpdate(); bool resourcesTryRemove(std::shared_ptr &r); void resourcesRemoveOld(); diff --git a/browser/src/vts-libbrowser/mapApiC.cpp b/browser/src/vts-libbrowser/mapApiC.cpp index 3dc3d38c..1d31aa2e 100644 --- a/browser/src/vts-libbrowser/mapApiC.cpp +++ b/browser/src/vts-libbrowser/mapApiC.cpp @@ -397,10 +397,10 @@ void vtsMapDataInitialize(vtsHMap map) C_END } -void vtsMapDataTick(vtsHMap map) +void vtsMapDataUpdate(vtsHMap map) { C_BEGIN - map->p->dataTick(); + map->p->dataUpdate(); C_END } @@ -425,10 +425,10 @@ void vtsMapRenderInitialize(vtsHMap map) C_END } -void vtsMapRenderTick(vtsHMap map, double elapsedTime) +void vtsMapRenderUpdate(vtsHMap map, double elapsedTime) { C_BEGIN - map->p->renderTick(elapsedTime); + map->p->renderUpdate(elapsedTime); C_END } @@ -572,6 +572,13 @@ void vtsCameraSuggestedNearFar(vtsHCamera cam, C_END } +void vtsCameraRenderUpdate(vtsHCamera cam) +{ + C_BEGIN + cam->p->renderUpdate(); + C_END +} + // credits const char *vtsCameraGetCredits(vtsHCamera cam) diff --git a/browser/src/vts-libbrowser/mapApiCpp.cpp b/browser/src/vts-libbrowser/mapApiCpp.cpp index a6038de2..b17a7838 100644 --- a/browser/src/vts-libbrowser/mapApiCpp.cpp +++ b/browser/src/vts-libbrowser/mapApiCpp.cpp @@ -198,9 +198,9 @@ void Map::dataInitialize() impl->resourceDataInitialize(); } -void Map::dataTick() +void Map::dataUpdate() { - impl->resourceDataTick(); + impl->resourceDataUpdate(); } void Map::dataFinalize() @@ -221,11 +221,11 @@ void Map::renderInitialize() impl->renderInitialize(); } -void Map::renderTick(double elapsedTime) +void Map::renderUpdate(double elapsedTime) { impl->statistics.renderTicks = ++impl->renderTickIndex; - impl->resourceRenderTick(); - impl->renderTick(elapsedTime); + impl->resourceRenderUpdate(); + impl->renderUpdate(elapsedTime); } void Map::renderFinalize() @@ -547,6 +547,7 @@ std::shared_ptr Map::search(const std::string &query, MapImpl::MapImpl(Map *map, const MapCreateOptions &options, const std::shared_ptr &fetcher) : map(map), createOptions(options), + lastElapsedFrameTime(0), renderTickIndex(0), mapconfigAvailable(false), mapconfigReady(false) { diff --git a/browser/src/vts-libbrowser/navigation/navigation.cpp b/browser/src/vts-libbrowser/navigation/navigation.cpp index f07ff46d..5396b3cf 100644 --- a/browser/src/vts-libbrowser/navigation/navigation.cpp +++ b/browser/src/vts-libbrowser/navigation/navigation.cpp @@ -658,108 +658,11 @@ void NavigationImpl::setViewExtent(double viewExtent) autoRotation = 0; } -void MapImpl::initializeNavigation() +void updateNavigation(std::weak_ptr nav, double elapsedTime) { - for (auto &camera : cameras) - { - auto cam = camera.lock(); - if (cam) - { - auto nav = cam->navigation.lock(); - if (nav) - nav->initialize(); - } - } -} - -void MapImpl::purgeMapconfig() -{ - LOG(info2) << "Purge mapconfig"; - - if (resources.auth) - resources.auth->forceRedownload(); - resources.auth.reset(); - if (mapconfig) - mapconfig->forceRedownload(); - mapconfig.reset(); - mapconfigAvailable = false; - - credits.purge(); - resources.searchTasks.clear(); - convertor.reset(); - body = MapCelestialBody(); - purgeViewCache(); - - for (auto &camera : cameras) - { - auto cam = camera.lock(); - if (cam) - { - auto nav = cam->navigation.lock(); - if (nav) - { - nav->autoRotation = 0; - nav->resetNavigationMode(); - nav->lastPositionAltitude.reset(); - nav->positionAltitudeReset.reset(); - } - } - } -} - -void MapImpl::purgeViewCache() -{ - LOG(info2) << "Purge view cache"; - - if (mapconfig) - mapconfig->consolidateView(); - mapconfigReady = false; - mapconfigView = ""; - layers.clear(); - - for (auto &camera : cameras) - { - auto cam = camera.lock(); - if (cam) - { - cam->statistics = CameraStatistics(); - cam->draws = CameraDraws(); - cam->credits = CameraCredits(); - } - } -} - -void MapImpl::renderTick(double elapsedTime) -{ - if (!prerequisitesCheck()) - return; - - assert(!resources.auth || *resources.auth); - assert(mapconfig && *mapconfig); - assert(convertor); - assert(!layers.empty()); - assert(layers[0]->traverseRoot); - - updateSearch(); - - cameras.erase(std::remove_if(cameras.begin(), cameras.end(), - [&](std::weak_ptr &camera) { - auto cam = camera.lock(); - if (!cam) - return true; - cam->clear(); - auto nav = cam->navigation.lock(); - if (nav) - nav->updateNavigation(elapsedTime); - cam->updateCamera(elapsedTime); - return false; - }), cameras.end()); - - for (auto &it : layers) - traverseClearing(it->traverseRoot.get()); - - if (mapconfig->atmosphereDensityTexture) - updateAtmosphereDensity(); + auto n = nav.lock(); + if (n) + n->updateNavigation(elapsedTime); } } // namespace vts diff --git a/browser/src/vts-libbrowser/resources/manager.cpp b/browser/src/vts-libbrowser/resources/manager.cpp index 96d5dc87..11565af9 100644 --- a/browser/src/vts-libbrowser/resources/manager.cpp +++ b/browser/src/vts-libbrowser/resources/manager.cpp @@ -179,7 +179,7 @@ void MapImpl::resourceDataFinalize() LOG(info3) << "Data finalize"; } -void MapImpl::resourceDataTick() +void MapImpl::resourceDataUpdate() { for (uint32 proc = 0; proc < options.maxResourceProcessesPerTick; proc++) @@ -555,7 +555,7 @@ void MapImpl::resourceRenderFinalize() resources.resources.clear(); } -void MapImpl::resourceRenderTick() +void MapImpl::resourceRenderUpdate() { // split workload into multiple render frames switch (renderTickIndex % 4)