Changeset 318

Timestamp:

08/21/14 01:49:25 (11 years ago)

Author:

epyon

Message:

• gui shader now embedded

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) (2 diffs)
• src/gui/gui_renderer.cc (modified) (3 diffs)

trunk/nv/gui/gui_environment.hh

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

trunk/nv/gui/gui_renderer.hh

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

trunk/src/gui/gui_environment.cc

@@ -25 +25 @@
 #include "nv/gfx/texture_atlas.hh"
 
-nv::gui::environment::environment( window* w, const std::string& shader_path )
+nv::gui::environment::environment( window* w )
         : m_renderer( nullptr ), m_window( w )
 {
@@ -35 +35 @@
         screen->m_relative = m_area;
 
-        m_renderer = new renderer( w, shader_path );
+        m_renderer = new renderer( w );
 }
 

trunk/src/gui/gui_renderer.cc

@@ -11 +11 @@
 #include "nv/interface/device.hh"
 #include "nv/interface/context.hh"
+
+static const char *nv_gui_vertex_shader =
+        "#version 120\n"
+        "attribute vec2 nv_position;\n"
+        "attribute vec2 nv_texcoord;\n"
+        "attribute vec4 nv_color;\n"
+        "varying vec4 v_color;\n"
+        "varying vec2 v_texcoord;\n"
+        "uniform mat4 nv_m_projection;\n"
+        "void main(void)\n"
+        "{\n"
+        "       gl_Position = nv_m_projection * vec4(nv_position.x, nv_position.y, 0.0, 1.0);\n"
+        "       v_texcoord  = nv_texcoord;\n"
+        "       v_color     = nv_color;\n"
+        "}\n";
+static const char *nv_gui_fragment_shader =
+        "#version 120\n"
+        "varying vec4 v_color;\n"
+        "varying vec2 v_texcoord;\n"
+        "uniform sampler2D nv_t_diffuse;\n"
+        "void main(void)\n"
+        "{\n"
+        "       vec4 tex_color = texture2D( nv_t_diffuse, v_texcoord );\n"
+        "       gl_FragColor   = v_color * tex_color;\n"
+        "}\n";
 
 using namespace nv;
@@ -92 +117 @@
 };
 
-renderer::renderer( window* w, const std::string& shader_path  )
+renderer::renderer( window* w )
         : m_window(w)
         , m_style()
@@ -110 +135 @@
         screen_render_data* sr = new screen_render_data( w->get_context(), 1024 );
         m_render_data = sr;
-        // ** EXTREMELY TEMPORARY!
-        sr->shader     = m_window->get_device()->create_program( nv::slurp( shader_path + ".vert" ), nv::slurp( shader_path + ".frag" ) );
+        sr->shader     = m_window->get_device()->create_program( nv_gui_vertex_shader, nv_gui_fragment_shader );
         m_scene_state.get_camera().set_ortho( 0.0f, float( m_window->get_width() ), float( m_window->get_height() ), 0.0f );