mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-10 23:38:38 -05:00
Feature/globebrowsing speedup (#735)
* Removal of ChunkRenderer, ChunkedLodGlobe, ChunkCuller, chunklevel evaluator, culling classes, layershadermanager, GpuLayer, GPUData, ChunkNode, Grid, BasicGrid, Chunk files, Angle, AABB classes, PointGlobe, Ellipsoid, TileSelector, tiledatatype, iodescription, simplerawtilerreader, rawtilereader * Less dynamic allocation for SkirtedGrid, LayerManager, RenderableGlobe, TextureUnit * Clean up memory management in RawTiles * Code simplification * Optimize shader uniform setting * Introduce UniformCache * Callback simplification * Turn ChunkNode into a struct * Use a MemoryPool to organize all ChunkNodes rather than use unique_ptr and the necessary memory allocation * Collect draw calls * Consolidate fragment shaders between local and global renderer * Shader cleanup and optimization * Update CMake to not include included shaders * Integrate traversal function into the looping * Replace std::queue with std::vector * Merge TextureContainer into MemoryAwareTileCache * Lazy computation of chunk bounding boxes * Memory management of LayerGroup * Remove class hierarchy from tileproviders (temporaltileprovider not working yet) * Remove PBO classes * Chunk status stored in Chunk * Don't create a copy of the ChunkTilePile * Enable culling by projected area on default * Have raw tile reader return a Tile instead of a shared_ptr to a tile * Start making GDAL mandatory * Increase the default lod scale factor to 15
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
#include <openspace/util/updatestructures.h>
|
||||
|
||||
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
#include <modules/globebrowsing/geometry/aabb.h>
|
||||
#include <modules/globebrowsing/src/basictypes.h>
|
||||
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
|
||||
#include <ghoul/glm.h>
|
||||
@@ -132,15 +132,6 @@ public:
|
||||
void renderCameraFrustum(const RenderData& data, const Camera& otherCamera,
|
||||
const glm::vec4& rgba = { 1.f, 1.f, 1.f, 0.3f }) const;
|
||||
|
||||
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
/**
|
||||
* Renders a screen space AABB2 to the screen with the provided color
|
||||
*/
|
||||
void renderAABB2(const globebrowsing::AABB2& screenSpaceAABB,
|
||||
const glm::vec4& rgba = { 1.f, 1.f, 1.f, 0.3f }) const;
|
||||
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
|
||||
|
||||
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
/**
|
||||
* Takes a AABB3 in screen space and returns vertices representing the corner points
|
||||
|
||||
Reference in New Issue
Block a user