Rename DashboardGlobeLocation to DashboardItemGlobeLocation

Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
This commit is contained in:
Alexander Bock
2018-07-05 12:00:32 -04:00
parent 1916190228
commit ef61dc8c16
56 changed files with 247 additions and 8482 deletions
+1 -1
View File
@@ -229,7 +229,7 @@ void DataCygnet::setTextureUniforms() {
_shader->setUniform("transferFunctions[0]", tfUnits[0]);
} else {
for (int option : selectedOptions) {
if (_transferFunctions.size() >= option) {
if (static_cast<int>(_transferFunctions.size()) >= option) {
tfUnits[j].activate();
_transferFunctions[option].bind();
_shader->setUniform(