mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup branch (#618)

Browse Source 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
View File

@@ -108,7 +108,7 @@ void MultiresVolumeRaycaster::preRaycast(const RaycastData& data,
_tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
_tfUnit->activate();
_transferFunction->getTexture().bind();
_transferFunction->texture().bind();
program.setUniform("transferFunction_" + id, _tfUnit->unitNumber());
_atlasUnit = std::make_unique<ghoul::opengl::TextureUnit>();
@@ -141,7 +141,7 @@ void MultiresVolumeRaycaster::preRaycast(const RaycastData& data,
program.setUniform("atlasSize_" + id, atlasSize);
}
bool MultiresVolumeRaycaster::cameraIsInside(const RenderData& data,
bool MultiresVolumeRaycaster::isCameraInside(const RenderData& data,
glm::vec3& localPosition)
{
// Camera rig position in world coordinates.
@@ -177,19 +177,19 @@ void MultiresVolumeRaycaster::postRaycast(const RaycastData&,
_tfUnit = nullptr;
}
std::string MultiresVolumeRaycaster::getBoundsVsPath() const {
std::string MultiresVolumeRaycaster::boundsVertexShaderPath() const {
return GlslBoundsVsPath;
}
std::string MultiresVolumeRaycaster::getBoundsFsPath() const {
std::string MultiresVolumeRaycaster::boundsFragmentShaderPath() const {
return GlslBoundsFsPath;
}
std::string MultiresVolumeRaycaster::getRaycastPath() const {
std::string MultiresVolumeRaycaster::raycasterPath() const {
return GlslRaycastPath;
}
std::string MultiresVolumeRaycaster::getHelperPath() const {
std::string MultiresVolumeRaycaster::helperPath() const {
return GlslHelperPath; // no helper file
}