Resource: move resource access functions to .inl files

src/lua/lua_environment.cpp

@@ -15,7 +15,7 @@
 #include "device/log.h"
 #include "lua/lua_environment.h"
 #include "lua/lua_stack.inl"
-#include "resource/lua_resource.h"
+#include "resource/lua_resource.inl"
 #include "resource/resource_manager.h"
 #include <stdarg.h>
 

src/resource/font_resource.cpp

@@ -4,6 +4,8 @@
  */
 
 #include "config.h"
+
+#if CROWN_CAN_COMPILE
 #include "core/containers/array.inl"
 #include "core/filesystem/file.h"
 #include "core/filesystem/filesystem.h"
@@ -19,25 +21,6 @@
 
 namespace crown
 {
-namespace font_resource
-{
-	const GlyphData *glyph(const FontResource *fr, CodePoint cp, const GlyphData *deffault)
-	{
-		const CodePoint *codes  = (CodePoint *)&fr[1];
-		const GlyphData *glyphs = (GlyphData *)(codes + fr->num_glyphs);
-
-		// FIXME: Can do binary search
-		for (u32 i = 0; i < fr->num_glyphs; ++i) {
-			if (codes[i] == cp)
-				return &glyphs[i];
-		}
-
-		return deffault;
-	}
-
-} // namespace font_resource
-
-#if CROWN_CAN_COMPILE
 namespace font_resource_internal
 {
 	struct GlyphInfo
@@ -120,6 +103,6 @@ namespace font_resource_internal
 	}
 
 } // namespace font_resource_internal
-#endif // if CROWN_CAN_COMPILE
 
 } // namespace crown
+#endif // if CROWN_CAN_COMPILE

src/resource/font_resource.inl

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012-2026 Daniele Bartolini et al.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "resource/font_resource.h"
+
+namespace crown
+{
+namespace font_resource
+{
+	const GlyphData *glyph(const FontResource *fr, CodePoint cp, const GlyphData *deffault)
+	{
+		const CodePoint *codes  = (CodePoint *)&fr[1];
+		const GlyphData *glyphs = (GlyphData *)(codes + fr->num_glyphs);
+
+		// FIXME: Can do binary search
+		for (u32 i = 0; i < fr->num_glyphs; ++i) {
+			if (codes[i] == cp)
+				return &glyphs[i];
+		}
+
+		return deffault;
+	}
+
+} // namespace font_resource
+
+} // namespace crown

src/resource/level_resource.cpp

@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "config.h"
+
+#if CROWN_CAN_COMPILE
 #include "core/containers/array.inl"
 #include "core/filesystem/file.h"
 #include "core/filesystem/filesystem.h"
@@ -18,33 +21,6 @@
 
 namespace crown
 {
-namespace level_resource
-{
-	const StringId32 *unit_names(const LevelResource *lr)
-	{
-		return (StringId32 *)((char *)lr + lr->unit_names_offset);
-	}
-
-	const UnitResource *unit_resource(const LevelResource *lr)
-	{
-		return (UnitResource *)((char *)lr + lr->units_offset);
-	}
-
-	u32 num_sounds(const LevelResource *lr)
-	{
-		return lr->num_sounds;
-	}
-
-	const LevelSound *get_sound(const LevelResource *lr, u32 i)
-	{
-		CE_ASSERT(i < num_sounds(lr), "Index out of bounds");
-		const LevelSound *begin = (LevelSound *)((char *)lr + lr->sounds_offset);
-		return &begin[i];
-	}
-
-} // namespace level_resource
-
-#if CROWN_CAN_COMPILE
 namespace level_resource_internal
 {
 	s32 compile(CompileOptions &opts)
@@ -155,6 +131,6 @@ namespace level_resource_internal
 	}
 
 } // namespace level_resource_internal
-#endif // if CROWN_CAN_COMPILE
 
 } // namespace crown
+#endif // if CROWN_CAN_COMPILE

src/resource/level_resource.inl

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012-2026 Daniele Bartolini et al.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "resource/level_resource.h"
+
+namespace crown
+{
+namespace level_resource
+{
+	const StringId32 *unit_names(const LevelResource *lr)
+	{
+		return (StringId32 *)((char *)lr + lr->unit_names_offset);
+	}
+
+	const UnitResource *unit_resource(const LevelResource *lr)
+	{
+		return (UnitResource *)((char *)lr + lr->units_offset);
+	}
+
+	u32 num_sounds(const LevelResource *lr)
+	{
+		return lr->num_sounds;
+	}
+
+	const LevelSound *get_sound(const LevelResource *lr, u32 i)
+	{
+		CE_ASSERT(i < num_sounds(lr), "Index out of bounds");
+		const LevelSound *begin = (LevelSound *)((char *)lr + lr->sounds_offset);
+		return &begin[i];
+	}
+
+} // namespace level_resource
+
+} // namespace crown

src/resource/lua_resource.cpp

@@ -4,6 +4,8 @@
  */
 
 #include "config.h"
+
+#if CROWN_CAN_COMPILE
 #include "core/containers/array.inl"
 #include "core/containers/hash_set.inl"
 #include "core/filesystem/file.h"
@@ -17,16 +19,6 @@
 
 namespace crown
 {
-namespace lua_resource
-{
-	const char *program(const LuaResource *lr)
-	{
-		return (char *)&lr[1];
-	}
-
-} // namespace lua_resource
-
-#if CROWN_CAN_COMPILE
 namespace lua_resource_internal
 {
 	static const char *skip_blanks(const char *lua)
@@ -180,6 +172,6 @@ namespace lua_resource_internal
 	}
 
 } // namespace lua_resource_internal
-#endif // if CROWN_CAN_COMPILE
 
 } // namespace crown
+#endif // if CROWN_CAN_COMPILE

src/resource/lua_resource.inl

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2012-2026 Daniele Bartolini et al.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "resource/lua_resource.h"
+
+namespace crown
+{
+namespace lua_resource
+{
+	const char *program(const LuaResource *lr)
+	{
+		return (char *)&lr[1];
+	}
+
+} // namespace lua_resource
+
+} // namespace crown

src/resource/material_resource.cpp

@@ -22,62 +22,6 @@
 
 namespace crown
 {
-namespace material_resource
-{
-	UniformData *uniform_data_array(const MaterialResource *mr)
-	{
-		return (UniformData *)((char *)mr + mr->uniform_data_offset);
-	}
-
-	u32 uniform_data_index(const MaterialResource *mr, const UniformData *ud, StringId32 name)
-	{
-		for (u32 i = 0, n = mr->num_uniforms; i < n; ++i) {
-			if (ud[i].name == name)
-				return i;
-		}
-
-		CE_FATAL("Unknown uniform name");
-		return UINT32_MAX;
-	}
-
-	const char *uniform_name(const MaterialResource *mr, const UniformData *ud, u32 i)
-	{
-		return (char *)mr + mr->names_data_offset + ud[i].name_offset;
-	}
-
-	TextureData *texture_data_array(const MaterialResource *mr)
-	{
-		return (TextureData *)((char *)mr + mr->texture_data_offset);
-	}
-
-	u32 texture_data_index(const MaterialResource *mr, const TextureData *td, StringId32 name)
-	{
-		for (u32 i = 0, n = mr->num_textures; i < n; ++i) {
-			if (td[i].name == name)
-				return i;
-		}
-
-		CE_FATAL("Unknown texture name");
-		return UINT32_MAX;
-	}
-
-	const char *texture_name(const MaterialResource *mr, const TextureData *td, u32 i)
-	{
-		return (char *)mr + mr->names_data_offset + td[i].sampler_name_offset;
-	}
-
-	UniformHandle *uniform_handle(const UniformData *ud, u32 i, char *dynamic)
-	{
-		return (UniformHandle *)(dynamic + ud[i].data_offset);
-	}
-
-	TextureHandle *texture_handle(const TextureData *td, u32 i, char *dynamic)
-	{
-		return (TextureHandle *)(dynamic + td[i].data_offset);
-	}
-
-} // namespace material_resource
-
 namespace material_resource_internal
 {
 	void online(StringId64 id, ResourceManager &rm)

src/resource/material_resource.inl

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012-2026 Daniele Bartolini et al.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "resource/material_resource.h"
+
+namespace crown
+{
+namespace material_resource
+{
+	UniformData *uniform_data_array(const MaterialResource *mr)
+	{
+		return (UniformData *)((char *)mr + mr->uniform_data_offset);
+	}
+
+	u32 uniform_data_index(const MaterialResource *mr, const UniformData *ud, StringId32 name)
+	{
+		for (u32 i = 0, n = mr->num_uniforms; i < n; ++i) {
+			if (ud[i].name == name)
+				return i;
+		}
+
+		CE_FATAL("Unknown uniform name");
+		return UINT32_MAX;
+	}
+
+	const char *uniform_name(const MaterialResource *mr, const UniformData *ud, u32 i)
+	{
+		return (char *)mr + mr->names_data_offset + ud[i].name_offset;
+	}
+
+	TextureData *texture_data_array(const MaterialResource *mr)
+	{
+		return (TextureData *)((char *)mr + mr->texture_data_offset);
+	}
+
+	u32 texture_data_index(const MaterialResource *mr, const TextureData *td, StringId32 name)
+	{
+		for (u32 i = 0, n = mr->num_textures; i < n; ++i) {
+			if (td[i].name == name)
+				return i;
+		}
+
+		CE_FATAL("Unknown texture name");
+		return UINT32_MAX;
+	}
+
+	const char *texture_name(const MaterialResource *mr, const TextureData *td, u32 i)
+	{
+		return (char *)mr + mr->names_data_offset + td[i].sampler_name_offset;
+	}
+
+	UniformHandle *uniform_handle(const UniformData *ud, u32 i, char *dynamic)
+	{
+		return (UniformHandle *)(dynamic + ud[i].data_offset);
+	}
+
+	TextureHandle *texture_handle(const TextureData *td, u32 i, char *dynamic)
+	{
+		return (TextureHandle *)(dynamic + td[i].data_offset);
+	}
+
+} // namespace material_resource
+
+} // namespace crown

src/resource/mesh_animation_resource.cpp

@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "config.h"
+
+#if CROWN_CAN_COMPILE
 #include "resource/mesh_animation_resource.h"
 #include "core/json/json_object.inl"
 #include "core/json/sjson.h"
@@ -15,7 +18,6 @@
 
 namespace crown
 {
-#if CROWN_CAN_COMPILE
 namespace mesh_animation_resource_internal
 {
 	static s32 write(MeshAnimation &ma, CompileOptions &opts)
@@ -61,20 +63,6 @@ namespace mesh_animation_resource_internal
 	}
 
 } // namespace mesh_animation_resource_internal
-#endif // if CROWN_CAN_COMPILE
-
-namespace mesh_animation_resource
-{
-	const AnimationKey *animation_keys(const MeshAnimationResource *mar)
-	{
-		return (AnimationKey *)((char *)mar + mar->keys_offset);
-	}
-
-	const u16 *bone_ids(const MeshAnimationResource *mar)
-	{
-		return (u16 *)((char *)mar + mar->bone_ids_offset);
-	}
-
-} // namespace mesh_animation_resource
 
 } // namespace crown
+#endif // if CROWN_CAN_COMPILE