X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=1b2e058f90d666dfd79d52474ad12ad0fe652686;hb=475f28f06c9e14912bab8119264e247ef466513d;hp=eb03490204c722cf3f6f58425a2d88bc3ce2b022;hpb=cacc0641e5174d8b46e7a7086be6a45c87ab3642;p=blobs.git diff --git a/src/world/world.cpp b/src/world/world.cpp index eb03490..1b2e058 100644 --- a/src/world/world.cpp +++ b/src/world/world.cpp @@ -1,18 +1,27 @@ #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/Composition.hpp" +#include "../creature/Creature.hpp" #include "../graphics/Viewport.hpp" +#include "../math/const.hpp" +#include "../math/OctaveNoise.hpp" +#include "../math/SimplexNoise.hpp" #include #include +#include #include #include +#include #include using blobs::G; @@ -37,10 +46,19 @@ Body::Body() , surface_tilt(0.0, 0.0) , axis_tilt(0.0, 0.0) , rotation(0.0) -, angular(0.0) { +, angular(0.0) +, orbital(1.0) +, inverse_orbital(1.0) +, 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 { @@ -101,32 +119,76 @@ double Body::RotationalPeriod() const noexcept { } } -glm::dmat4 Body::LocalTransform() const noexcept { - glm::dmat4 srf = glm::eulerAngleXY(surface_tilt.x, surface_tilt.y); - glm::dmat4 rot = glm::eulerAngleY(rotation); - glm::dmat4 tilt = glm::eulerAngleXY(axis_tilt.x, axis_tilt.y); - return tilt * rot * srf; +glm::dmat4 Body::ToUniverse() const noexcept { + glm::dmat4 m(1.0); + const Body *b = this; + while (b->HasParent()) { + m = b->ToParent() * m; + b = &b->Parent(); + } + return m; +} + +glm::dmat4 Body::FromUniverse() const noexcept { + glm::dmat4 m(1.0); + const Body *b = this; + while (b->HasParent()) { + m *= b->FromParent(); + b = &b->Parent(); + } + return m; } -glm::dmat4 Body::InverseTransform() const noexcept { - glm::dmat4 srf = glm::eulerAngleYX(-surface_tilt.y, -surface_tilt.x); - glm::dmat4 rot = glm::eulerAngleY(-rotation); - glm::dmat4 tilt = glm::eulerAngleYX(-axis_tilt.y, -axis_tilt.x); - return srf * rot * tilt; +namespace { +std::vector ccache; +} + +void Body::Tick(double dt) { + rotation += dt * AngularMomentum() / Inertia(); + Cache(); + ccache = Creatures(); + for (creature::Creature *c : ccache) { + c->Tick(dt); + } + for (auto c = Creatures().begin(); c != Creatures().end();) { + if ((*c)->Removable()) { + delete *c; + c = Creatures().erase(c); + } else { + ++c; + } + } } -glm::dmat4 Body::ToParent() const noexcept { - if (!parent) { - return glm::dmat4(1.0); +void Body::Cache() noexcept { + if (parent) { + orbital = + orbit.Matrix(PI_2p0 * (GetSimulation().Time() / OrbitalPeriod())) + * glm::eulerAngleXY(axis_tilt.x, axis_tilt.y); + inverse_orbital = + glm::eulerAngleYX(-axis_tilt.y, -axis_tilt.x) + * orbit.InverseMatrix(PI_2p0 * (GetSimulation().Time() / OrbitalPeriod())); + } else { + orbital = glm::eulerAngleXY(axis_tilt.x, axis_tilt.y); + inverse_orbital = glm::eulerAngleYX(-axis_tilt.y, -axis_tilt.x); } - return orbit.InverseMatrix(PI_2p0 * (GetSimulation().Time() / OrbitalPeriod())); + local = + glm::eulerAngleY(rotation) + * glm::eulerAngleXY(surface_tilt.x, surface_tilt.y); + inverse_local = + glm::eulerAngleYX(-surface_tilt.y, -surface_tilt.x) + * glm::eulerAngleY(-rotation); +} + +void Body::AddCreature(creature::Creature *c) { + creatures.push_back(c); } -glm::dmat4 Body::FromParent() const noexcept { - if (!parent) { - return glm::dmat4(1.0); +void Body::RemoveCreature(creature::Creature *c) { + auto entry = std::find(creatures.begin(), creatures.end(), c); + if (entry != creatures.end()) { + creatures.erase(entry); } - return orbit.Matrix(PI_2p0 * (GetSimulation().Time() / OrbitalPeriod())); } @@ -219,7 +281,7 @@ glm::dmat4 Orbit::Matrix(double t) const noexcept { double P = sma * (cos(E) - ecc); double Q = sma * sin(E) * sqrt(1 - (ecc * ecc)); - return glm::translate(glm::yawPitchRoll(asc, inc, arg), glm::dvec3(P, 0.0, -Q)); + return glm::yawPitchRoll(asc, inc, arg) * glm::translate(glm::dvec3(P, 0.0, -Q)); } glm::dmat4 Orbit::InverseMatrix(double t) const noexcept { @@ -227,14 +289,14 @@ glm::dmat4 Orbit::InverseMatrix(double t) const noexcept { double E = mean2eccentric(M, ecc); double P = sma * (cos(E) - ecc); double Q = sma * sin(E) * sqrt(1 - (ecc * ecc)); - return glm::transpose(glm::yawPitchRoll(asc, inc, arg)) * glm::translate(glm::dvec3(-P, 0.0, Q)); + return glm::translate(glm::dvec3(-P, 0.0, Q)) * glm::transpose(glm::yawPitchRoll(asc, inc, arg)); } Planet::Planet(int sidelength) : Body() , sidelength(sidelength) -, tiles(new Tile[TilesTotal()]) +, tiles(TilesTotal()) , vao() { Radius(double(sidelength) / 2.0); } @@ -242,17 +304,42 @@ Planet::Planet(int sidelength) Planet::~Planet() { } -void Planet::BuildVAOs() { - vao.Bind(); - vao.BindAttributes(); - vao.EnableAttribute(0); - vao.EnableAttribute(1); - vao.AttributePointer(0, false, offsetof(Attributes, position)); - vao.AttributePointer(1, false, offsetof(Attributes, tex_coord)); - vao.ReserveAttributes(TilesTotal() * 4, GL_STATIC_DRAW); +const TileType &Planet::TypeAt(int srf, int x, int y) const { + return GetSimulation().TileTypes()[TileAt(srf, x, y).type]; +} + +glm::ivec2 Planet::SurfacePosition(int srf, const glm::dvec3 &pos) const noexcept { + return glm::ivec2( + PositionToTile(pos[(srf + 0) % 3]), + PositionToTile(pos[(srf + 1) % 3])); +} + +double Planet::SurfaceElevation(int srf, const glm::dvec3 &pos) const noexcept { + return srf < 3 + ? pos[(srf + 2) % 3] - Radius() + : -pos[(srf + 2) % 3] - Radius(); +} + +glm::dvec3 Planet::TileCenter(int srf, int x, int y, double e) const noexcept { + glm::dvec3 center(0.0f); + center[(srf + 0) % 3] = x + 0.5 - Radius(); + center[(srf + 1) % 3] = y + 0.5 - Radius(); + center[(srf + 2) % 3] = srf < 3 ? (Radius() + e) : -(Radius() + e); + return center; +} + +void Planet::BuildVAO(const Set &ts) { + vao.reset(new graphics::SimpleVAO); + vao->Bind(); + vao->BindAttributes(); + vao->EnableAttribute(0); + vao->EnableAttribute(1); + vao->AttributePointer(0, false, offsetof(Attributes, position)); + vao->AttributePointer(1, false, offsetof(Attributes, tex_coord)); + vao->ReserveAttributes(TilesTotal() * 4, GL_STATIC_DRAW); { - auto attrib = vao.MapAttributes(GL_WRITE_ONLY); - float offset = sidelength * 0.5f; + auto attrib = vao->MapAttributes(GL_WRITE_ONLY); + float offset = Radius(); // srf 0 1 2 3 4 5 // up +Z +X +Y -Z -X -Y @@ -260,42 +347,44 @@ void Planet::BuildVAOs() { 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_v_begin = surface < 3 ? 1.0f : 0.0f; + const float tex_v_end = surface < 3 ? 0.0f : 1.0f; attrib[4 * index + 0].position[(surface + 0) % 3] = x + 0 - offset; attrib[4 * index + 0].position[(surface + 1) % 3] = y + 0 - offset; attrib[4 * index + 0].position[(surface + 2) % 3] = surface < 3 ? offset : -offset; attrib[4 * index + 0].tex_coord[0] = 0.0f; - attrib[4 * index + 0].tex_coord[1] = 0.0f; + attrib[4 * index + 0].tex_coord[1] = tex_v_begin; attrib[4 * index + 0].tex_coord[2] = tex; attrib[4 * index + 1].position[(surface + 0) % 3] = x + 0 - offset; attrib[4 * index + 1].position[(surface + 1) % 3] = y + 1 - offset; attrib[4 * index + 1].position[(surface + 2) % 3] = surface < 3 ? offset : -offset; attrib[4 * index + 1].tex_coord[0] = 0.0f; - attrib[4 * index + 1].tex_coord[1] = 1.0f; + attrib[4 * index + 1].tex_coord[1] = tex_v_end; attrib[4 * index + 1].tex_coord[2] = tex; attrib[4 * index + 2].position[(surface + 0) % 3] = x + 1 - offset; attrib[4 * index + 2].position[(surface + 1) % 3] = y + 0 - offset; attrib[4 * index + 2].position[(surface + 2) % 3] = surface < 3 ? offset : -offset; attrib[4 * index + 2].tex_coord[0] = 1.0f; - attrib[4 * index + 2].tex_coord[1] = 0.0f; + attrib[4 * index + 2].tex_coord[1] = tex_v_begin; attrib[4 * index + 2].tex_coord[2] = tex; attrib[4 * index + 3].position[(surface + 0) % 3] = x + 1 - offset; attrib[4 * index + 3].position[(surface + 1) % 3] = y + 1 - offset; attrib[4 * index + 3].position[(surface + 2) % 3] = surface < 3 ? offset : -offset; attrib[4 * index + 3].tex_coord[0] = 1.0f; - attrib[4 * index + 3].tex_coord[1] = 1.0f; + attrib[4 * index + 3].tex_coord[1] = tex_v_end; attrib[4 * index + 3].tex_coord[2] = tex; } } } } - vao.BindElements(); - vao.ReserveElements(TilesTotal() * 6, GL_STATIC_DRAW); + vao->BindElements(); + vao->ReserveElements(TilesTotal() * 6, GL_STATIC_DRAW); { - auto element = vao.MapElements(GL_WRITE_ONLY); + auto element = vao->MapElements(GL_WRITE_ONLY); int index = 0; for (int surface = 0; surface < 3; ++surface) { for (int y = 0; y < sidelength; ++y) { @@ -322,36 +411,149 @@ void Planet::BuildVAOs() { } } } - vao.Unbind(); + vao->Unbind(); } void Planet::Draw(app::Assets &assets, graphics::Viewport &viewport) { - vao.Bind(); + if (!vao) return; + + vao->Bind(); const glm::mat4 &MV = assets.shaders.planet_surface.MV(); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(0.0f, 0.0f, 1.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 0); + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 0); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(1.0f, 0.0f, 0.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 1); + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 1); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 2); + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 2); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 3); + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 3); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(-1.0f, 0.0f, 0.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 4); + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 4); assets.shaders.planet_surface.SetNormal(glm::vec3(MV * glm::vec4(0.0f, -1.0f, 0.0f, 0.0f))); - vao.DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 5); -} + vao->DrawTriangles(TilesPerSurface() * 6, TilesPerSurface() * 6 * 5); +} + + +void GenerateEarthlike(const Set &tiles, Planet &p) noexcept { + math::SimplexNoise elevation_gen(0); + math::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.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::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) { + for (int x = 0; x < p.SideLength(); ++x) { + glm::dvec3 to_tile = p.TileCenter(surface, x, y); + double near_axis = std::abs(glm::dot(glm::normalize(to_tile), axis)); + if (near_axis > cap_thresh) { + p.TileAt(surface, x, y).type = ice; + continue; + } + float elevation = math::OctaveNoise( + elevation_gen, + to_tile / p.Radius(), + 3, // octaves + 0.5, // persistence + 5 / p.Radius(), // frequency + 2, // amplitude + 2 // growth + ); + float variation = math::OctaveNoise( + variation_gen, + to_tile / p.Radius(), + 3, // octaves + 0.5, // persistence + 16 / p.Radius(), // frequency + 2, // amplitude + 2 // growth + ); + 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) { + 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 = mntn; + } + } + } + } + p.BuildVAO(tiles); +} -void GenerateTest(Planet &p) { +void GenerateTest(const Set &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.TileAt(surface, x, y).type = (x == p.SideLength()/2) + (y == p.SideLength()/2); + if (x == p.SideLength() / 2 && y == p.SideLength() / 2) { + p.TileAt(surface, x, y).type = surface; + } else { + p.TileAt(surface, x, y).type = (x == p.SideLength()/2) + (y == p.SideLength()/2) + 6; + } } } } - p.BuildVAOs(); + p.BuildVAO(tiles); } @@ -362,5 +564,29 @@ Sun::Sun() Sun::~Sun() { } + +std::vector::const_iterator TileType::FindResource(int r) const { + auto yield = resources.cbegin(); + for (; yield != resources.cend(); ++yield) { + if (yield->resource == r) { + break; + } + } + return yield; +} + +std::vector::const_iterator TileType::FindBestResource(const creature::Composition &comp) const { + auto best = resources.cend(); + double best_value = 0.0; + for (auto yield = resources.cbegin(); yield != resources.cend(); ++yield) { + double value = comp.Get(yield->resource); + if (value > best_value) { + best = yield; + best_value = value; + } + } + return best; +} + } }