Changeset 28 for trunk

Timestamp:

05/20/13 22:22:36 (12 years ago)

Author:

melon

Message:

Just some reformating, got rid of compiler warnings.

Location:

trunk

Files:

• nv/gl/texture_font.hh (modified) (2 diffs)
• src/gl/texture_atlas.cc (modified) (2 diffs)
• src/gl/texture_font.cc (modified) (1 diff)

trunk/nv/gl/texture_font.hh

@@ -19 +19 @@
         struct texture_glyph
         {
-            uint16 charcode;
+                uint16 charcode;
                 glm::ivec2 size;
-            glm::ivec2 offset;
-            glm::vec2 advance;
-            glm::vec2 tl;
-            glm::vec2 br;
+                glm::ivec2 offset;
+                glm::vec2 advance;
+                glm::vec2 tl;
+                glm::vec2 br;
                 std::unordered_map< uint16, float > kerning;
 
@@ -33 +33 @@
         class texture_font
         {
-        public:
-                texture_font( texture_atlas* atlas, const char * filename, float size );
-                const texture_glyph* get_glyph( uint16 charcode ) const;
-                bool load_glyphs( const std::string& codes );
-                ~texture_font();
-        private:
-                void generate_kerning();
-        private:
-                std::unordered_map< uint16, texture_glyph > m_glyphs;
-                texture_atlas* m_atlas;
-                std::string m_filename;
-                float m_size;
-            float m_height;
-            float m_linegap;
-            float m_ascender;
-            float m_descender;
-                bool m_hinting;
-                bool m_filtering;
-                uint8 m_lcd_weights[5];
-                void* m_rlibrary;
-                void* m_rface;
+                public:
+                        texture_font( texture_atlas* atlas, const char * filename, float size );
+                        const texture_glyph* get_glyph( uint16 charcode ) const;
+                        bool load_glyphs( const std::string& codes );
+                        ~texture_font();
+                private:
+                        void generate_kerning();
+                private:
+                        std::unordered_map< uint16, texture_glyph > m_glyphs;
+                        texture_atlas* m_atlas;
+                        std::string m_filename;
+                        float m_size;
+                        float m_height;
+                        float m_linegap;
+                        float m_ascender;
+                        float m_descender;
+                        bool m_hinting;
+                        bool m_filtering;
+                        uint8 m_lcd_weights[5];
+                        void* m_rlibrary;
+                        void* m_rface;
         };
 }
 
 #endif // NV_GL_TEXTURE_FONT_HH
+

trunk/src/gl/texture_atlas.cc

@@ -8 +8 @@
 
 #include "nv/logging.hh"
+#include <iostream>
 
 using namespace nv;
@@ -25 +26 @@
         int best_index  = -1;
         int best_width  = INT_MAX;
+        std::cout << "The size is: " << m_nodes.size() << std::endl;
         for( size_t i=0; i < m_nodes.size(); ++i )
         {

trunk/src/gl/texture_font.cc

@@ -26 +26 @@
         : m_atlas( atlas ), m_filename(filename), m_size( size ), 
         m_height(0), m_linegap(0), m_ascender(0), m_descender(0),
-        m_rlibrary( nullptr ), m_rface( nullptr ), m_hinting( true ), m_filtering( true )
+        m_hinting( true ), m_filtering( true ), m_rlibrary( nullptr ), m_rface( nullptr )
 {
         size_t hres = 64;