X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=18e62aad75e82d10e6850b45ab81321504ec8bf1;hb=8a3907bb0bed257bf5d6f40f39f15114e8345913;hp=49813d585ce04c90c051b97fec5a6c104afe93f3;hpb=343b4f7e7cdd53dc1eab7dc32196ae5fa604ba48;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 49813d5..18e62aa 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -49,16 +49,16 @@ int main(int argc, char *argv[]) {
 	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
 	second_planet.AngularMomentum(1.0e8);
 
-	world::Simulation sim(sun);
+	world::Simulation sim(sun, assets.data.resources, assets.data.tile_types);
 	sim.AddSun(sun);
 	sim.AddPlanet(planet);
 	sim.AddPlanet(second_planet);
 	sim.AddPlanet(moon);
 
-	world::GenerateEarthlike(assets.data.tiles, planet);
+	world::GenerateEarthlike(assets.data.tile_types, planet);
 	planet.Atmosphere(assets.data.resources["air"].id);
-	world::GenerateTest(assets.data.tiles, moon);
-	world::GenerateTest(assets.data.tiles, second_planet);
+	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;
@@ -68,8 +68,9 @@ int main(int argc, char *argv[]) {
 	std::cout << "moon cycles per year: " << (planet.OrbitalPeriod() / moon.OrbitalPeriod()) << std::endl;
 
 	auto blob = new creature::Creature;
-	blob->BuildVAO();
 	Spawn(*blob, planet, assets);
+	blob->BuildVAO();
+	blob->Name("Blob");
 
 	app::MasterState state(assets, sim);
 	state.GetCamera()
@@ -79,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, 60.0f), 0.0f)
+		.MapView(0, glm::vec3(0.0f, 0.0f, 30.0f), 0.0f)
 		// from afar, rotating
-		.Orbital(glm::vec3(-60.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);