mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globebrowsing speedup (#735)

Browse Source 
* 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:
Alexander Bock
2018-10-30 17:20:06 -04:00
committed by GitHub
parent cf8d2db914
commit 9047dc7a3e
198 changed files with 6929 additions and 15994 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/scenegraphnode.h
+1 -1
View File
@@ -137,7 +137,7 @@ public:
void setRenderable(std::unique_ptr<Renderable> renderable);
const Renderable* renderable() const;
//Renderable* renderable();
Renderable* renderable();
const std::string& guiPath() const;
bool hasGuiHintHidden() const;
include/openspace/util/gpudata.h
-107
View File
@@ -1,107 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2018 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___GPUDATA___H__
#define __OPENSPACE_CORE___GPUDATA___H__
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/textureunit.h>
#include <string>
#include <memory>
// @TODO: This class should disappear as it doesn't server much of a purpose and only
// complicates local reasoning
namespace openspace {
/**
* Manages a GPU representation of the templated data type T.
* This class provides a simple interface setting the value of
* the binded GLSL variable.
*/
template<typename T>
class GPUData {
public:
/**
* Updates the uniform location of the uniform variable named <name>
* in the provided shader program.
*/
void bind(ghoul::opengl::ProgramObject* program, const std::string& name) {
_uniformLocation = program->uniformLocation(name);
}
/**
* Sets the value of T to its corresponding GPU value.
* OBS! Users must ensure bind has been called before using this method
*/
void setValue(ghoul::opengl::ProgramObject* program, T val) {
program->setUniform(_uniformLocation, val);
}
protected:
GLint _uniformLocation = -1;
};
/**
* Manages a Texture on the GPU.
* This class provides a simple interface binding texture to the
* named uniform.
*/
class GPUTexture {
public:
/**
* Updates the uniform location of the uniform variable named <name>
* in the provided shader program.
*/
void bind(ghoul::opengl::ProgramObject* program, const std::string& name) {
_uniformLocation = program->uniformLocation(name);
}
/**
* Sets and assignes a texture unit within the provided shader
* program.
* OBS! Users must ensure bind has been called before using this method.
*/
void setValue(ghoul::opengl::ProgramObject* program, ghoul::opengl::Texture* texture){
_texUnit = std::make_unique<ghoul::opengl::TextureUnit>();
_texUnit->activate();
if (texture) {
texture->bind();
}
program->setUniform(_uniformLocation, *_texUnit);
}
void deactivate() {
_texUnit = nullptr;
}
private:
std::unique_ptr<ghoul::opengl::TextureUnit> _texUnit;
GLint _uniformLocation = -1;
};
} // namespace openspace
#endif // __OPENSPACE_CORE___GPUDATA___H__
include/openspace/util/job.h
+1 -1
View File
@@ -37,7 +37,7 @@ struct Job {
virtual ~Job() = default;
virtual void execute() = 0;
virtual std::shared_ptr<P> product() = 0;
virtual P product() = 0;
};
} // namespace openspace