Changeset 9869 in orxonox.OLD for trunk/src/world_entities/environments/water.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/environments/water.h (modified) (3 diffs)

trunk/src/world_entities/environments/water.h

@@ -13 +13 @@
 #include "world_entity.h"
 #include "material.h"
-
+#include "shader.h"
 
 /* FORWARD DECLARATION */
 class Grid;
-class Shader;
 
 //! A Class to handle a WaterEffects
 class Water : public WorldEntity
 {
- public:
+  ObjectListDeclaration(Water);
+  public:
    Water(const TiXmlElement* root = NULL);
    virtual ~Water();
@@ -38 +38 @@
    void draw() const;
    void tick(float dt);
-   
+
    virtual void varChangeHandler( std::list<int> & id );
 
@@ -51 +51 @@
 
     Material        waterMaterial;
-    Shader*         waterShader;
-    
+    Shader          waterShader;
+
     float           height;          //!< The hight of the Water
     int             height_handle;   //!< Handle to notify about changes of height