2
0
Daniele Bartolini 10 жил өмнө
parent
commit
48d609f4d3

+ 5 - 4
src/resource/font_resource.cpp

@@ -3,13 +3,14 @@
  * License: https://github.com/taylor001/crown/blob/master/LICENSE
  * License: https://github.com/taylor001/crown/blob/master/LICENSE
  */
  */
 
 
-#include "font_resource.h"
 #include "allocator.h"
 #include "allocator.h"
-#include "filesystem.h"
-#include "string_utils.h"
 #include "compile_options.h"
 #include "compile_options.h"
-#include "sjson.h"
+#include "filesystem.h"
+#include "font_resource.h"
 #include "map.h"
 #include "map.h"
+#include "resource_types.h"
+#include "sjson.h"
+#include "string_utils.h"
 #include <algorithm>
 #include <algorithm>
 
 
 namespace crown
 namespace crown

+ 2 - 4
src/resource/font_resource.h

@@ -7,10 +7,8 @@
 
 
 #include "types.h"
 #include "types.h"
 #include "memory_types.h"
 #include "memory_types.h"
-#include "resource_types.h"
 #include "filesystem_types.h"
 #include "filesystem_types.h"
 #include "compiler_types.h"
 #include "compiler_types.h"
-#include "string_id.h"
 
 
 namespace crown
 namespace crown
 {
 {
@@ -22,8 +20,6 @@ struct FontResource
 	u32 font_size;
 	u32 font_size;
 };
 };
 
 
-typedef u32 CodePoint;
-
 struct GlyphData
 struct GlyphData
 {
 {
 	f32 x;
 	f32 x;
@@ -35,6 +31,8 @@ struct GlyphData
 	f32 x_advance;
 	f32 x_advance;
 };
 };
 
 
+typedef u32 CodePoint;
+
 namespace font_resource
 namespace font_resource
 {
 {
 	void compile(const char* path, CompileOptions& opts);
 	void compile(const char* path, CompileOptions& opts);