Charlie Jiang pushed to branch gsoc-2022-chariri-3 at FreeType / FreeType Demo Programs
Commits:
-
df4c06c6
by Charlie Jiang at 2022-08-23T23:29:07+08:00
25 changed files:
- src/ftinspect/CMakeLists.txt
- src/ftinspect/engine/engine.cpp
- src/ftinspect/rendering/renderutils.cpp → src/ftinspect/engine/renderutils.cpp
- src/ftinspect/rendering/renderutils.hpp → src/ftinspect/engine/renderutils.hpp
- src/ftinspect/rendering/glyphbitmap.cpp → src/ftinspect/glyphcomponents/glyphbitmap.cpp
- src/ftinspect/rendering/glyphbitmap.hpp → src/ftinspect/glyphcomponents/glyphbitmap.hpp
- src/ftinspect/rendering/glyphcontinuous.cpp → src/ftinspect/glyphcomponents/glyphcontinuous.cpp
- src/ftinspect/rendering/glyphcontinuous.hpp → src/ftinspect/glyphcomponents/glyphcontinuous.hpp
- src/ftinspect/rendering/glyphoutline.cpp → src/ftinspect/glyphcomponents/glyphoutline.cpp
- src/ftinspect/rendering/glyphoutline.hpp → src/ftinspect/glyphcomponents/glyphoutline.hpp
- src/ftinspect/rendering/glyphpointnumbers.cpp → src/ftinspect/glyphcomponents/glyphpointnumbers.cpp
- src/ftinspect/rendering/glyphpointnumbers.hpp → src/ftinspect/glyphcomponents/glyphpointnumbers.hpp
- src/ftinspect/rendering/glyphpoints.cpp → src/ftinspect/glyphcomponents/glyphpoints.cpp
- src/ftinspect/rendering/glyphpoints.hpp → src/ftinspect/glyphcomponents/glyphpoints.hpp
- src/ftinspect/rendering/graphicsdefault.cpp → src/ftinspect/glyphcomponents/graphicsdefault.cpp
- src/ftinspect/rendering/graphicsdefault.hpp → src/ftinspect/glyphcomponents/graphicsdefault.hpp
- src/ftinspect/rendering/grid.cpp → src/ftinspect/glyphcomponents/grid.cpp
- src/ftinspect/rendering/grid.hpp → src/ftinspect/glyphcomponents/grid.hpp
- src/ftinspect/maingui.cpp
- src/ftinspect/meson.build
- src/ftinspect/panels/comparator.hpp
- src/ftinspect/panels/continuous.hpp
- src/ftinspect/panels/glyphdetails.cpp
- src/ftinspect/panels/glyphdetails.hpp
- src/ftinspect/panels/singular.hpp
Changes:
... | ... | @@ -28,15 +28,15 @@ add_executable(ftinspect |
28 | 28 | "engine/fontinfo.cpp"
|
29 | 29 | "engine/fontinfonamesmapping.cpp"
|
30 | 30 | "engine/mmgx.cpp"
|
31 | + "engine/renderutils.cpp"
|
|
31 | 32 | |
32 | - "rendering/glyphbitmap.cpp"
|
|
33 | - "rendering/glyphoutline.cpp"
|
|
34 | - "rendering/glyphpointnumbers.cpp"
|
|
35 | - "rendering/glyphpoints.cpp"
|
|
36 | - "rendering/glyphcontinuous.cpp"
|
|
37 | - "rendering/grid.cpp"
|
|
38 | - "rendering/graphicsdefault.cpp"
|
|
39 | - "rendering/renderutils.cpp"
|
|
33 | + "glyphcomponents/glyphbitmap.cpp"
|
|
34 | + "glyphcomponents/glyphoutline.cpp"
|
|
35 | + "glyphcomponents/glyphpointnumbers.cpp"
|
|
36 | + "glyphcomponents/glyphpoints.cpp"
|
|
37 | + "glyphcomponents/glyphcontinuous.cpp"
|
|
38 | + "glyphcomponents/grid.cpp"
|
|
39 | + "glyphcomponents/graphicsdefault.cpp"
|
|
40 | 40 | |
41 | 41 | "widgets/customwidgets.cpp"
|
42 | 42 | "widgets/glyphindexselector.cpp"
|
... | ... | @@ -5,8 +5,8 @@ |
5 | 5 | |
6 | 6 | #include "engine.hpp"
|
7 | 7 | |
8 | -#include "../rendering/renderutils.hpp"
|
|
9 | -#include "../rendering/graphicsdefault.hpp"
|
|
8 | +#include "renderutils.hpp"
|
|
9 | +#include "../glyphcomponents/graphicsdefault.hpp"
|
|
10 | 10 | |
11 | 11 | #include <stdexcept>
|
12 | 12 | #include <cmath>
|
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | |
6 | 6 | #include "glyphbitmap.hpp"
|
7 | 7 | |
8 | -#include "renderutils.hpp"
|
|
8 | +#include "../engine/renderutils.hpp"
|
|
9 | 9 | #include "../engine/engine.hpp"
|
10 | 10 | |
11 | 11 | #include <cmath>
|
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 | |
5 | 5 | |
6 | 6 | #include "maingui.hpp"
|
7 | -#include "rendering/grid.hpp"
|
|
7 | +#include "glyphcomponents/grid.hpp"
|
|
8 | 8 | |
9 | 9 | #include <QApplication>
|
10 | 10 | #include <QFileDialog>
|
... | ... | @@ -29,15 +29,16 @@ if qt5_dep.found() |
29 | 29 | 'engine/fontinfo.cpp',
|
30 | 30 | 'engine/fontinfonamesmapping.cpp',
|
31 | 31 | 'engine/mmgx.cpp',
|
32 | + 'engine/renderutils.cpp',
|
|
33 | + |
|
34 | + 'glyphcomponents/glyphbitmap.cpp',
|
|
35 | + 'glyphcomponents/glyphoutline.cpp',
|
|
36 | + 'glyphcomponents/glyphpointnumbers.cpp',
|
|
37 | + 'glyphcomponents/glyphpoints.cpp',
|
|
38 | + 'glyphcomponents/glyphcontinuous.cpp',
|
|
39 | + 'glyphcomponents/grid.cpp',
|
|
40 | + 'glyphcomponents/graphicsdefault.cpp',
|
|
32 | 41 | |
33 | - 'rendering/glyphbitmap.cpp',
|
|
34 | - 'rendering/glyphoutline.cpp',
|
|
35 | - 'rendering/glyphpointnumbers.cpp',
|
|
36 | - 'rendering/glyphpoints.cpp',
|
|
37 | - 'rendering/glyphcontinuous.cpp',
|
|
38 | - 'rendering/grid.cpp',
|
|
39 | - 'rendering/graphicsdefault.cpp',
|
|
40 | - 'rendering/renderutils.cpp',
|
|
41 | 42 | 'widgets/customwidgets.cpp',
|
42 | 43 | 'widgets/glyphindexselector.cpp',
|
43 | 44 | 'widgets/fontsizeselector.cpp',
|
... | ... | @@ -68,8 +69,8 @@ if qt5_dep.found() |
68 | 69 | 'widgets/fontsizeselector.hpp',
|
69 | 70 | 'widgets/tripletselector.hpp',
|
70 | 71 | 'widgets/charmapcombobox.hpp',
|
71 | - 'rendering/glyphbitmap.hpp',
|
|
72 | - 'rendering/glyphcontinuous.hpp',
|
|
72 | + 'glyphcomponents/glyphbitmap.hpp',
|
|
73 | + 'glyphcomponents/glyphcontinuous.hpp',
|
|
73 | 74 | 'models/customcomboboxmodels.hpp',
|
74 | 75 | 'models/fontinfomodels.hpp',
|
75 | 76 | 'panels/settingpanel.hpp',
|
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 | #include "../widgets/charmapcombobox.hpp"
|
11 | 11 | #include "../widgets/fontsizeselector.hpp"
|
12 | 12 | #include "../panels/settingpanel.hpp"
|
13 | -#include "../rendering/glyphcontinuous.hpp"
|
|
13 | +#include "../glyphcomponents/glyphcontinuous.hpp"
|
|
14 | 14 | |
15 | 15 | #include <vector>
|
16 | 16 |
... | ... | @@ -9,8 +9,8 @@ |
9 | 9 | #include "../widgets/glyphindexselector.hpp"
|
10 | 10 | #include "../widgets/fontsizeselector.hpp"
|
11 | 11 | #include "../widgets/charmapcombobox.hpp"
|
12 | -#include "../rendering/graphicsdefault.hpp"
|
|
13 | -#include "../rendering/glyphcontinuous.hpp"
|
|
12 | +#include "../glyphcomponents/graphicsdefault.hpp"
|
|
13 | +#include "../glyphcomponents/glyphcontinuous.hpp"
|
|
14 | 14 | #include "../engine/engine.hpp"
|
15 | 15 | |
16 | 16 | #include <vector>
|
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | #include "glyphdetails.hpp"
|
6 | 6 | |
7 | 7 | #include "../engine/stringrenderer.hpp"
|
8 | -#include "../rendering/glyphcontinuous.hpp"
|
|
8 | +#include "../glyphcomponents/glyphcontinuous.hpp"
|
|
9 | 9 | #include "../uihelper.hpp"
|
10 | 10 | #include "../engine/engine.hpp"
|
11 | 11 |
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 | |
5 | 5 | #pragma once
|
6 | 6 | |
7 | -#include "../rendering/glyphbitmap.hpp"
|
|
7 | +#include "../glyphcomponents/glyphbitmap.hpp"
|
|
8 | 8 | |
9 | 9 | #include <QWidget>
|
10 | 10 | #include <QLabel>
|
... | ... | @@ -8,12 +8,12 @@ |
8 | 8 | #include "../widgets/customwidgets.hpp"
|
9 | 9 | #include "../widgets/glyphindexselector.hpp"
|
10 | 10 | #include "../widgets/fontsizeselector.hpp"
|
11 | -#include "../rendering/glyphbitmap.hpp"
|
|
12 | -#include "../rendering/glyphoutline.hpp"
|
|
13 | -#include "../rendering/glyphpointnumbers.hpp"
|
|
14 | -#include "../rendering/glyphpoints.hpp"
|
|
15 | -#include "../rendering/grid.hpp"
|
|
16 | -#include "../rendering/graphicsdefault.hpp"
|
|
11 | +#include "../glyphcomponents/glyphbitmap.hpp"
|
|
12 | +#include "../glyphcomponents/glyphoutline.hpp"
|
|
13 | +#include "../glyphcomponents/glyphpointnumbers.hpp"
|
|
14 | +#include "../glyphcomponents/glyphpoints.hpp"
|
|
15 | +#include "../glyphcomponents/grid.hpp"
|
|
16 | +#include "../glyphcomponents/graphicsdefault.hpp"
|
|
17 | 17 | #include "../engine/engine.hpp"
|
18 | 18 | #include "../models/customcomboboxmodels.hpp"
|
19 | 19 |