aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/graphics/fonts')
-rw-r--r--src/libjin/graphics/fonts/je_decoder.cpp6
-rw-r--r--src/libjin/graphics/fonts/je_decoder.h6
-rw-r--r--src/libjin/graphics/fonts/je_font.h6
-rw-r--r--src/libjin/graphics/fonts/je_page.h6
-rw-r--r--src/libjin/graphics/fonts/je_text.cpp6
-rw-r--r--src/libjin/graphics/fonts/je_text.h6
-rw-r--r--src/libjin/graphics/fonts/je_texture_font.cpp12
-rw-r--r--src/libjin/graphics/fonts/je_texture_font.h6
-rw-r--r--src/libjin/graphics/fonts/je_ttf.cpp48
-rw-r--r--src/libjin/graphics/fonts/je_ttf.h6
10 files changed, 54 insertions, 54 deletions
diff --git a/src/libjin/graphics/fonts/je_decoder.cpp b/src/libjin/graphics/fonts/je_decoder.cpp
index 02112a0..a7f4f32 100644
--- a/src/libjin/graphics/fonts/je_decoder.cpp
+++ b/src/libjin/graphics/fonts/je_decoder.cpp
@@ -4,8 +4,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -92,5 +92,5 @@ namespace JinEngine
}
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_decoder.h b/src/libjin/graphics/fonts/je_decoder.h
index 0c785af..43fa155 100644
--- a/src/libjin/graphics/fonts/je_decoder.h
+++ b/src/libjin/graphics/fonts/je_decoder.h
@@ -9,8 +9,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -93,7 +93,7 @@ namespace JinEngine
};
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_font.h b/src/libjin/graphics/fonts/je_font.h
index e8ce2c5..3af0b11 100644
--- a/src/libjin/graphics/fonts/je_font.h
+++ b/src/libjin/graphics/fonts/je_font.h
@@ -9,8 +9,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -106,7 +106,7 @@ namespace JinEngine
};
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif // __JE_FONT_H__
diff --git a/src/libjin/graphics/fonts/je_page.h b/src/libjin/graphics/fonts/je_page.h
index b3c831c..d831691 100644
--- a/src/libjin/graphics/fonts/je_page.h
+++ b/src/libjin/graphics/fonts/je_page.h
@@ -7,8 +7,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -48,7 +48,7 @@ namespace JinEngine
};
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif // __JE_PAGE_H__
diff --git a/src/libjin/graphics/fonts/je_text.cpp b/src/libjin/graphics/fonts/je_text.cpp
index 80aaa6a..f9909a6 100644
--- a/src/libjin/graphics/fonts/je_text.cpp
+++ b/src/libjin/graphics/fonts/je_text.cpp
@@ -5,8 +5,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -153,5 +153,5 @@ namespace JinEngine
}
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_text.h b/src/libjin/graphics/fonts/je_text.h
index 319ee4d..6837bfc 100644
--- a/src/libjin/graphics/fonts/je_text.h
+++ b/src/libjin/graphics/fonts/je_text.h
@@ -7,8 +7,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -168,7 +168,7 @@ namespace JinEngine
};
}
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp
index 9014509..4f2378b 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/je_texture_font.cpp
@@ -12,8 +12,8 @@ using namespace JinEngine::Graphics::Shaders;
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -124,9 +124,9 @@ namespace JinEngine
int i = 0;
#define glyphvertices_push(_x, _y, _u, _v) \
- vertex.x = _x; vertex.y = _y;\
- vertex.u = _u; vertex.v = _v;\
- glyphvertices.push_back(vertex);\
+ vertex.x = _x; vertex.y = _y;\
+ vertex.u = _u; vertex.v = _v;\
+ glyphvertices.push_back(vertex);\
for (Codepoint c : text)
{
@@ -304,5 +304,5 @@ namespace JinEngine
}
}
- }
+ }
} \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_texture_font.h b/src/libjin/graphics/fonts/je_texture_font.h
index 4875361..9192276 100644
--- a/src/libjin/graphics/fonts/je_texture_font.h
+++ b/src/libjin/graphics/fonts/je_texture_font.h
@@ -15,8 +15,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -125,7 +125,7 @@ namespace JinEngine
};
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp
index fec8cd4..40008d3 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/je_ttf.cpp
@@ -19,8 +19,8 @@ using namespace JinEngine::Graphics::Shaders;
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -234,29 +234,29 @@ namespace JinEngine
int i = 0;
#define glyphvertices_push(_x, _y, _u, _v) \
- vertex.x = _x; vertex.y = _y;\
- vertex.u = _u; vertex.v = _v;\
- glyphvertices.push_back(vertex);
+ vertex.x = _x; vertex.y = _y;\
+ vertex.u = _u; vertex.v = _v;\
+ glyphvertices.push_back(vertex);
#define glyphlize(c)\
- do{\
- glyph = &findGlyph(c); \
- if (texture != glyph->atlas) \
- { \
- GlyphArrayDrawInfo info; \
- info.start = i; \
- info.count = 0; \
- info.texture = glyph->atlas; \
- texture = glyph->atlas; \
- glyphinfolist.push_back(info); \
- } \
- glyphinfolist[glyphinfolist.size() - 1].count += 4; \
- TTFGlyph::Bbox& bbox = glyph->bbox; \
- glyphvertices_push(p.x, p.y, bbox.x, bbox.y); \
- glyphvertices_push(p.x, p.y + glyph->height, bbox.x, bbox.y + bbox.h); \
- glyphvertices_push(p.x + glyph->width, p.y + glyph->height, bbox.x + bbox.w, bbox.y + bbox.h); \
- glyphvertices_push(p.x + glyph->width, p.y, bbox.x + bbox.w, bbox.y); \
- }while(0)
+ do{\
+ glyph = &findGlyph(c); \
+ if (texture != glyph->atlas) \
+ { \
+ GlyphArrayDrawInfo info; \
+ info.start = i; \
+ info.count = 0; \
+ info.texture = glyph->atlas; \
+ texture = glyph->atlas; \
+ glyphinfolist.push_back(info); \
+ } \
+ glyphinfolist[glyphinfolist.size() - 1].count += 4; \
+ TTFGlyph::Bbox& bbox = glyph->bbox; \
+ glyphvertices_push(p.x, p.y, bbox.x, bbox.y); \
+ glyphvertices_push(p.x, p.y + glyph->height, bbox.x, bbox.y + bbox.h); \
+ glyphvertices_push(p.x + glyph->width, p.y + glyph->height, bbox.x + bbox.w, bbox.y + bbox.h); \
+ glyphvertices_push(p.x + glyph->width, p.y, bbox.x + bbox.w, bbox.y); \
+ }while(0)
for (Codepoint c : text)
{
@@ -448,7 +448,7 @@ namespace JinEngine
}
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif // defined(jin_graphics) \ No newline at end of file
diff --git a/src/libjin/graphics/fonts/je_ttf.h b/src/libjin/graphics/fonts/je_ttf.h
index 198594a..feabf33 100644
--- a/src/libjin/graphics/fonts/je_ttf.h
+++ b/src/libjin/graphics/fonts/je_ttf.h
@@ -19,8 +19,8 @@
namespace JinEngine
{
- namespace Graphics
- {
+ namespace Graphics
+ {
namespace Fonts
{
@@ -278,7 +278,7 @@ namespace JinEngine
};
} // namespace Fonts
- } // namespace Graphics
+ } // namespace Graphics
} // namespace JinEngine
#endif // defined(jin_graphics)
generated by cgit v1.1-26-g67d0 at 2025-05-31 12:33:02 +0000