mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
f51f293989
* Simplest possible PBO implementation. * Add PBO class * TileLoadJob owns raw tile data * Working on a soluton to cache textures and reuse them * PBO and cached textures working for one texture type. Color textures. * Threadpool for tile requests uses LRU cache as queue * Remove framesUntilRequestFlush * Clean up * Clean up * Use prioritizing concurrent job manager * Use TileTextureInitData to initialize RawTileDataReader. * Class TextureContainer owns the textures to use for tiles. * Using TileTextureInitData to determine if new caches need to be created. * Remove WriteDataDescription * Remove TileDataLayout * Rendering many different layer types again * TileProviderByLevel gives layergroup id to tile providers * Comment away use of PBO * Erase unfinished requests to make room for new ones * Enable choice of PBO or not. * Enable resetting of asynctiledataprovider * Add the ability to use PBO and also load to CPU * Update ghoul * Solve culling issue. * Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider. * Add gpudata * Move fetching of shader preprocessing data to LayerManager * No comparisons to determine shader recompilation. * Show the tile cache size in the GUI * Clean up and comment. * Solve bug where float is interpreted as NaN * Enable ability to blend between layers again * Fix single image provider * Fix windows build error * Fix OSX compile issue. * Some clean up * Showing correct texture data size * Enable use of text tile providers again. No backgroupd image path however. * Change cache size from GUI * Clean up * Solve osx compilation error. * Update ghoul * Make it possible to switch between PBO and not during runtime. * Enable resetting of tile datasets * change function module in moduleengine to identify module by name * MemoryAwareTileCache is no longer a singleton * Update ownership of properties for globe browsing * Logging info about resetting tile reader. * Logging info * Fix requested changes * Fix some compile warnings. * Fix compilation warnings * Add ability to blend values with blend parameter. Also define settings through lua dict. * Fix some comments on pull request. * Change formatting * Change formatting * Change formatting * Fix pull request comments. * Those are details * Make Mercury great again. * Make Earth great again. * Solve conflict * Test to sometimes use valueblending and sometimes not * Not always use value blending * Update ghoul * Change from auto to explicit type. * Update test for LRU Cache * Include algorithm.
108 lines
4.0 KiB
C++
108 lines
4.0 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* 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>
|
|
|
|
namespace openspace {
|
|
|
|
/**
|
|
* Very simple class maintaining a uniform location.
|
|
*/
|
|
class UniformLocation {
|
|
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);
|
|
|
|
protected:
|
|
GLint _uniformLocation = -1;
|
|
};
|
|
|
|
|
|
/**
|
|
* 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 UniformLocation{
|
|
public:
|
|
|
|
/**
|
|
* 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);
|
|
}
|
|
|
|
};
|
|
|
|
/**
|
|
* Manages a Texture on the GPU.
|
|
* This class provides a simple interface binding texture to the
|
|
* named uniform.
|
|
*/
|
|
class GPUTexture : public UniformLocation{
|
|
public:
|
|
|
|
/**
|
|
* 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;
|
|
|
|
};
|
|
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_CORE___GPUDATA___H__
|