X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=20725100d1d6cc176dae4afa4cc02f693ed1eb4b;hb=7a0da3422f7c9b81ae529a7554f6d16e85f05e1d;hp=c302159c0124bab310d8a55820192b0024a2ac8a;hpb=c5556cf5f6813887a3503433c021ccd2e7fae865;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index c302159..2072510 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -1,55 +1,79 @@
-#include "const.hpp"
 #include "app/Application.hpp"
 #include "app/Assets.hpp"
 #include "app/init.hpp"
 #include "app/MasterState.hpp"
+#include "creature/Creature.hpp"
+#include "math/const.hpp"
 #include "world/Planet.hpp"
+#include "world/Set.hpp"
 #include "world/Simulation.hpp"
 #include "world/Sun.hpp"
+#include "world/TileType.hpp"
 
 #include <cstdint>
 #include <iostream>
 
-
 using namespace blobs;
 
 int main(int argc, char *argv[]) {
-	app::Init init;
+	app::Init init(true, 8);
 	app::Assets assets;
 
 	world::Sun sun;
-	sun.Mass(1.0e12);
-	sun.Radius(1.0);
+	sun.Name("Sun");
+	sun.Mass(1.0e17);
+	sun.Radius(200.0);
+	sun.Color(glm::dvec3(1.0));
+	sun.Luminosity(1.0e8);
 	sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
-	sun.AngularMomentum(1.0e9);
+	sun.AngularMomentum(1.0e18);
 
-	world::Planet planet(11);
-	world::GenerateTest(planet);
+	world::Planet planet(25);
+	planet.Name("Planet");
 	planet.SetParent(sun);
-	planet.Mass(1.0e9);
-	planet.GetOrbit().SemiMajorAxis(100.0);
+	planet.Mass(1.0e13);
+	planet.GetOrbit().SemiMajorAxis(8184.0);
 	planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
 	planet.AxialTilt(glm::dvec2(PI * 0.127, 0.0));
-	planet.AngularMomentum(3.0e9);
+	planet.AngularMomentum(6.5e13);
 
-	world::Planet moon(3);
-	world::GenerateTest(moon);
+	world::Planet moon(5);
+	moon.Name("Moon");
 	moon.SetParent(planet);
-	moon.Mass(1.0e6);
-	moon.GetOrbit().SemiMajorAxis(25.0);
-	moon.AngularMomentum(1.0e5);
+	moon.Mass(1.0e7);
+	moon.GetOrbit().SemiMajorAxis(72.5);
+	moon.Rotation(PI * 0.25);
+	moon.AngularMomentum(5.22e5);
+
+	world::Planet second_planet(14);
+	second_planet.Name("Second planet");
+	second_planet.SetParent(sun);
+	second_planet.Mass(1.0e12);
+	second_planet.GetOrbit().SemiMajorAxis(4350.0);
+	second_planet.SurfaceTilt(glm::dvec2(PI * 0.125, PI * 0.25));
+	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
+	second_planet.AngularMomentum(1.0e12);
+
+	world::Simulation sim(sun, assets);
+	sim.AddSun(sun);
+	sim.AddPlanet(planet);
+	sim.AddPlanet(second_planet);
+	sim.AddPlanet(moon);
 
-	world::Simulation sim(sun);
-	sim.AddBody(planet);
-	sim.AddBody(moon);
+	world::GenerateEarthlike(assets.data.tile_types, planet);
+	planet.Atmosphere(assets.data.resources["air"].id);
+	world::GenerateTest(assets.data.tile_types, moon);
+	world::GenerateTest(assets.data.tile_types, second_planet);
 
-	std::cout << "length of year: " << planet.OrbitalPeriod() << "s" << std::endl;
-	std::cout << "length of moon cycle: " << moon.OrbitalPeriod() << "s" << std::endl;
-	std::cout << "length of day: " << planet.RotationalPeriod() << "s" << std::endl;
+	auto blob = new creature::Creature(sim);
+	blob->Name(assets.name.Sequential());
+	Spawn(*blob, planet);
+	// decrease chances of ur-blob dying without splitting
+	blob->GetProperties().Fertility() = 1.0;
+	blob->BuildVAO();
 
 	app::MasterState state(assets, sim);
-	state.SetReference(planet);
-	planet.BuildVAOs();
+	state.Show(*blob);
 
 	app::Application app(init.window, init.viewport);
 	app.PushState(&state);