projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed terrain tiles generation
[demo]
/
src
/
terrain.h
diff --git
a/src/terrain.h
b/src/terrain.h
index
f2ecd69
..
bf9df09
100644
(file)
--- a/
src/terrain.h
+++ b/
src/terrain.h
@@
-10,6
+10,7
@@
class TerrainTile {
private:
Mesh *mesh;
private:
Mesh *mesh;
+ friend class Terrain;
};
/* parameters needed in terrain generation */
};
/* parameters needed in terrain generation */
@@
-23,6
+24,7
@@
struct TerrainParams {
int tile_usub;
int tile_vsub;
int num_octaves; /* Perlin noise sums */
int tile_usub;
int tile_vsub;
int num_octaves; /* Perlin noise sums */
+ float noise_freq; /* Perlin noise scaling factor */
Image *coarse_heightmap; /* mask for low detail heightmap */
};
Image *coarse_heightmap; /* mask for low detail heightmap */
};
@@
-34,9
+36,14
@@
private:
std::vector<TerrainTile> tiles;
public:
std::vector<TerrainTile> tiles;
public:
+ Material material;
+
Terrain();
~Terrain();
Terrain();
~Terrain();
+ bool init();
+ void destroy();
+
bool generate(const TerrainParams ¶ms);
Scene *get_visible(const Camera *camera) const;
};
bool generate(const TerrainParams ¶ms);
Scene *get_visible(const Camera *camera) const;
};