Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 223 vs 254 for /trunk/Source Code/Environment/Water/Headers/Water.h

Diff revisions: vs.
  @@ -41,22 +41,13 @@
41 41
42 42 /// Resource inherited "unload"
43 43 bool unload();
44 -
45 44 /// General SceneNode stuff
46 45 void onDraw(const RenderStage& currentStage);
47 - void postDraw(const RenderStage& currentStage);
48 - void render(SceneGraphNode* const sgn);
49 - void postLoad(SceneGraphNode* const sgn);
50 - void prepareMaterial(SceneGraphNode* const sgn);
51 - void releaseMaterial();
52 - void prepareDepthMaterial(SceneGraphNode* const sgn){}
53 - void releaseDepthMaterial(){}
54 46 bool getDrawState(const RenderStage& currentStage) const;
55 -
56 47 bool isInView(const BoundingBox& boundingBox,const BoundingSphere& sphere, const bool distanceCheck = true) {return true;}
57 -
58 48 void setParams(F32 shininess, const vec2<F32>& noiseTile, const vec2<F32>& noiseFactor, F32 transparency);
59 - inline Quad3D* getQuad() {return _plane;}
49 +
50 + inline Quad3D* getQuad() const {return _plane;}
60 51
61 52 /// Reflector overwrite
62 53 void updateReflection();
  @@ -66,6 +57,14 @@
66 57 inline bool isPointUnderWater(const vec3<F32>& pos) { return (pos.y < _waterLevel); }
67 58
68 59 protected:
60 + void postDraw(const RenderStage& currentStage);
61 + void render(SceneGraphNode* const sgn);
62 + void postLoad(SceneGraphNode* const sgn);
63 + void prepareMaterial(SceneGraphNode* const sgn);
64 + void releaseMaterial();
65 + void prepareDepthMaterial(SceneGraphNode* const sgn){}
66 + void releaseDepthMaterial(){}
67 +
69 68 template<typename T>
70 69 friend class ImplResourceLoader;
71 70 inline void setWaterNormalMap(Texture2D* const waterNM){_texture = waterNM;}