Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 284 vs 286 for /trunk/Source Code/Environment/Vegetation/Headers/Vegetation.h

Diff revisions: vs.
  @@ -32,7 +32,7 @@
32 32 class Texture;
33 33 class Transform;
34 34 class SceneState;
35 - class FrameBuffer;
35 + class Framebuffer;
36 36 class ShaderBuffer;
37 37 class TerrainChunk;
38 38 class ShaderProgram;
  @@ -65,15 +65,13 @@
65 65 void initialize(TerrainChunk* const terrainChunk, SceneGraphNode* const terrainSGN);
66 66 inline void toggleRendering(bool state){_render = state;}
67 67 ///parentTransform: the transform of the parent terrain node
68 - void render(SceneGraphNode* const sgn, const SceneRenderState& sceneRenderState);
68 + void render(SceneGraphNode* const sgn, const SceneRenderState& sceneRenderState, const RenderStage& currentRenderStage);
69 69 inline bool isInView(const SceneRenderState& sceneRenderState, const BoundingBox& boundingBox, const BoundingSphere& sphere, const bool distanceCheck = true) { return true; }
70 70
71 71 protected:
72 72 void sceneUpdate(const U64 deltaTime, SceneGraphNode* const sgn, SceneState& sceneState);
73 73 bool onDraw(SceneGraphNode* const sgn, const RenderStage& renderStage);
74 74 void gpuCull();
75 - //bool prepareMaterial(SceneGraphNode* const sgn, bool depthPass);
76 - bool setMaterialInternal(SceneGraphNode* const sgn);
77 75
78 76 private:
79 77 bool uploadGrassData();
  @@ -107,7 +105,7 @@
107 105 ShaderProgram* _cullShader;
108 106 std::string _grassShaderName;
109 107 bool _shadowMapped;
110 - I64 _grassStateBlockHash;
108 + size_t _grassStateBlockHash;
111 109 bool _culledFinal;
112 110 U32 _readBuffer;
113 111 U32 _writeBuffer;