X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=56475029097c8f061ca5ec971d994aac68674200;hb=bcf776b6d51aeb9147bde32da8dd0768b10db993;hp=c09aea6b21279d6802fc518dab089532286f9577;hpb=196f02bdbbd372b77141201f045fcfea318093b1;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index c09aea6..5647502 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -3,11 +3,11 @@
 #include "app/Assets.hpp"
 #include "app/init.hpp"
 #include "app/MasterState.hpp"
-#include "world/Creature.hpp"
+#include "creature/Creature.hpp"
 #include "world/Planet.hpp"
+#include "world/Set.hpp"
 #include "world/Simulation.hpp"
 #include "world/Sun.hpp"
-#include "world/TileSet.hpp"
 #include "world/TileType.hpp"
 
 #include <cstdint>
@@ -20,35 +20,24 @@ int main(int argc, char *argv[]) {
 	app::Init init(true, 8);
 	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 });
-
 	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);
 
@@ -66,9 +55,10 @@ int main(int argc, char *argv[]) {
 	sim.AddPlanet(second_planet);
 	sim.AddPlanet(moon);
 
-	world::GenerateEarthlike(tiles, planet);
-	world::GenerateTest(tiles, moon);
-	world::GenerateTest(tiles, second_planet);
+	world::GenerateEarthlike(assets.data.tiles, planet);
+	planet.Atmosphere(assets.data.resources["air"].id);
+	world::GenerateTest(assets.data.tiles, moon);
+	world::GenerateTest(assets.data.tiles, second_planet);
 
 	std::cout << "length of year: " << planet.OrbitalPeriod() << "s" << std::endl;
 	std::cout << "length of moon cycle: " << moon.OrbitalPeriod() << "s" << std::endl;
@@ -77,11 +67,10 @@ int main(int argc, char *argv[]) {
 	std::cout << "moon cycle in days: " << (moon.OrbitalPeriod() / planet.RotationalPeriod()) << std::endl;
 	std::cout << "moon cycles per year: " << (planet.OrbitalPeriod() / moon.OrbitalPeriod()) << std::endl;
 
-	auto blob = new world::Creature;
+	auto blob = new creature::Creature;
+	Spawn(*blob, planet, assets);
 	blob->BuildVAO();
-	planet.AddCreature(blob);
-	blob->Surface(0);
-	blob->Position(glm::dvec3(0.0, 0.0, 0.0));
+	blob->Name("Blob");
 
 	app::MasterState state(assets, sim);
 	state.GetCamera()
@@ -91,15 +80,16 @@ 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()
 	//	.Reference(sun)
 	//	.Orbital(glm::vec3(-500.0f, 500.0f, 500.0f))
 	//;
+	state.GetCreaturePanel().Show(*blob);
 
 	app::Application app(init.window, init.viewport);
 	app.PushState(&state);