Changeset 471 for trunk/src/gui/gui_gfx_renderer.cc

Timestamp:

09/21/15 19:13:26 (10 years ago)

Author:

epyon

Message:

• full math library
• GLM dependency removed

File:

• trunk/src/gui/gui_gfx_renderer.cc (modified) (2 diffs)

trunk/src/gui/gui_gfx_renderer.cc

@@ -215 +215 @@
         image_data* data = m_window->get_device()->create_image_data( filename );
         // TODO: Repitching
-        assert( data->get_depth() == 4 );
+        NV_ASSERT( data->get_depth() == 4, "depth != 4" );
         region r = m_atlas.get_region( data->get_size() );
         m_atlas.set_region( r, data->get_data() );
@@ -327 +327 @@
                                                 position p2 = p + g->size + gp;
                                                 qvec.emplace_back( p + gp, p2, color, g->tl, g->br );
-                                                p += g->advance;
+                                                p += ivec2( g->advance );
                                         }
                                 }