diff options
Diffstat (limited to 'src/libjin/Graphics/Font')
| -rw-r--r-- | src/libjin/Graphics/Font/Decoder.cpp | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/Decoder.h | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/Font.h | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/TTF.cpp | 8 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/TTF.h | 24 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/Text.cpp | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/Text.h | 4 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/TextureFont.cpp | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/src/libjin/Graphics/Font/Decoder.cpp b/src/libjin/Graphics/Font/Decoder.cpp index 856627b..362fd2a 100644 --- a/src/libjin/Graphics/Font/Decoder.cpp +++ b/src/libjin/Graphics/Font/Decoder.cpp @@ -89,5 +89,5 @@ namespace jin return p + 1; } - } // graphics -} // jin
\ No newline at end of file + } // namespace graphics +} // namespace jin
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/Decoder.h b/src/libjin/Graphics/Font/Decoder.h index e5940a2..533f60b 100644 --- a/src/libjin/Graphics/Font/Decoder.h +++ b/src/libjin/Graphics/Font/Decoder.h @@ -38,7 +38,7 @@ namespace jin const void* next(const void* data) const override; }; - } // graphics -} // jin + } // namespace graphics +} // namespace jin #endif
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/Font.h b/src/libjin/Graphics/Font/Font.h index 9ccef54..14211e1 100644 --- a/src/libjin/Graphics/Font/Font.h +++ b/src/libjin/Graphics/Font/Font.h @@ -33,7 +33,7 @@ namespace jin }; - } // graphics -} // jin + } // namespace graphics +} // namespace jin #endif
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/TTF.cpp b/src/libjin/Graphics/Font/TTF.cpp index 7e62485..4c3648a 100644 --- a/src/libjin/Graphics/Font/TTF.cpp +++ b/src/libjin/Graphics/Font/TTF.cpp @@ -6,7 +6,7 @@ #include "../../Common/Array.hpp" #include "../OpenGL.h" #include "../Color.h" -#include "../Shader.h" +#include "../Shader/Shader.h" #include "TTF.h" #include "Page.h" @@ -142,7 +142,7 @@ namespace jin // TTF ///////////////////////////////////////////////////////////////////////////// - #include "../Shaders/font.shader.h" + #include "../Shader/font.shader.h" using namespace std; using namespace jin::math; @@ -448,7 +448,7 @@ namespace jin return bakeGlyph(character); } - } // graphics -} // jin + } // namespace graphics +} // namespace jin #endif // LIBJIN_MODULES_RENDER
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/TTF.h b/src/libjin/Graphics/Font/TTF.h index fc2eca3..8e9ed73 100644 --- a/src/libjin/Graphics/Font/TTF.h +++ b/src/libjin/Graphics/Font/TTF.h @@ -22,14 +22,14 @@ namespace jin class TTF; - /** - * TTFData - * |- TTF(14px) - * |- TTF(15px) - * . - * . - * . - */ + // + // TTFData + // |- TTF(14px) + // |- TTF(15px) + // . + // . + // . + // class TTFData { public: @@ -83,13 +83,13 @@ namespace jin struct TTFGlyph { GLuint atlas; - /* normalized coordinates */ + // normalized coordinates struct Bbox { float x, y; float w, h; } bbox; - /* glyph size in pixel */ + // glyph size in pixel unsigned int width, height; }; @@ -125,8 +125,8 @@ namespace jin }; - } // graphics -} // jin + } // namespace graphics +} // namespace jin #endif // LIBJIN_MODULES_RENDER #endif // __LIBJIN_FONT_H
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/Text.cpp b/src/libjin/Graphics/Font/Text.cpp index ac0242e..f2231f8 100644 --- a/src/libjin/Graphics/Font/Text.cpp +++ b/src/libjin/Graphics/Font/Text.cpp @@ -152,5 +152,5 @@ namespace jin return content; } - } // graphics -} // jin
\ No newline at end of file + } // namespace graphics +} // namespace jin
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/Text.h b/src/libjin/Graphics/Font/Text.h index a4cbcbf..7256a52 100644 --- a/src/libjin/Graphics/Font/Text.h +++ b/src/libjin/Graphics/Font/Text.h @@ -68,7 +68,7 @@ namespace jin }; - } // graphics -} // jin + } // namespace graphics +} // namespace jin #endif
\ No newline at end of file diff --git a/src/libjin/Graphics/Font/TextureFont.cpp b/src/libjin/Graphics/Font/TextureFont.cpp index 8c9c4ac..4f6f5d6 100644 --- a/src/libjin/Graphics/Font/TextureFont.cpp +++ b/src/libjin/Graphics/Font/TextureFont.cpp @@ -1,7 +1,7 @@ #include <vector> #include "../../Math/Vector2.hpp" -#include "../Shader.h" +#include "../Shader/Shader.h" #include "TextureFont.h" namespace jin |