#include "Body.hpp"
#include "Orbit.hpp"
#include "Planet.hpp"
+#include "Resource.hpp"
+#include "Set.hpp"
#include "Simulation.hpp"
#include "Sun.hpp"
#include "Tile.hpp"
+#include "TileType.hpp"
#include "../const.hpp"
#include "../app/Assets.hpp"
+#include "../creature/Creature.hpp"
#include "../graphics/Viewport.hpp"
#include "../rand/OctaveNoise.hpp"
#include "../rand/SimplexNoise.hpp"
, orbital(1.0)
, inverse_orbital(1.0)
, local(1.0)
-, inverse_local(1.0) {
+, inverse_local(1.0)
+, creatures()
+, atmosphere(-1) {
}
Body::~Body() {
+ for (creature::Creature *c : creatures) {
+ delete c;
+ }
}
void Body::SetSimulation(Simulation &s) noexcept {
return m;
}
+void Body::Tick(double dt) {
+ rotation += dt * AngularMomentum() / Inertia();
+ Cache();
+ for (creature::Creature *c : Creatures()) {
+ c->Tick(dt);
+ }
+}
+
void Body::Cache() noexcept {
if (parent) {
orbital =
* glm::eulerAngleY(-rotation);
}
+void Body::AddCreature(creature::Creature *c) {
+ creatures.push_back(c);
+}
+
+void Body::RemoveCreature(creature::Creature *c) {
+ auto entry = std::find(creatures.begin(), creatures.end(), c);
+ if (entry != creatures.end()) {
+ creatures.erase(entry);
+ }
+}
+
Orbit::Orbit()
: sma(1.0)
Planet::Planet(int sidelength)
: Body()
, sidelength(sidelength)
-, tiles(new Tile[TilesTotal()])
+, tiles(TilesTotal())
, vao() {
Radius(double(sidelength) / 2.0);
}
Planet::~Planet() {
}
+const TileType &Planet::TypeAt(int surface, int x, int y) const {
+ return GetSimulation().TileTypes()[TileAt(surface, x, y).type];
+}
+
glm::dvec3 Planet::TileCenter(int surface, int x, int y) const noexcept {
glm::dvec3 center(0.0f);
center[(surface + 0) % 3] = x + 0.5 - Radius();
return center;
}
-void Planet::BuildVAOs() {
+void Planet::BuildVAO(const Set<TileType> &ts) {
vao.Bind();
vao.BindAttributes();
vao.EnableAttribute(0);
for (int index = 0, surface = 0; surface < 6; ++surface) {
for (int y = 0; y < sidelength; ++y) {
for (int x = 0; x < sidelength; ++x, ++index) {
- float tex = TileAt(surface, x, y).type;
+ float tex = ts[TileAt(surface, x, y).type].texture;
const float tex_u_begin = surface < 3 ? 1.0f : 0.0f;
const float tex_u_end = surface < 3 ? 0.0f : 1.0f;
attrib[4 * index + 0].position[(surface + 0) % 3] = x + 0 - offset;
}
-void GenerateEarthlike(Planet &p) noexcept {
+void GenerateEarthlike(const Set<TileType> &tiles, Planet &p) noexcept {
rand::SimplexNoise elevation_gen(0);
-
- constexpr int ice = 0;
- constexpr int grass = 3;
- constexpr int water = 4;
- constexpr int sand = 5;
- constexpr int rock = 8;
-
+ rand::SimplexNoise variation_gen(45623752346);
+
+ const int ice = tiles["ice"].id;
+ const int ocean = tiles["ocean"].id;
+ const int water = tiles["water"].id;
+ const int sand = tiles["sand"].id;
+ const int grass = tiles["grass"].id;
+ const int tundra = tiles["tundra"].id;
+ const int taiga = tiles["taiga"].id;
+ const int desert = tiles["desert"].id;
+ const int mntn = tiles["mountain"].id;
+ const int algae = tiles["algae"].id;
+ const int forest = tiles["forest"].id;
+ const int jungle = tiles["jungle"].id;
+ const int rock = tiles["rock"].id;
+ const int wheat = tiles["wheat"].id;
+
+ constexpr double ocean_thresh = -0.2;
constexpr double water_thresh = 0.0;
- constexpr double beach_thresh = 0.1;
+ constexpr double beach_thresh = 0.05;
+ constexpr double highland_thresh = 0.4;
constexpr double mountain_thresh = 0.5;
const glm::dvec3 axis(glm::dvec4(0.0, 1.0, 0.0, 0.0) * glm::eulerAngleXY(p.SurfaceTilt().x, p.SurfaceTilt().y));
- const double cap_thresh = std::cos(p.AxialTilt().x);
+ const double cap_thresh = std::abs(std::cos(p.AxialTilt().x));
+ const double equ_thresh = std::abs(std::sin(p.AxialTilt().x)) / 2.0;
+ const double fzone_start = equ_thresh - (equ_thresh - cap_thresh) / 3.0;
+ const double fzone_end = cap_thresh + (equ_thresh - cap_thresh) / 3.0;
for (int surface = 0; surface <= 5; ++surface) {
for (int y = 0; y < p.SideLength(); ++y) {
to_tile / p.Radius(),
3, // octaves
0.5, // persistence
- 2 / p.Radius(), // frequency
+ 5 / p.Radius(), // frequency
+ 2, // amplitude
+ 2 // growth
+ );
+ float variation = rand::OctaveNoise(
+ variation_gen,
+ to_tile / p.Radius(),
+ 3, // octaves
+ 0.5, // persistence
+ 16 / p.Radius(), // frequency
2, // amplitude
2 // growth
);
- if (elevation < water_thresh) {
- p.TileAt(surface, x, y).type = water;
+ if (elevation < ocean_thresh) {
+ p.TileAt(surface, x, y).type = ocean;
+ } else if (elevation < water_thresh) {
+ if (variation > 0.3) {
+ p.TileAt(surface, x, y).type = algae;
+ } else {
+ p.TileAt(surface, x, y).type = water;
+ }
} else if (elevation < beach_thresh) {
p.TileAt(surface, x, y).type = sand;
+ } else if (elevation < highland_thresh) {
+ if (near_axis < equ_thresh) {
+ if (variation > 0.6) {
+ p.TileAt(surface, x, y).type = grass;
+ } else if (variation > 0.2) {
+ p.TileAt(surface, x, y).type = sand;
+ } else {
+ p.TileAt(surface, x, y).type = desert;
+ }
+ } else if (near_axis < fzone_start) {
+ if (variation > 0.4) {
+ p.TileAt(surface, x, y).type = forest;
+ } else if (variation < -0.5) {
+ p.TileAt(surface, x, y).type = jungle;
+ } else if (variation > -0.02 && variation < 0.02) {
+ p.TileAt(surface, x, y).type = wheat;
+ } else {
+ p.TileAt(surface, x, y).type = grass;
+ }
+ } else if (near_axis < fzone_end) {
+ p.TileAt(surface, x, y).type = tundra;
+ } else {
+ p.TileAt(surface, x, y).type = taiga;
+ }
} else if (elevation < mountain_thresh) {
- p.TileAt(surface, x, y).type = grass;
+ if (variation > 0.3) {
+ p.TileAt(surface, x, y).type = mntn;
+ } else {
+ p.TileAt(surface, x, y).type = rock;
+ }
} else {
- p.TileAt(surface, x, y).type = rock;
+ p.TileAt(surface, x, y).type = mntn;
}
}
}
}
- p.BuildVAOs();
+ p.BuildVAO(tiles);
}
-void GenerateTest(Planet &p) noexcept {
+void GenerateTest(const Set<TileType> &tiles, Planet &p) noexcept {
for (int surface = 0; surface <= 5; ++surface) {
for (int y = 0; y < p.SideLength(); ++y) {
for (int x = 0; x < p.SideLength(); ++x) {
}
}
}
- p.BuildVAOs();
+ p.BuildVAO(tiles);
}
projects / blobs.git / blobdiff