Changeset 346

Timestamp:

11/18/14 14:56:13 (11 years ago)

Author:

epyon

Message:

• raw string literals used (C++11)

Location:

trunk/src

Files:

• gfx/debug_draw.cc (modified) (1 diff)
• gui/gui_renderer.cc (modified) (1 diff)

trunk/src/gfx/debug_draw.cc

@@ -9 +9 @@
 #include "nv/interface/device.hh"
 
-static const char *nv_debug_draw_vertex_shader =
-        "#version 120\n"
-        "attribute vec3 nv_position;\n"
-        "attribute vec3 nv_color;\n"
-        "varying vec3 v_color;\n"
-        "uniform mat4 nv_m_mvp;\n"
-        "void main(void)\n"
-        "{\n"
-        "       gl_Position = nv_m_mvp * vec4 (nv_position, 1.0);\n"
-        "       v_color     = nv_color;\n"
-        "}\n";
-static const char *nv_debug_draw_fragment_shader =
-        "#version 120\n"
-        "varying vec3 v_color;\n"
-        "void main(void)\n"
-        "{\n"
-        "       gl_FragColor = vec4( v_color, 1.0 );\n"
-        "}\n";
+static const char *nv_debug_draw_vertex_shader = R"(
+#version 120
+attribute vec3 nv_position;
+attribute vec3 nv_color;
+varying vec3 v_color;
+uniform mat4 nv_m_mvp;
+void main(void)
+{
+        gl_Position = nv_m_mvp * vec4 (nv_position, 1.0);
+        v_color     = nv_color;
+};
+)";
+static const char *nv_debug_draw_fragment_shader = R"(
+#version 120
+varying vec3 v_color;
+void main(void)
+{
+        gl_FragColor = vec4( v_color, 1.0 );
+}
+)";
 
 nv::debug_data::debug_data( context* a_context )

trunk/src/gui/gui_renderer.cc

@@ -13 +13 @@
 #include "nv/core/logging.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";
+static const char *nv_gui_vertex_shader = R"(
+#version 120
+attribute vec2 nv_position;
+attribute vec2 nv_texcoord;
+attribute vec4 nv_color;
+varying vec4 v_color;
+varying vec2 v_texcoord;
+uniform mat4 nv_m_projection;
+void main(void)
+{
+        gl_Position = nv_m_projection * vec4(nv_position.x, nv_position.y, 0.0, 1.0);
+        v_texcoord  = nv_texcoord;
+        v_color     = nv_color;
+}
+)";
+
+static const char *nv_gui_fragment_shader = R"(
+#version 120
+varying vec4 v_color;
+varying vec2 v_texcoord;
+uniform sampler2D nv_t_diffuse;
+void main(void)
+{
+        vec4 tex_color = texture2D( nv_t_diffuse, v_texcoord );
+        gl_FragColor   = v_color * tex_color;
+}
+)";