Changeset 367 for trunk/src/gfx

Timestamp:

05/16/15 23:12:22 (10 years ago)

Author:

epyon

Message:

• fixed compilation and warnings on gcc
• slowly removing/merging external includes

Location:

trunk/src/gfx

Files:

• keyframed_mesh.cc (modified) (1 diff)
• skeletal_mesh.cc (modified) (1 diff)
• texture_atlas.cc (modified) (1 diff)
• texture_font.cc (modified) (3 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -5 +5 @@
 #include "nv/gfx/keyframed_mesh.hh"
 
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtx/matrix_interpolation.hpp>
 #include "nv/interface/context.hh"
 #include "nv/interface/device.hh"
-
-
 #include "nv/core/logging.hh"
 

trunk/src/gfx/skeletal_mesh.cc

@@ -5 +5 @@
 #include "nv/gfx/skeletal_mesh.hh"
 
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtx/matrix_interpolation.hpp>
 #include "nv/interface/context.hh"
 #include "nv/interface/device.hh"
-
 
 nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )

trunk/src/gfx/texture_atlas.cc

@@ -8 +8 @@
 
 #include "nv/core/logging.hh"
-#include <iostream>
 
 using namespace nv;

trunk/src/gfx/texture_font.cc

@@ -6 +6 @@
 #include "nv/gfx/texture_font.hh"
 
-#include <sstream>
-#include <stdexcept>
 #include "nv/lib/freetype2.hh"
 #include "nv/core/logging.hh"
@@ -126 +124 @@
                 if ( error )
                 {
-                        std::stringstream error_msg;
-                        error_msg << "FT_Error while loading glyphs, error: "
-                                << error << " code: " << c; 
-                        NV_THROW( std::runtime_error, error_msg.str().c_str() );
+                        NV_LOG_ERROR( "FT_Error while loading glyphs, error: ", error, " code: ", c );
+                        NV_THROW( std::runtime_error, "FT_Error while loading glyphs" );
                 }
 
@@ -144 +140 @@
                 if ( r.pos.x < 0 ) 
                 {
-                        std::stringstream error_msg;
-                        error_msg << "Atlas full while loading glyphs, "
-                                << "r.pos.x: " << r.pos.x << " code: "
-                                << c; 
-                        NV_THROW( std::runtime_error, error_msg.str().c_str() );
+                        NV_LOG_ERROR( "Atlas full while loading glyphs, r.pos.x: ", r.pos.x, " code: ", c );
+                        NV_THROW( std::runtime_error, "Atlas full while loading glyphs" );
                 }
                 if (depth == 4)