commradio: improvements for atis speech

[flightgear.git] / src / Viewer / renderingpipeline.hxx

diff --git a/src/Viewer/renderingpipeline.hxx b/src/Viewer/renderingpipeline.hxx
index e05037e38ef4b81c8397aaaf32c0e39f5f15aa7a..3be2cf49e7d5846e6c2f953752666e34bd4834ff 100644 (file)
--- a/src/Viewer/renderingpipeline.hxx
+++ b/src/Viewer/renderingpipeline.hxx
@@ -28,7 +28,7 @@ class FGRenderingPipeline : public osg::Referenced {
 public:
     class Conditionable : public osg::Referenced {
     public:
-        Conditionable() : _alwaysValid(false) {}
+        Conditionable() : _alwaysValid(true) {}
         void parseCondition(SGPropertyNode* prop);
         bool getAlwaysValid() const { return _alwaysValid; }
         void setAlwaysValid(bool val) { _alwaysValid = val; }
@@ -59,6 +59,9 @@ public:
 
         std::string name;
         std::string type;
+        int orderNum;
+        std::string effect;
+        std::string debugProperty;
     };
 
     struct Attachment : public Conditionable {
@@ -70,13 +73,9 @@ public:
     };
     typedef std::vector<osg::ref_ptr<Attachment> > AttachmentList;
 
-    struct Stage : public Conditionable {
+    struct Stage : public Pass {
         Stage(SGPropertyNode* prop);
 
-        std::string name;
-        std::string type;
-        int orderNum;
-        std::string effect;
         bool needsDuDv;
         float scaleFactor;