mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/jenkins warnings (#538)

Browse Source 
* Remove warnings from Jenkins
 * Improve Jenkins behavior
This commit is contained in:
Alexander Bock
2018-02-28 08:41:55 -05:00
committed by GitHub
parent 4831f4aa48
commit 9a00f38e09
68 changed files with 281 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/datacygnet.cpp
+14 -7
View File
@@ -83,14 +83,15 @@ namespace openspace {
DataCygnet::DataCygnet(const ghoul::Dictionary& dictionary)
: IswaCygnet(dictionary)
, _dataProcessor(nullptr)
, _dataOptions(DataOptionsInfo)
, _transferFunctionsFile(TransferFunctionsFile, "${SCENE}/iswa/tfs/default.tf")
, _backgroundValues(BackgroundInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(1.f))
, _normValues(NormalizeValuesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(5.f))
, _useLog(UseLogInfo, false)
, _useHistogram(UseHistogramInfo, false)
, _autoFilter(AutoFilterInfo, true)
, _normValues(NormalizeValuesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(5.f))
, _backgroundValues(BackgroundInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(1.f))
, _transferFunctionsFile(TransferFunctionsFile, "${SCENE}/iswa/tfs/default.tf")
, _dataProcessor(nullptr)
//FOR TESTING
, _numOfBenchmarks(0)
, _avgBenchmarkTime(0.0f)
@@ -187,8 +188,11 @@ bool DataCygnet::readyToRender() const{
*/
void DataCygnet::setTextureUniforms(){
std::vector<int> selectedOptions = _dataOptions.value();
int activeTextures = std::min((int)selectedOptions.size(), MAX_TEXTURES);
int activeTransferfunctions = std::min((int)_transferFunctions.size(), MAX_TEXTURES);
int activeTextures = std::min(static_cast<int>(selectedOptions.size()), MAX_TEXTURES);
int activeTransferfunctions = std::min(
static_cast<int>(_transferFunctions.size()),
MAX_TEXTURES
);
// Set Textures
ghoul::opengl::TextureUnit txUnits[MAX_TEXTURES];
@@ -207,8 +211,11 @@ void DataCygnet::setTextureUniforms(){
}
}
if(activeTextures > 0 && selectedOptions.back()>=(int)_transferFunctions.size())
if (activeTextures > 0 &&
selectedOptions.back() >= static_cast<int>(_transferFunctions.size()))
{
activeTransferfunctions = 1;
}
ghoul::opengl::TextureUnit tfUnits[MAX_TEXTURES];
j = 0;