Changeset 234

Timestamp:

05/12/14 16:50:10 (11 years ago)

Author:

epyon

Message:

• shader path for GUI (still temporary fix)

Location:

trunk

Files:

• nv/gui/gui_environment.hh (modified) (1 diff)
• nv/gui/gui_renderer.hh (modified) (1 diff)
• src/gui/gui_environment.cc (modified) (1 diff)
• src/gui/gui_renderer.cc (modified) (2 diffs)

trunk/nv/gui/gui_environment.hh

@@ -36 +36 @@
                 {
                 public:
-                        environment( window* w );
+                        environment( window* w, const std::string& shader_path = "gui" );
                         // temporary
                         void load_style( const std::string& filename );

trunk/nv/gui/gui_renderer.hh

@@ -43 +43 @@
                 {
                 public:
-                        renderer( window* w );
+                        renderer( window* w, const std::string& shader_path );
                         texture_font* get_font( size_t name ) const;
                         vec4 get_image( size_t name ) const;

trunk/src/gui/gui_environment.cc

@@ -31 +31 @@
 using namespace nv::gui;
 
-environment::environment( window* w )
+environment::environment( window* w, const std::string& shader_path )
         : m_renderer( nullptr ), m_window( w ), m_screen( nullptr )
 {
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
         m_screen = new screen( this, m_area );
-        m_renderer = new renderer( w );
+        m_renderer = new renderer( w, shader_path );
         root::add_child( m_screen );
 }

trunk/src/gui/gui_renderer.cc

@@ -92 +92 @@
 };
 
-renderer::renderer( window* w )
+renderer::renderer( window* w, const std::string& shader_path  )
         : m_window(w)
         , m_style()
@@ -111 +111 @@
         // ** EXTREMELY TEMPORARY!
         sr->varray     = m_window->get_device()->create_vertex_array();
-        sr->shader     = m_window->get_device()->create_program( nv::slurp( "gui.vert" ), nv::slurp( "gui.frag" ) );
+        sr->shader     = m_window->get_device()->create_program( nv::slurp( shader_path + ".vert" ), nv::slurp( shader_path + ".frag" ) );
         sr->shader->set_uniform( "tex", 0 );
         glm::mat4 projection = glm::ortho( 0.0f, float( m_window->get_width() ), float( m_window->get_height() ), 0.0f, -1.0f, 1.0f );