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

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
modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+16 -17
View File
@@ -28,6 +28,7 @@
#include <modules/kameleon/include/kameleonwrapper.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/rendering/raycastermanager.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
@@ -50,8 +51,6 @@
#include <modules/multiresvolume/rendering/histogrammanager.h>
#include <modules/multiresvolume/rendering/errorhistogrammanager.h>
#include <modules/multiresvolume/rendering/localerrorhistogrammanager.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/properties/vectorproperty.h>
#include <openspace/util/time.h>
#include <openspace/util/spicemanager.h>
@@ -81,79 +80,79 @@ namespace {
"${MODULES}/multiresvolume/shaders/header.glsl";
bool registeredGlslHelpers = false;
static const openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
const openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
"StepSizeCoefficient",
"Stepsize Coefficient",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo CurrentTimeInfo = {
const openspace::properties::Property::PropertyInfo CurrentTimeInfo = {
"CurrentTime",
"Current Time",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo MemoryBudgetInfo = {
const openspace::properties::Property::PropertyInfo MemoryBudgetInfo = {
"MemoryBudget",
"Memory Budget",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo StreamingBudgetInfo = {
const openspace::properties::Property::PropertyInfo StreamingBudgetInfo = {
"StreamingBudget",
"Streaming Budget",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo UseGlobalTimeInfo = {
const openspace::properties::Property::PropertyInfo UseGlobalTimeInfo = {
"UseGlobalTime",
"Global Time",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo LoopInfo = {
const openspace::properties::Property::PropertyInfo LoopInfo = {
"Loop",
"Loop",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo SelectorNameInfo = {
const openspace::properties::Property::PropertyInfo SelectorNameInfo = {
"Selector",
"Brick Selector",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo StatsToFileInfo = {
const openspace::properties::Property::PropertyInfo StatsToFileInfo = {
"PrintStats",
"Print Stats",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo StatsToFileNameInfo = {
const openspace::properties::Property::PropertyInfo StatsToFileNameInfo = {
"PrintStatsFileName",
"Stats Filename",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo ScalingExponentInfo = {
const openspace::properties::Property::PropertyInfo ScalingExponentInfo = {
"ScalingExponent",
"Scaling Exponent",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo ScalingInfo = {
const openspace::properties::Property::PropertyInfo ScalingInfo = {
"Scaling",
"Scaling",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo TranslationInfo = {
const openspace::properties::Property::PropertyInfo TranslationInfo = {
"Translation",
"Translation",
"" // @TODO Missing documentation
};
static const openspace::properties::Property::PropertyInfo RotationInfo = {
const openspace::properties::Property::PropertyInfo RotationInfo = {
"Rotation",
"Euler rotation",
"" // @TODO Missing documentation
@@ -615,7 +614,7 @@ void RenderableMultiresVolume::preResolve(ghoul::opengl::ProgramObject* program)
ss.str(std::string());
ss << "transferFunction_" << getId();
program->setUniform(ss.str(), getTextureUnit(_transferFunction->getTexture()));
program->setUniform(ss.str(), getTextureUnit(_transferFunction->texture()));
ss.str(std::string());
ss << "textureAtlas_" << getId();
@@ -648,7 +647,7 @@ void RenderableMultiresVolume::preResolve(ghoul::opengl::ProgramObject* program)
*/
/*
std::vector<ghoul::opengl::Texture*> RenderableMultiresVolume::getTextures() {
std::vector<ghoul::opengl::Texture*> textures{_transferFunction->getTexture(), _atlasManager->textureAtlas()};
std::vector<ghoul::opengl::Texture*> textures{_transferFunction->texture(), _atlasManager->textureAtlas()};
return textures;
}