mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

getting extension moved to iswa container

Browse Source
This commit is contained in:
Michael Nilsson
2016-04-04 15:46:20 -04:00
parent 66a9aeb008
commit 6e8d8a9576
13 changed files with 102 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/dataplane.cpp
+4 -23
View File
@@ -41,23 +41,14 @@ namespace {
namespace openspace {
DataPlane::DataPlane(std::shared_ptr<KameleonWrapper> kw)
:CygnetPlane()
DataPlane::DataPlane(std::shared_ptr<KameleonWrapper> kw, std::string path)
:CygnetPlane(1, path)
, _kw(kw)
{
_id = id();
setName("DataPlane" + std::to_string(_id));
registerProperties();
_fileExtension = "";
_path = "";
_cygnetId.onChange([this](){
_fileExtension = "";
_path = "";
ISWAManager::ref().fileExtension(_cygnetId.value(), &_fileExtension);
});
KameleonWrapper::Model model = _kw->model();
if( model == KameleonWrapper::Model::BATSRUS){
_var = "p";
@@ -79,8 +70,6 @@ bool DataPlane::initialize(){
// std::cout << _modelScale.x << ", " << _modelScale.y << ", " << _modelScale.z << ", " << _modelScale.w << std::endl;
// std::cout << _pscOffset.x << ", " << _pscOffset.y << ", " << _pscOffset.z << ", " << _pscOffset.w << std::endl;
ISWAManager::ref().fileExtension(_cygnetId.value(), &_fileExtension);
_dimensions = glm::size3_t(500,500,1);
float zSlice = 0.5f;
_dataSlice = _kw->getUniformSliceValues(std::string(_var), _dimensions, zSlice);
@@ -161,16 +150,8 @@ void DataPlane::update(){
if(_planeIsDirty)
createPlane();
if(_path != ""){
CygnetPlane::update();
} else {
if(_fileExtension == ""){
//send new request
} else{
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
updateTexture();
}
}
CygnetPlane::update();
}
void DataPlane::setParent(){