aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Font
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/Graphics/Font')
-rw-r--r--src/libjin/Graphics/Font/je_decoder.cpp8
-rw-r--r--src/libjin/Graphics/Font/je_decoder.h8
-rw-r--r--src/libjin/Graphics/Font/je_font.h8
-rw-r--r--src/libjin/Graphics/Font/je_page.h10
-rw-r--r--src/libjin/Graphics/Font/je_text.cpp8
-rw-r--r--src/libjin/Graphics/Font/je_text.h8
-rw-r--r--src/libjin/Graphics/Font/je_texture_font.cpp6
-rw-r--r--src/libjin/Graphics/Font/je_texture_font.h8
-rw-r--r--src/libjin/Graphics/Font/je_ttf.cpp10
-rw-r--r--src/libjin/Graphics/Font/je_ttf.h10
10 files changed, 42 insertions, 42 deletions
diff --git a/src/libjin/Graphics/Font/je_decoder.cpp b/src/libjin/Graphics/Font/je_decoder.cpp
index 20695e7..01e1990 100644
--- a/src/libjin/Graphics/Font/je_decoder.cpp
+++ b/src/libjin/Graphics/Font/je_decoder.cpp
@@ -2,9 +2,9 @@
#include <string.h>
#include "je_decoder.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
/* utf8 byte string to unicode codepoint */
@@ -89,5 +89,5 @@ namespace jin
return p + 1;
}
- } // namespace graphics
-} // namespace jin \ No newline at end of file
+ } // namespace Graphics
+} // namespace JinEngine \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_decoder.h b/src/libjin/Graphics/Font/je_decoder.h
index 6a69c21..162f22e 100644
--- a/src/libjin/Graphics/Font/je_decoder.h
+++ b/src/libjin/Graphics/Font/je_decoder.h
@@ -5,9 +5,9 @@
#include "je_text.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
///
@@ -82,7 +82,7 @@ namespace jin
const void* next(const void* data) const override;
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_font.h b/src/libjin/Graphics/Font/je_font.h
index 0601713..ec60c21 100644
--- a/src/libjin/Graphics/Font/je_font.h
+++ b/src/libjin/Graphics/Font/je_font.h
@@ -4,9 +4,9 @@
#include <vector>
#include "je_text.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
struct Page;
@@ -93,7 +93,7 @@ namespace jin
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_page.h b/src/libjin/Graphics/Font/je_page.h
index 569780e..7df2784 100644
--- a/src/libjin/Graphics/Font/je_page.h
+++ b/src/libjin/Graphics/Font/je_page.h
@@ -5,9 +5,9 @@
#include "je_font.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
class Font;
@@ -42,10 +42,10 @@ namespace jin
Font* font;
std::vector<GlyphArrayDrawInfo> glyphinfolist;
std::vector<GlyphVertex> glyphvertices;
- math::Vector2<int> size;
+ Math::Vector2<int> size;
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_text.cpp b/src/libjin/Graphics/Font/je_text.cpp
index aa5cbda..beba94f 100644
--- a/src/libjin/Graphics/Font/je_text.cpp
+++ b/src/libjin/Graphics/Font/je_text.cpp
@@ -3,9 +3,9 @@
#include "je_text.h"
#include "je_decoder.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
/////////////////////////////////////////////////////////////////////////////
@@ -152,5 +152,5 @@ namespace jin
return content;
}
- } // namespace graphics
-} // namespace jin \ No newline at end of file
+ } // namespace Graphics
+} // namespace JinEngine \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_text.h b/src/libjin/Graphics/Font/je_text.h
index 9d2dd95..af40993 100644
--- a/src/libjin/Graphics/Font/je_text.h
+++ b/src/libjin/Graphics/Font/je_text.h
@@ -3,9 +3,9 @@
#include <vector>
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
typedef unsigned int Codepoint;
@@ -73,7 +73,7 @@ namespace jin
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_texture_font.cpp b/src/libjin/Graphics/Font/je_texture_font.cpp
index 3df77e5..81ac343 100644
--- a/src/libjin/Graphics/Font/je_texture_font.cpp
+++ b/src/libjin/Graphics/Font/je_texture_font.cpp
@@ -6,13 +6,13 @@
#include "je_texture_font.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
using namespace std;
- using namespace math;
+ using namespace Math;
TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh)
{
diff --git a/src/libjin/Graphics/Font/je_texture_font.h b/src/libjin/Graphics/Font/je_texture_font.h
index bfa4815..9805cda 100644
--- a/src/libjin/Graphics/Font/je_texture_font.h
+++ b/src/libjin/Graphics/Font/je_texture_font.h
@@ -13,9 +13,9 @@
#include "je_font.h"
#include "je_text.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
///
@@ -59,7 +59,7 @@ namespace jin
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_ttf.cpp b/src/libjin/Graphics/Font/je_ttf.cpp
index d44b2c7..0ee02ab 100644
--- a/src/libjin/Graphics/Font/je_ttf.cpp
+++ b/src/libjin/Graphics/Font/je_ttf.cpp
@@ -15,9 +15,9 @@
#define STB_TRUETYPE_IMPLEMENTATION
#include "../../3rdparty/stb/stb_truetype.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
/////////////////////////////////////////////////////////////////////////////
@@ -147,7 +147,7 @@ namespace jin
#include "../shader/je_font.shader.h"
using namespace std;
- using namespace jin::math;
+ using namespace JinEngine::Math;
const int TTF::TEXTURE_WIDTHS[] = { 128, 256, 256, 512, 512, 1024, 1024 };
const int TTF::TEXTURE_HEIGHTS[] = { 128, 128, 256, 256, 512, 512, 1024 };
@@ -450,7 +450,7 @@ namespace jin
return bakeGlyph(character);
}
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif // LIBJIN_MODULES_RENDER \ No newline at end of file
diff --git a/src/libjin/Graphics/Font/je_ttf.h b/src/libjin/Graphics/Font/je_ttf.h
index 5c44d26..e4314fe 100644
--- a/src/libjin/Graphics/Font/je_ttf.h
+++ b/src/libjin/Graphics/Font/je_ttf.h
@@ -16,9 +16,9 @@
#include "je_font.h"
#include "je_text.h"
-namespace jin
+namespace JinEngine
{
- namespace graphics
+ namespace Graphics
{
class TTF;
@@ -122,12 +122,12 @@ namespace jin
int descent;
/* cursor helped render to texture */
- math::Vector2<float> cursor;
+ Math::Vector2<float> cursor;
};
- } // namespace graphics
-} // namespace jin
+ } // namespace Graphics
+} // namespace JinEngine
#endif // LIBJIN_MODULES_RENDER