Changeset 111 for Swollen/include

Timestamp:

Jun 21, 2005, 2:21:44 PM (20 years ago)

Author:

darran

Message:

• refactoring to facilitate storing state
• segfaulting at the moment ...

File:

• Swollen/include/swwreader.h (modified) (5 diffs)

Swollen/include/swwreader.h

@@ -71 +71 @@
     virtual osg::ref_ptr<osg::Vec2Array> getBedslopeTextureCoords();
 
-    virtual bool hasBedslopeTexture() {return (_bedslopetexture != NULL);}
+    virtual bool hasBedslopeTexture() {return (_state.bedslopetexturefilename != NULL);}
     virtual void setBedslopeTexture( std::string filename );
     virtual osg::Image* getBedslopeTexture();
@@ -87 +87 @@
     virtual unsigned int getNumberOfTimesteps() {return _ntimesteps;}
 
-    virtual float getAlphaMin() {return _alphamin;}
-    virtual float getAlphaMax() {return _alphamax;}
-    virtual float getHeightMin() {return _heightmin;}
-    virtual float getHeightMax() {return _heightmax;}
-    virtual float getCullAngle() {return _cullangle;}
+    virtual float getAlphaMin() {return _state.alphamin;}
+    virtual float getAlphaMax() {return _state.alphamax;}
+    virtual float getHeightMin() {return _state.heightmin;}
+    virtual float getHeightMax() {return _state.heightmax;}
+    virtual float getCullAngle() {return _state.cullangle;}
 
-    virtual void setAlphaMin( float value ) {_alphamin = value;}
-    virtual void setAlphaMax( float value ) {_alphamax = value;}
-    virtual void setHeightMin( float value ) {_heightmin = value;}
-    virtual void setHeightMax( float value ) {_heightmax = value;}
+    virtual void setAlphaMin( float value ) {_state.alphamin = value;}
+    virtual void setAlphaMax( float value ) {_state.alphamax = value;}
+    virtual void setHeightMin( float value ) {_state.heightmin = value;}
+    virtual void setHeightMax( float value ) {_state.heightmax = value;}
 
-    virtual void setCullAngle( float value ) {_cullangle = value;}
-    virtual void toggleCulling() {_culling = _culling ? false : true;}
+    virtual void setCullAngle( float value ) {_state.cullangle = value;}
+    virtual void toggleCulling() {_state.culling = _state.culling ? false : true;}
+    virtual bool getCulling() {return _state.culling;}
+    virtual void setCulling(bool value) {_state.culling = value;}
     
     virtual triangle_list getConnectivity(unsigned int index) {return _connectivity.at(index);}
 
-    const std::string getSwollenDir() {return *_swollendir;}
-    virtual void setSwollenDir(const std::string path) {_swollendir = new std::string(path);}
+    const std::string getSwollenDir() {return *(_state.swollendirectory);}
+    virtual void setSwollenDir(const std::string path) {_state.swollendirectory = new std::string(path);}
 
 
@@ -111 +113 @@
     virtual ~SWWReader();
 
-    std::string* _filename;
-    std::string* _swollendir;
-    
+
+    // state contains all the info needed to serialize
+    struct
+    {
+          float alphamax;  // define alpha (transparency) function
+          float alphamin;
+          float heightmax;
+          float heightmin;
+
+          float cullangle;  // cull triangles with steepness angle above this value
+          bool culling;   // culling is on or off
+
+          std::string* swwfilename;
+          std::string* bedslopetexturefilename;
+          std::string* swollendirectory;
+
+    } _state;
+
+
     // constructor determines SWW validity (netcdf + proper structure)
     bool _valid;
@@ -147 +165 @@
     osg::ref_ptr<osg::Vec4Array> _stagecolors;
 
-    // optional bedslope texture map
-    std::string* _bedslopetexture;
-
     // optional geodata for bedslope texture map
     struct
@@ -179 +194 @@
     std::vector<triangle_list> _connectivity;
 
-    // define alpha (transparency) function
-    float _alphamax, _alphamin, _heightmax, _heightmin;
-
-    // cull triangles with steepness angle above this value
-    float _cullangle;
-    bool _culling;
-
 };