diff --git a/ObjectTypes/SkyDome/SkyDomeNode.cc b/ObjectTypes/SkyDome/SkyDomeNode.cc index 69a70190adbd976bd75b8b4e7426777304bf697f..cbf11b1e67bec6ba71b50ce5342db15f7d1401bc 100644 --- a/ObjectTypes/SkyDome/SkyDomeNode.cc +++ b/ObjectTypes/SkyDome/SkyDomeNode.cc @@ -242,9 +242,12 @@ getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::S QString filename = dome_.textureFileName(); // Fallback image - if ( !info.exists() ) + if ( !info.exists() ) { + std::cerr << "Did not find image!" << filename.toStdString() << std::endl; filename = OpenFlipper::Options::iconDirStr() + QDir::separator() + "EmptySkyDome.png"; + } + // Test: Load texture image QImage texture(filename); diff --git a/ObjectTypes/SkyDome/SkyDomeObject.cc b/ObjectTypes/SkyDome/SkyDomeObject.cc index ad63f085b5b32cac01340dc4bcddc95987a563e2..7f9e169689593f03db202e1b6a700255a68349c5 100644 --- a/ObjectTypes/SkyDome/SkyDomeObject.cc +++ b/ObjectTypes/SkyDome/SkyDomeObject.cc @@ -162,7 +162,11 @@ void SkyDomeObject::setName( QString _name ) { // =============================================================================== void SkyDomeObject::update(UpdateType _type) { - skyDomeNode_->update(); + + // Only the texture update is relevant. The other updates + // Are uniforms which are required on each draw anyway + if (_type.contains(UPDATE_TEXTURE) ) + skyDomeNode_->update(); } // =============================================================================== @@ -191,7 +195,10 @@ QString SkyDomeObject::getObjectinfo() { if ( dataType( DATA_SKYDOME ) ) output += "Object Contains SkyDome : "; - output += " Horizontal FOV: ( " + QString::number(skyDome_.horizontalFOV()) + ")"; + output += " Horizontal FOV: " + QString::number(skyDome_.horizontalFOV()); + output += " Vertical FOV: " + QString::number(skyDome_.verticalFOV()); + output += " Top Cutoff : " + QString::number(skyDome_.topOffset()); + output += " Image File : " + skyDome_.textureFileName(); output += "========================================================================\n"; return output; diff --git a/ObjectTypes/SkyDome/SkyDomeType.cc b/ObjectTypes/SkyDome/SkyDomeType.cc index 2aa6becc1dfe97416657b3792b90927cbd311cb0..3cdce1fed7a3d06f0b6108f40a7d1c93818c7654 100644 --- a/ObjectTypes/SkyDome/SkyDomeType.cc +++ b/ObjectTypes/SkyDome/SkyDomeType.cc @@ -48,7 +48,7 @@ //============================================================================= /** - * \file SkyDomeType.c + * \file SkyDomeType.cc * This File contains the implementation for SkyDome */ @@ -57,6 +57,8 @@ #include "SkyDomeType.hh" +#include + //== SkyDome Implementation =============================================== @@ -74,11 +76,11 @@ QString SkyDome::textureFileName() { return textureFileName_; } -void SkyDome::setTextureFileName(QString _textureFileName) { +void SkyDome::setTextureFileName(const QString& _textureFileName) { textureFileName_ = _textureFileName; } -void SkyDome::setHorizontalFOV( float _value) { +void SkyDome::setHorizontalFOV( const float& _value) { horizontalFOV_ = _value; } @@ -86,7 +88,7 @@ float SkyDome::horizontalFOV() { return horizontalFOV_; } -void SkyDome::setVerticalFOV( float _value) { +void SkyDome::setVerticalFOV( const float& _value) { verticalFOV_ = _value; } @@ -94,7 +96,7 @@ float SkyDome::verticalFOV() { return verticalFOV_; } -void SkyDome::setTopOffset( float _value) { +void SkyDome::setTopOffset( const float& _value) { topOffset_ = _value; } diff --git a/ObjectTypes/SkyDome/SkyDomeType.hh b/ObjectTypes/SkyDome/SkyDomeType.hh index 5c5bdd54fd80dba2d726bb9e51690c886a96ed31..0ee6791465a762527fada8d6dd6d6c6bf6886124 100644 --- a/ObjectTypes/SkyDome/SkyDomeType.hh +++ b/ObjectTypes/SkyDome/SkyDomeType.hh @@ -70,19 +70,20 @@ public: SkyDome(); /// Defines the texture that will be used - QString textureFileName(); + void setTextureFileName(const QString& _textureFileName); - void setTextureFileName(QString _textureFileName); + /// Returns the texture that will be used + QString textureFileName(); - void setHorizontalFOV( float _value); + void setHorizontalFOV( const float& _value); float horizontalFOV(); - void setVerticalFOV( float _value); + void setVerticalFOV( const float& _value); float verticalFOV(); - void setTopOffset( float _value); + void setTopOffset( const float& _value); float topOffset(); @@ -99,7 +100,6 @@ private: QString textureFileName_; - };