mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -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/gputiledepthtransform.cpp
+6 -6
View File
@@ -29,18 +29,18 @@
namespace openspace {
namespace globebrowsing {
void GPUTileDepthTransform::setValue(ProgramObject* programObject,
void GPUTileDepthTransform::setValue(ghoul::opengl::ProgramObject* programObject,
const TileDepthTransform& depthTransform)
{
gpuDepthOffset.setValue(programObject, depthTransform.depthOffset);
gpuDepthScale.setValue(programObject, depthTransform.depthScale);
_gpuDepthOffset.setValue(programObject, depthTransform.depthOffset);
_gpuDepthScale.setValue(programObject, depthTransform.depthScale);
}
void GPUTileDepthTransform::bind(ProgramObject* programObject,
void GPUTileDepthTransform::bind(ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
{
gpuDepthOffset.bind(programObject, nameBase + "depthOffset");
gpuDepthScale.bind(programObject, nameBase + "depthScale");
_gpuDepthOffset.bind(programObject, nameBase + "depthOffset");
_gpuDepthScale.bind(programObject, nameBase + "depthScale");
}
} // namespace globebrowsing