src: cleanup

src/resource/types.h

@@ -39,21 +39,21 @@ struct UnitResource;
 
 /// @addtogroup Resource
 /// @{
-#define RESOURCE_TYPE_STATE_MACHINE    STRING_ID_64("state_machine", 0xa486d4045106165c)
-#define RESOURCE_TYPE_CONFIG           STRING_ID_64("config", 0x82645835e6b73232)
-#define RESOURCE_TYPE_FONT             STRING_ID_64("font", 0x9efe0a916aae7880)
-#define RESOURCE_TYPE_UNIT             STRING_ID_64("unit", 0xe0a48d0be9a7453f)
-#define RESOURCE_TYPE_LEVEL            STRING_ID_64("level", 0x2a690fd348fe9ac5)
-#define RESOURCE_TYPE_MATERIAL         STRING_ID_64("material", 0xeac0b497876adedf)
-#define RESOURCE_TYPE_MESH             STRING_ID_64("mesh", 0x48ff313713a997a1)
-#define RESOURCE_TYPE_PACKAGE          STRING_ID_64("package", 0xad9c6d9ed1e5e77a)
-#define RESOURCE_TYPE_PHYSICS_CONFIG   STRING_ID_64("physics_config", 0x72e3cc03787a11a1)
-#define RESOURCE_TYPE_SCRIPT           STRING_ID_64("lua", 0xa14e8dfa2cd117e2)
-#define RESOURCE_TYPE_SHADER           STRING_ID_64("shader", 0xcce8d5b5f5ae333f)
-#define RESOURCE_TYPE_SOUND            STRING_ID_64("sound", 0x90641b51c98b7aac)
-#define RESOURCE_TYPE_SPRITE_ANIMATION STRING_ID_64("sprite_animation", 0x487e78e3f87f238d)
-#define RESOURCE_TYPE_SPRITE           STRING_ID_64("sprite", 0x8d5871f9ebdb651c)
-#define RESOURCE_TYPE_TEXTURE          STRING_ID_64("texture", 0xcd4238c6a0c69e32)
+#define RESOURCE_TYPE_STATE_MACHINE    STRING_ID_64("state_machine",    UINT64_C(0xa486d4045106165c))
+#define RESOURCE_TYPE_CONFIG           STRING_ID_64("config",           UINT64_C(0x82645835e6b73232))
+#define RESOURCE_TYPE_FONT             STRING_ID_64("font",             UINT64_C(0x9efe0a916aae7880))
+#define RESOURCE_TYPE_UNIT             STRING_ID_64("unit",             UINT64_C(0xe0a48d0be9a7453f))
+#define RESOURCE_TYPE_LEVEL            STRING_ID_64("level",            UINT64_C(0x2a690fd348fe9ac5))
+#define RESOURCE_TYPE_MATERIAL         STRING_ID_64("material",         UINT64_C(0xeac0b497876adedf))
+#define RESOURCE_TYPE_MESH             STRING_ID_64("mesh",             UINT64_C(0x48ff313713a997a1))
+#define RESOURCE_TYPE_PACKAGE          STRING_ID_64("package",          UINT64_C(0xad9c6d9ed1e5e77a))
+#define RESOURCE_TYPE_PHYSICS_CONFIG   STRING_ID_64("physics_config",   UINT64_C(0x72e3cc03787a11a1))
+#define RESOURCE_TYPE_SCRIPT           STRING_ID_64("lua",              UINT64_C(0xa14e8dfa2cd117e2))
+#define RESOURCE_TYPE_SHADER           STRING_ID_64("shader",           UINT64_C(0xcce8d5b5f5ae333f))
+#define RESOURCE_TYPE_SOUND            STRING_ID_64("sound",            UINT64_C(0x90641b51c98b7aac))
+#define RESOURCE_TYPE_SPRITE_ANIMATION STRING_ID_64("sprite_animation", UINT64_C(0x487e78e3f87f238d))
+#define RESOURCE_TYPE_SPRITE           STRING_ID_64("sprite",           UINT64_C(0x8d5871f9ebdb651c))
+#define RESOURCE_TYPE_TEXTURE          STRING_ID_64("texture",          UINT64_C(0xcd4238c6a0c69e32))
 
 #define RESOURCE_FULL_REBUILD_COUNT       u32(0) //!< How many times we required a full asset rebuild?
 #define RESOURCE_VERSION(ver)             (RESOURCE_FULL_REBUILD_COUNT + ver)

src/world/types.h

@@ -31,27 +31,27 @@ struct World;
 
 typedef u32 SoundInstanceId;
 
-#define DEBUG_LINE_MARKER              u32(0xd7c17715)
-#define DEBUG_GUI_MARKER               u32(0xf081a80a)
-#define LEVEL_MARKER                   u32(0x1f2b43fe)
-#define RENDER_WORLD_MARKER            u32(0xc82277de)
-#define RESOURCE_PACKAGE_MARKER        u32(0x9a1ac68c)
-#define SCENE_GRAPH_MARKER             u32(0x63a44dbf)
-#define WORLD_MARKER                   u32(0xfb6ce2d3)
-#define SCRIPT_WORLD_MARKER            u32(0x78486cdc)
-#define SOUND_WORLD_MARKER             u32(0x44052b07)
-#define PHYSICS_WORLD_MARKER           u32(0x1cf49bae)
-#define ANIMATION_STATE_MACHINE_MARKER u32(0x59a1c462)
-
-#define COMPONENT_TYPE_ACTOR                   STRING_ID_32("actor", 0x13958a55)
-#define COMPONENT_TYPE_CAMERA                  STRING_ID_32("camera", 0x5005ac7a)
-#define COMPONENT_TYPE_COLLIDER                STRING_ID_32("collider", 0x3b9259cb)
-#define COMPONENT_TYPE_LIGHT                   STRING_ID_32("light", 0x4cf76c7b)
-#define COMPONENT_TYPE_MESH_RENDERER           STRING_ID_32("mesh_renderer", 0x2554ca17)
-#define COMPONENT_TYPE_SPRITE_RENDERER         STRING_ID_32("sprite_renderer", 0x7b4af6de)
-#define COMPONENT_TYPE_TRANSFORM               STRING_ID_32("transform", 0xb4363995)
-#define COMPONENT_TYPE_SCRIPT                  STRING_ID_32("script", 0x2cf63026)
-#define COMPONENT_TYPE_ANIMATION_STATE_MACHINE STRING_ID_32("animation_state_machine", 0xe3970e6b)
+#define DEBUG_LINE_MARKER              UINT32_C(0xd7c17715)
+#define DEBUG_GUI_MARKER               UINT32_C(0xf081a80a)
+#define LEVEL_MARKER                   UINT32_C(0x1f2b43fe)
+#define RENDER_WORLD_MARKER            UINT32_C(0xc82277de)
+#define RESOURCE_PACKAGE_MARKER        UINT32_C(0x9a1ac68c)
+#define SCENE_GRAPH_MARKER             UINT32_C(0x63a44dbf)
+#define WORLD_MARKER                   UINT32_C(0xfb6ce2d3)
+#define SCRIPT_WORLD_MARKER            UINT32_C(0x78486cdc)
+#define SOUND_WORLD_MARKER             UINT32_C(0x44052b07)
+#define PHYSICS_WORLD_MARKER           UINT32_C(0x1cf49bae)
+#define ANIMATION_STATE_MACHINE_MARKER UINT32_C(0x59a1c462)
+
+#define COMPONENT_TYPE_ACTOR                   STRING_ID_32("actor",                   UINT32_C(0x13958a55))
+#define COMPONENT_TYPE_CAMERA                  STRING_ID_32("camera",                  UINT32_C(0x5005ac7a))
+#define COMPONENT_TYPE_COLLIDER                STRING_ID_32("collider",                UINT32_C(0x3b9259cb))
+#define COMPONENT_TYPE_LIGHT                   STRING_ID_32("light",                   UINT32_C(0x4cf76c7b))
+#define COMPONENT_TYPE_MESH_RENDERER           STRING_ID_32("mesh_renderer",           UINT32_C(0x2554ca17))
+#define COMPONENT_TYPE_SPRITE_RENDERER         STRING_ID_32("sprite_renderer",         UINT32_C(0x7b4af6de))
+#define COMPONENT_TYPE_TRANSFORM               STRING_ID_32("transform",               UINT32_C(0xb4363995))
+#define COMPONENT_TYPE_SCRIPT                  STRING_ID_32("script",                  UINT32_C(0x2cf63026))
+#define COMPONENT_TYPE_ANIMATION_STATE_MACHINE STRING_ID_32("animation_state_machine", UINT32_C(0xe3970e6b))
 
 /// Enumerates camera projection types.
 ///