Merge branch 'tmj-dev'

World.h

@@ -12,14 +12,13 @@ http://mozilla.org/MPL/2.0/.
 #include <GLFW/glfw3.h>
 #include <string>
 
+#include "Classes.h"
 #include "Camera.h"
-#include "scene.h"
 #include "sky.h"
 #include "sun.h"
 #include "moon.h"
 #include "stars.h"
 #include "skydome.h"
-#include "McZapkie/MOVER.h"
 #include "messaging.h"
 
 // wrapper for simulation time
@@ -112,6 +111,8 @@ TWorld();
     void ToggleDaylight();
     // calculates current season of the year based on set simulation date
     void compute_season( int const Yearday ) const;
+    // calculates current weather
+    void compute_weather() const;
 
 // members