mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 10:28:44 -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/gpuheightlayer.cpp
+6 -5
View File
@@ -33,18 +33,19 @@
namespace openspace {
namespace globebrowsing {
void GPUHeightLayer::setValue(ProgramObject* programObject, const Layer& layer,
const TileIndex& tileIndex, int pileSize)
void GPUHeightLayer::setValue(ghoul::opengl::ProgramObject* programObject,
const Layer& layer, const TileIndex& tileIndex,
int pileSize)
{
GPULayer::setValue(programObject, layer, tileIndex, pileSize);
gpuDepthTransform.setValue(programObject, layer.tileProvider()->depthTransform());
_gpuDepthTransform.setValue(programObject, layer.tileProvider()->depthTransform());
}
void GPUHeightLayer::bind(ProgramObject* programObject, const Layer& layer,
void GPUHeightLayer::bind(ghoul::opengl::ProgramObject* programObject, const Layer& layer,
const std::string& nameBase, int pileSize)
{
GPULayer::bind(programObject, layer, nameBase, pileSize);
gpuDepthTransform.bind(programObject, nameBase + "depthTransform.");
_gpuDepthTransform.bind(programObject, nameBase + "depthTransform.");
}