Merge branch 'tmj-dev' into dev

renderer.h

@@ -156,20 +156,20 @@ public:
     // geometry methods
     // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself
     // creates a new geometry bank. returns: handle to the bank or NULL
-    geometrybank_handle
+    gfx::geometrybank_handle
         Create_Bank();
     // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL
-    geometry_handle
-        Insert( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type );
+    gfx::geometry_handle
+        Insert( gfx::vertex_array &Vertices, gfx::geometrybank_handle const &Geometry, int const Type );
     // replaces data of specified chunk with the supplied vertex data, starting from specified offset
     bool
-        Replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 );
+        Replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 );
     // adds supplied vertex data at the end of specified chunk
     bool
-        Append( vertex_array &Vertices, geometry_handle const &Geometry );
+        Append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry );
     // provides direct access to vertex data of specfied chunk
-    vertex_array const &
-        Vertices( geometry_handle const &Geometry ) const;
+    gfx::vertex_array const &
+        Vertices( gfx::geometry_handle const &Geometry ) const;
     // material methods
     material_handle
         Fetch_Material( std::string const &Filename, bool const Loadnow = true );
@@ -178,8 +178,6 @@ public:
     opengl_material const &
         Material( material_handle const Material ) const;
     // texture methods
-    void
-        Active_Texture( GLint const Textureunit );
     texture_handle
         Fetch_Texture( std::string const &Filename, bool const Loadnow = true );
     void
@@ -194,14 +192,14 @@ public:
         Pick_Control() const { return m_pickcontrolitem; }
     editor::basic_node const *
         Pick_Node() const { return m_picksceneryitem; }
-    // maintenance jobs
+    // maintenance methods
     void
         Update( double const Deltatime );
     TSubModel const *
         Update_Pick_Control();
     editor::basic_node const *
         Update_Pick_Node();
-    // debug performance string
+    // debug methods
     std::string const &
         info_times() const;
     std::string const &
@@ -275,6 +273,9 @@ private:
         setup_shadow_color( glm::vec4 const &Shadowcolor );
     void
         switch_units( bool const Diffuse, bool const Shadows, bool const Reflections );
+    // helper, texture manager method; activates specified texture unit
+    void
+        select_unit( GLint const Textureunit );
     // runs jobs needed to generate graphics for specified render pass
     void
         Render_pass( rendermode const Mode );
@@ -336,12 +337,12 @@ private:
 
 // members
     GLFWwindow *m_window { nullptr };
-    geometrybank_manager m_geometry;
+    gfx::geometrybank_manager m_geometry;
     material_manager m_materials;
     texture_manager m_textures;
     opengllight_array m_lights;
 
-    geometry_handle m_billboardgeometry { 0, 0 };
+    gfx::geometry_handle m_billboardgeometry { 0, 0 };
     texture_handle m_glaretexture { -1 };
     texture_handle m_suntexture { -1 };
     texture_handle m_moontexture { -1 };