mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-31 00:18:39 -06:00
* 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.
175 lines
6.6 KiB
C++
175 lines
6.6 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. *
|
|
****************************************************************************************/
|
|
|
|
#include <modules/globebrowsing/meshes/trianglesoup.h>
|
|
|
|
#include <ghoul/logging/logmanager.h>
|
|
|
|
namespace {
|
|
const std::string _loggerCat = "TriangleSoup";
|
|
}
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
TriangleSoup::TriangleSoup(std::vector<unsigned int> elements, Positions usePositions,
|
|
TextureCoordinates useTextures, Normals useNormals)
|
|
: _useVertexPositions(usePositions)
|
|
, _useTextureCoordinates(useTextures)
|
|
, _useVertexNormals(useNormals)
|
|
, _vaoID(0)
|
|
, _vertexBufferID(0)
|
|
, _elementBufferID(0)
|
|
{
|
|
setElements(elements);
|
|
}
|
|
|
|
TriangleSoup::~TriangleSoup() {
|
|
glDeleteBuffers(1, &_vertexBufferID);
|
|
glDeleteBuffers(1, &_elementBufferID);
|
|
glDeleteVertexArrays(1, &_vaoID);
|
|
}
|
|
|
|
void TriangleSoup::setVertexPositions(std::vector<glm::vec4> positions) {
|
|
_useVertexPositions = true;
|
|
_gpuDataNeedUpdate = true;
|
|
_vertexData.resize(positions.size());
|
|
for (size_t i = 0; i < positions.size(); i++) {
|
|
_vertexData[i].position[0] = static_cast<GLfloat>(positions[i].x);
|
|
_vertexData[i].position[1] = static_cast<GLfloat>(positions[i].y);
|
|
_vertexData[i].position[2] = static_cast<GLfloat>(positions[i].z);
|
|
_vertexData[i].position[3] = static_cast<GLfloat>(positions[i].w);
|
|
}
|
|
}
|
|
|
|
void TriangleSoup::setVertexTextureCoordinates(std::vector<glm::vec2> textures) {
|
|
_useTextureCoordinates = true;
|
|
_gpuDataNeedUpdate = true;
|
|
_vertexData.resize(textures.size());
|
|
for (size_t i = 0; i < textures.size(); i++) {
|
|
_vertexData[i].texture[0] = static_cast<GLfloat>(textures[i].s);
|
|
_vertexData[i].texture[1] = static_cast<GLfloat>(textures[i].t);
|
|
}
|
|
}
|
|
|
|
void TriangleSoup::setVertexNormals(std::vector<glm::vec3> normals) {
|
|
_useVertexNormals = true;
|
|
_gpuDataNeedUpdate = true;
|
|
_vertexData.resize(normals.size());
|
|
for (size_t i = 0; i < normals.size(); i++) {
|
|
_vertexData[i].normal[0] = static_cast<GLfloat>(normals[i].x);
|
|
_vertexData[i].normal[1] = static_cast<GLfloat>(normals[i].y);
|
|
_vertexData[i].normal[2] = static_cast<GLfloat>(normals[i].z);
|
|
}
|
|
}
|
|
|
|
void TriangleSoup::setElements(std::vector<unsigned int> elements) {
|
|
_elementData.resize(elements.size());
|
|
_gpuDataNeedUpdate = true;
|
|
for (size_t i = 0; i < elements.size(); i++) {
|
|
_elementData[i] = static_cast<GLuint>(elements[i]);
|
|
}
|
|
}
|
|
|
|
bool TriangleSoup::updateDataOnGPU() {
|
|
// Create VAO
|
|
if (_vaoID == 0) {
|
|
glGenVertexArrays(1, &_vaoID);
|
|
}
|
|
|
|
// Create VBOs
|
|
if (_vertexBufferID == 0 && _vertexData.size() > 0) {
|
|
glGenBuffers(1, &_vertexBufferID);
|
|
if (_vertexBufferID == 0) {
|
|
LERROR("Could not create vertex buffer");
|
|
return false;
|
|
}
|
|
}
|
|
if (_elementBufferID == 0 && _elementData.size() > 0) {
|
|
glGenBuffers(1, &_elementBufferID);
|
|
if (_elementBufferID == 0) {
|
|
LERROR("Could not create vertex element buffer");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// First VAO setup
|
|
glBindVertexArray(_vaoID);
|
|
|
|
// Vertex buffer
|
|
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
|
|
glBufferData(
|
|
GL_ARRAY_BUFFER,
|
|
_vertexData.size() * sizeof(Vertex),
|
|
&_vertexData[0],
|
|
GL_STATIC_DRAW
|
|
);
|
|
|
|
// Positions at location 0
|
|
if (_useVertexPositions) {
|
|
glEnableVertexAttribArray(0);
|
|
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex),
|
|
reinterpret_cast<const GLvoid*>(offsetof(Vertex, position)));
|
|
}
|
|
// Textures at location 1
|
|
if (_useTextureCoordinates) {
|
|
glEnableVertexAttribArray(1);
|
|
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
|
|
reinterpret_cast<const GLvoid*>(offsetof(Vertex, texture)));
|
|
}
|
|
// Normals at location 2
|
|
if (_useVertexNormals) {
|
|
glEnableVertexAttribArray(2);
|
|
glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex),
|
|
reinterpret_cast<const GLvoid*>(offsetof(Vertex, normal)));
|
|
}
|
|
|
|
// Element buffer
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _elementBufferID);
|
|
glBufferData(
|
|
GL_ELEMENT_ARRAY_BUFFER,
|
|
_elementData.size() * sizeof(GLint),
|
|
&_elementData[0],
|
|
GL_STATIC_DRAW);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
_gpuDataNeedUpdate = false;
|
|
|
|
return true;
|
|
}
|
|
|
|
void TriangleSoup::drawUsingActiveProgram() {
|
|
if (_gpuDataNeedUpdate) {
|
|
updateDataOnGPU();
|
|
}
|
|
glBindVertexArray(_vaoID);
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _elementBufferID);
|
|
glDrawElements(GL_TRIANGLES, _elementData.size(), GL_UNSIGNED_INT, 0);
|
|
glBindVertexArray(0);
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|