X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=475c3fac9c548494c209fd0b73164ed3e00bfe4d;hb=f8c0f8706e51450ee0e87a548ccf3a66ee9f0db3;hp=1cd3f9fad69cb6b01c60d67cf34264ab5cdd833f;hpb=200f9da6241613a1c19431896b09d1715c262c6d;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 1cd3f9f..475c3fa 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -20,33 +20,37 @@ int main(int argc, char *argv[]) {
 	app::Assets assets;
 
 	world::Sun sun;
-	sun.Mass(1.0e14);
-	sun.Radius(20.0);
-	sun.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
-	sun.AngularMomentum(1.0e13);
+	sun.Name("Sun");
+	sun.Mass(1.0e17);
+	sun.Radius(200.0);
+	sun.Color(glm::dvec3(1.0));
+	sun.Luminosity(1.0e8);
+	sun.AxialTilt(glm::dvec2(PI * 0.25, PI * 0.25));
+	sun.AngularMomentum(1.0e18);
 
 	world::Planet planet(25);
+	planet.Name("Planet");
 	planet.SetParent(sun);
-	planet.Mass(1.0e10);
-	planet.GetOrbit().SemiMajorAxis(941.7);
-	planet.SurfaceTilt(glm::dvec2(PI * 0.25, PI * 0.25));
+	planet.Mass(1.0e13);
+	planet.GetOrbit().SemiMajorAxis(8184.0);
 	planet.AxialTilt(glm::dvec2(PI * 0.127, 0.0));
-	planet.AngularMomentum(6.0e10);
+	planet.AngularMomentum(6.5e13);
 
-	world::Planet moon(3);
+	world::Planet moon(5);
+	moon.Name("Moon");
 	moon.SetParent(planet);
-	moon.Mass(1.0e6);
-	moon.GetOrbit().SemiMajorAxis(37.0);
+	moon.Mass(1.0e7);
+	moon.GetOrbit().SemiMajorAxis(72.5);
 	moon.Rotation(PI * 0.25);
-	moon.AngularMomentum(1.0e4);
+	moon.AngularMomentum(5.22e5);
 
-	world::Planet second_planet(9);
+	world::Planet second_planet(14);
+	second_planet.Name("Second planet");
 	second_planet.SetParent(sun);
-	second_planet.Mass(1.0e9);
-	second_planet.GetOrbit().SemiMajorAxis(350.0);
-	second_planet.SurfaceTilt(glm::dvec2(PI * 0.125, PI * 0.25));
+	second_planet.Mass(1.0e12);
+	second_planet.GetOrbit().SemiMajorAxis(4350.0);
 	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
-	second_planet.AngularMomentum(1.0e8);
+	second_planet.AngularMomentum(1.0e12);
 
 	world::Simulation sim(sun, assets);
 	sim.AddSun(sun);
@@ -67,8 +71,7 @@ int main(int argc, char *argv[]) {
 	blob->BuildVAO();
 
 	app::MasterState state(assets, sim);
-	state.GetCreaturePanel().Show(*blob);
-	state.GetTimePanel().SetBody(planet);
+	state.Show(*blob);
 
 	app::Application app(init.window, init.viewport);
 	app.PushState(&state);