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

- Add check in style guide that prevents ‘using namespace’ in header files

Browse Source 
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
This commit is contained in:
Alexander Bock
2017-03-01 21:02:33 -05:00
parent 4e52f27f9e
commit fbea8389c8
25 changed files with 135 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/gpu/gpuchunktilepile.cpp
+11 -11
View File
@@ -28,31 +28,31 @@
namespace openspace {
namespace globebrowsing {
void GPUChunkTilePile::setValue(ProgramObject* programObject,
void GPUChunkTilePile::setValue(ghoul::opengl::ProgramObject* programObject,
const ChunkTilePile& chunkTilePile)
{
ghoul_assert(
gpuChunkTiles.size() == chunkTilePile.size(),
_gpuChunkTiles.size() == chunkTilePile.size(),
"GPU and CPU ChunkTilePile must have same size!"
);
for (size_t i = 0; i < gpuChunkTiles.size(); ++i) {
gpuChunkTiles[i].setValue(programObject, chunkTilePile[i]);
for (size_t i = 0; i < _gpuChunkTiles.size(); ++i) {
_gpuChunkTiles[i].setValue(programObject, chunkTilePile[i]);
}
}
void GPUChunkTilePile::bind(ProgramObject* programObject, const std::string& nameBase,
int pileSize)
void GPUChunkTilePile::bind(ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase, int pileSize)
{
gpuChunkTiles.resize(pileSize);
for (size_t i = 0; i < gpuChunkTiles.size(); ++i) {
_gpuChunkTiles.resize(pileSize);
for (size_t i = 0; i < _gpuChunkTiles.size(); ++i) {
std::string nameExtension = "chunkTile" + std::to_string(i) + ".";
gpuChunkTiles[i].bind(programObject, nameBase + nameExtension);
_gpuChunkTiles[i].bind(programObject, nameBase + nameExtension);
}
}
void GPUChunkTilePile::deactivate() {
for (auto& gpuChunkTile : gpuChunkTiles) {
gpuChunkTile.deactivate();
for (auto& t : _gpuChunkTiles) {
t.deactivate();
}
}