slightly better planet

[blobs.git] / src / blobs.cpp

diff --git a/src/blobs.cpp b/src/blobs.cpp
index c09aea6b21279d6802fc518dab089532286f9577..dcc759052ee2d501d5631719657cdd849371b68a 100644 (file)
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -21,34 +21,39 @@ int main(int argc, char *argv[]) {
        app::Assets assets;
 
        world::TileSet tiles;
-       tiles.Add({ "ice",     "Ice",     0, 0 });
-       tiles.Add({ "black",   "Black",   0, 1 });
-       tiles.Add({ "red",     "Red",     0, 2 });
-       tiles.Add({ "grass",   "Grass",   0, 3 });
-       tiles.Add({ "water",   "Water",   0, 4 });
-       tiles.Add({ "sand",    "Sand",    0, 5 });
-       tiles.Add({ "tundra",  "Tundra",  0, 6 });
-       tiles.Add({ "magenta", "Magenta", 0, 7 });
-       tiles.Add({ "rock",    "Rock",    0, 8 });
+       tiles.Add({ "algae",    "Algae",    0,  0 });
+       tiles.Add({ "desert",   "Desert",   0,  1 });
+       tiles.Add({ "forest",   "Forest",   0,  2 });
+       tiles.Add({ "grass",    "Grass",    0,  3 });
+       tiles.Add({ "ice",      "Ice",      0,  4 });
+       tiles.Add({ "jungle",   "Jungle",   0,  5 });
+       tiles.Add({ "mountain", "Mountain", 0,  6 });
+       tiles.Add({ "ocean",    "Ocean",    0,  7 });
+       tiles.Add({ "rock",     "Rock",     0,  8 });
+       tiles.Add({ "sand",     "Sand",     0,  9 });
+       tiles.Add({ "taiga",    "Taiga",    0, 10 });
+       tiles.Add({ "tundra",   "Tundra",   0, 11 });
+       tiles.Add({ "water",    "Water",    0, 12 });
+       tiles.Add({ "wheat",    "Wheat",    0, 13 });
 
        world::Sun sun;
-       sun.Mass(1.0e12);
-       sun.Radius(10.0);
+       sun.Mass(1.0e14);
+       sun.Radius(20.0);
        sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
        sun.AngularMomentum(1.0e13);
 
-       world::Planet planet(11);
+       world::Planet planet(25);
        planet.SetParent(sun);
-       planet.Mass(1.0e9);
+       planet.Mass(1.0e10);
        planet.GetOrbit().SemiMajorAxis(941.7);
        planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
        planet.AxialTilt(glm::dvec2(PI * 0.127, 0.0));
-       planet.AngularMomentum(1.25e9);
+       planet.AngularMomentum(6.0e10);
 
        world::Planet moon(3);
        moon.SetParent(planet);
        moon.Mass(1.0e6);
-       moon.GetOrbit().SemiMajorAxis(25.0);
+       moon.GetOrbit().SemiMajorAxis(37.0);
        moon.Rotation(PI * 0.25);
        moon.AngularMomentum(1.0e4);
 
@@ -91,9 +96,9 @@ int main(int argc, char *argv[]) {
                // sunset
                //.FirstPerson(3, glm::vec3(0.0f, 0.0f, 0.1f), glm::vec3(1.0f, -0.75f, 0.1f))
                // from afar
-               //.MapView(0, glm::vec3(0.0f, 0.0f, 25.0f), 0.0f)
+               //.MapView(0, glm::vec3(0.0f, 0.0f, 60.0f), 0.0f)
                // from afar, rotating
-               .Orbital(glm::vec3(-25.0f, 0.0f, 0.0f))
+               .Orbital(glm::vec3(-60.0f, 0.0f, 0.0f))
        ;
        // system view
        //state.GetCamera()