merge

World.h

@@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stars.h"
 #include "skydome.h"
 #include "mczapkie/mover.h"
+#include "glfw/glfw3.h"
 
 // wrapper for environment elements -- sky, sun, stars, clouds etc
 class world_environment {
@@ -36,14 +37,15 @@ private:
 
 class TWorld
 {
-    void InOutKey();
+    void InOutKey( bool const Near = true );
     void FollowView(bool wycisz = true);
-    void DistantView();
+    void DistantView( bool const Near = false );
 
   public:
-    bool Init(GLFWwindow *w);
+    bool Init( GLFWwindow *w );
+    bool InitPerformed() { return m_init; }
     GLFWwindow *window;
-    GLvoid glPrint(const char *fmt);
+    GLvoid glPrint(std::string const &Text);
     void OnKeyDown(int cKey);
     void OnKeyUp(int cKey);
     // void UpdateWindow();
@@ -69,7 +71,7 @@ class TWorld
     world_environment Environment;
     TTrain *Train;
     TDynamicObject *pDynamicNearest;
-    bool Paused;
+    bool Paused{ true };
     GLuint base; // numer DL dla znaków w napisach
     texture_manager::size_type light; // numer tekstury dla smugi
     TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury