S3DScene.hpp   S3DScene.hpp 
skipping to change at line 30 skipping to change at line 30
#ifndef _S3DSCENE_HPP_ #ifndef _S3DSCENE_HPP_
#define _S3DSCENE_HPP_ #define _S3DSCENE_HPP_
#include "StelOBJ.hpp" #include "StelOBJ.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "StelOpenGLArray.hpp" #include "StelOpenGLArray.hpp"
#include "SceneInfo.hpp" #include "SceneInfo.hpp"
#include "Heightmap.hpp" #include "Heightmap.hpp"
#include <cfloat>
Q_DECLARE_LOGGING_CATEGORY(s3dscene) Q_DECLARE_LOGGING_CATEGORY(s3dscene)
class S3DScene class S3DScene
{ {
public: public:
//! Extension of StelOBJ::Material which provides Scenery3d specific stuff //! Extension of StelOBJ::Material which provides Scenery3d specific stuff
struct Material : public StelOBJ::Material struct Material : public StelOBJ::Material
{ {
Material() : traits(), bAlphatest(false), bBackface(false), fAlphaThreshold(0.5), Material() : traits(), bAlphatest(false), bBackface(false), fAlphaThreshold(0.5),
vis_fadeIn(0.0,0.0),vis_fadeOut(0.0,0.0),vis_fa deValue(1.0) vis_fadeIn(-DBL_MAX, -DBL_MAX),vis_fadeOut(DBL_ MAX,DBL_MAX),vis_fadeValue(1.0)
{ {
} }
Material(const StelOBJ::Material& stelMat) Material(const StelOBJ::Material& stelMat)
: StelOBJ::Material(stelMat), traits(), bAlphatest(f alse), bBackface(false), fAlphaThreshold(0.5), : StelOBJ::Material(stelMat), traits(), bAlphatest(f alse), bBackface(false), fAlphaThreshold(0.5),
vis_fadeIn(0.0,0.0),vis_fadeOut(0.0,0.0),vis_fadeV alue(1.0) vis_fadeIn(-DBL_MAX, -DBL_MAX),vis_fadeOut(DBL_MAX ,DBL_MAX),vis_fadeValue(1.0)
{ {
if(additionalParams.contains("bAlphatest")) if(additionalParams.contains("bAlphatest"))
parseBool(additionalParams.value("bAlphatest "), bAlphatest); parseBool(additionalParams.value("bAlphatest "), bAlphatest);
if(additionalParams.contains("bBackface")) if(additionalParams.contains("bBackface"))
parseBool(additionalParams.value("bBackface" ), bBackface); parseBool(additionalParams.value("bBackface" ), bBackface);
if(additionalParams.contains("fAlphaThreshold")) if(additionalParams.contains("fAlphaThreshold"))
parseFloat(additionalParams.value("fAlphaThr eshold"), fAlphaThreshold); parseFloat(additionalParams.value("fAlphaThr eshold"), fAlphaThreshold);
if(additionalParams.contains("vis_fadeIn")) if(additionalParams.contains("vis_fadeIn"))
{ {
traits.hasTimeFade = true; traits.hasTimeFade = true;
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/