Cleanup

src/core/guid.h

@@ -49,6 +49,6 @@ inline bool operator==(const Guid& a, const Guid& b)
 		;
 }
 
-const Guid GUID_ZERO = { 0u, 0u, 0u, 0u };
+static const Guid GUID_ZERO = { 0u, 0u, 0u, 0u };
 
 } // namespace crown

src/core/math/math_types.h

@@ -84,48 +84,48 @@ struct Sphere
 	f32 r;
 };
 
-const Vector2 VECTOR2_ZERO  = { 0.0f, 0.0f };
-const Vector2 VECTOR2_ONE   = { 1.0f, 1.0f };
-const Vector2 VECTOR2_XAXIS = { 1.0f, 0.0f };
-const Vector2 VECTOR2_YAXIS = { 0.0f, 1.0f };
-
-const Vector3 VECTOR3_ZERO     = {  0.0f,  0.0f,  0.0f };
-const Vector3 VECTOR3_ONE      = {  1.0f,  1.0f,  1.0f };
-const Vector3 VECTOR3_XAXIS    = {  1.0f,  0.0f,  0.0f };
-const Vector3 VECTOR3_YAXIS    = {  0.0f,  1.0f,  0.0f };
-const Vector3 VECTOR3_ZAXIS    = {  0.0f,  0.0f,  1.0f };
-const Vector3 VECTOR3_RIGHT    = {  1.0f,  0.0f,  0.0f };
-const Vector3 VECTOR3_LEFT     = { -1.0f,  0.0f,  0.0f };
-const Vector3 VECTOR3_UP       = {  0.0f,  1.0f,  0.0f };
-const Vector3 VECTOR3_DOWN     = {  0.0f, -1.0f,  0.0f };
-const Vector3 VECTOR3_FORWARD  = {  0.0f,  0.0f,  1.0f };
-const Vector3 VECTOR3_BACKWARD = {  0.0f,  0.0f, -1.0f };
-
-const Vector4 VECTOR4_ZERO  = { 0.0f, 0.0f, 0.0f, 0.0f };
-const Vector4 VECTOR4_ONE   = { 1.0f, 1.0f, 1.0f, 1.0f };
-const Vector4 VECTOR4_XAXIS = { 1.0f, 0.0f, 0.0f, 0.0f };
-const Vector4 VECTOR4_YAXIS = { 0.0f, 1.0f, 0.0f, 0.0f };
-const Vector4 VECTOR4_ZAXIS = { 0.0f, 0.0f, 1.0f, 0.0f };
-const Vector4 VECTOR4_WAXIS = { 0.0f, 0.0f, 0.0f, 1.0f };
-
-const Color4 COLOR4_BLACK  = { 0.0f, 0.0f, 0.0f, 1.0f };
-const Color4 COLOR4_WHITE  = { 1.0f, 1.0f, 1.0f, 1.0f };
-const Color4 COLOR4_RED    = { 1.0f, 0.0f, 0.0f, 1.0f };
-const Color4 COLOR4_GREEN  = { 0.0f, 1.0f, 0.0f, 1.0f };
-const Color4 COLOR4_BLUE   = { 0.0f, 0.0f, 1.0f, 1.0f };
-const Color4 COLOR4_YELLOW = { 1.0f, 1.0f, 0.0f, 1.0f };
-const Color4 COLOR4_ORANGE = { 1.0f, 0.5f, 0.0f, 1.0f };
-
-const Quaternion QUATERNION_IDENTITY = { 0.0f, 0.0f, 0.0f, 1.0f };
-
-const Matrix3x3 MATRIX3X3_IDENTITY = { VECTOR3_XAXIS, VECTOR3_YAXIS, VECTOR3_ZAXIS };
-
-const Matrix4x4 MATRIX4X4_IDENTITY = { VECTOR4_XAXIS, VECTOR4_YAXIS, VECTOR4_ZAXIS, VECTOR4_WAXIS };
-
-const Plane3 PLANE3_ZERO  = { VECTOR3_ZERO,  0.0f };
-const Plane3 PLANE3_XAXIS = { VECTOR3_XAXIS, 0.0f };
-const Plane3 PLANE3_YAXIS = { VECTOR3_YAXIS, 0.0f };
-const Plane3 PLANE3_ZAXIS = { VECTOR3_ZAXIS, 0.0f };
+static const Vector2 VECTOR2_ZERO  = { 0.0f, 0.0f };
+static const Vector2 VECTOR2_ONE   = { 1.0f, 1.0f };
+static const Vector2 VECTOR2_XAXIS = { 1.0f, 0.0f };
+static const Vector2 VECTOR2_YAXIS = { 0.0f, 1.0f };
+
+static const Vector3 VECTOR3_ZERO     = {  0.0f,  0.0f,  0.0f };
+static const Vector3 VECTOR3_ONE      = {  1.0f,  1.0f,  1.0f };
+static const Vector3 VECTOR3_XAXIS    = {  1.0f,  0.0f,  0.0f };
+static const Vector3 VECTOR3_YAXIS    = {  0.0f,  1.0f,  0.0f };
+static const Vector3 VECTOR3_ZAXIS    = {  0.0f,  0.0f,  1.0f };
+static const Vector3 VECTOR3_RIGHT    = {  1.0f,  0.0f,  0.0f };
+static const Vector3 VECTOR3_LEFT     = { -1.0f,  0.0f,  0.0f };
+static const Vector3 VECTOR3_UP       = {  0.0f,  1.0f,  0.0f };
+static const Vector3 VECTOR3_DOWN     = {  0.0f, -1.0f,  0.0f };
+static const Vector3 VECTOR3_FORWARD  = {  0.0f,  0.0f,  1.0f };
+static const Vector3 VECTOR3_BACKWARD = {  0.0f,  0.0f, -1.0f };
+
+static const Vector4 VECTOR4_ZERO  = { 0.0f, 0.0f, 0.0f, 0.0f };
+static const Vector4 VECTOR4_ONE   = { 1.0f, 1.0f, 1.0f, 1.0f };
+static const Vector4 VECTOR4_XAXIS = { 1.0f, 0.0f, 0.0f, 0.0f };
+static const Vector4 VECTOR4_YAXIS = { 0.0f, 1.0f, 0.0f, 0.0f };
+static const Vector4 VECTOR4_ZAXIS = { 0.0f, 0.0f, 1.0f, 0.0f };
+static const Vector4 VECTOR4_WAXIS = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+static const Color4 COLOR4_BLACK  = { 0.0f, 0.0f, 0.0f, 1.0f };
+static const Color4 COLOR4_WHITE  = { 1.0f, 1.0f, 1.0f, 1.0f };
+static const Color4 COLOR4_RED    = { 1.0f, 0.0f, 0.0f, 1.0f };
+static const Color4 COLOR4_GREEN  = { 0.0f, 1.0f, 0.0f, 1.0f };
+static const Color4 COLOR4_BLUE   = { 0.0f, 0.0f, 1.0f, 1.0f };
+static const Color4 COLOR4_YELLOW = { 1.0f, 1.0f, 0.0f, 1.0f };
+static const Color4 COLOR4_ORANGE = { 1.0f, 0.5f, 0.0f, 1.0f };
+
+static const Quaternion QUATERNION_IDENTITY = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+static const Matrix3x3 MATRIX3X3_IDENTITY = { VECTOR3_XAXIS, VECTOR3_YAXIS, VECTOR3_ZAXIS };
+
+static const Matrix4x4 MATRIX4X4_IDENTITY = { VECTOR4_XAXIS, VECTOR4_YAXIS, VECTOR4_ZAXIS, VECTOR4_WAXIS };
+
+static const Plane3 PLANE3_ZERO  = { VECTOR3_ZERO,  0.0f };
+static const Plane3 PLANE3_XAXIS = { VECTOR3_XAXIS, 0.0f };
+static const Plane3 PLANE3_YAXIS = { VECTOR3_YAXIS, 0.0f };
+static const Plane3 PLANE3_ZAXIS = { VECTOR3_ZAXIS, 0.0f };
 /// @}
 
 } // namespace crown

src/core/math/math_utils.h

@@ -12,10 +12,10 @@ namespace crown
 /// @addtogroup Math
 /// @{
 
-const f32 PI            = 3.14159265358979323846f;
-const f32 PI_TWO        = 6.28318530717958647693f;
-const f32 PI_HALF       = 1.57079632679489661923f;
-const f32 FLOAT_EPSILON = 1.0e-7f;
+static const f32 PI            = 3.14159265358979323846f;
+static const f32 PI_TWO        = 6.28318530717958647693f;
+static const f32 PI_HALF       = 1.57079632679489661923f;
+static const f32 FLOAT_EPSILON = 1.0e-7f;
 
 /// Returns whether @a a and @a b are equal according to @a epsilon.
 inline bool fequal(f32 a, f32 b, f32 epsilon = FLOAT_EPSILON)

src/world/world_types.h

@@ -29,24 +29,24 @@ struct World;
 
 typedef u32 SoundInstanceId;
 
-const u32 DEBUG_LINE_MARKER       = 0xd7c17715;
-const u32 DEBUG_GUI_MARKER        = 0xf081a80a;
-const u32 LEVEL_MARKER            = 0x1f2b43fe;
-const u32 RENDER_WORLD_MARKER     = 0xc82277de;
-const u32 RESOURCE_PACKAGE_MARKER = 0x9a1ac68c;
-const u32 SCENE_GRAPH_MARKER      = 0x63a44dbf;
-const u32 WORLD_MARKER            = 0xfb6ce2d3;
-const u32 SCRIPT_WORLD_MARKER     = 0x78486cdc;
-
-const StringId32 COMPONENT_TYPE_ACTOR           = StringId32("actor");
-const StringId32 COMPONENT_TYPE_CAMERA          = StringId32("camera");
-const StringId32 COMPONENT_TYPE_COLLIDER        = StringId32("collider");
-const StringId32 COMPONENT_TYPE_CONTROLLER      = StringId32("controller");
-const StringId32 COMPONENT_TYPE_LIGHT           = StringId32("light");
-const StringId32 COMPONENT_TYPE_MESH_RENDERER   = StringId32("mesh_renderer");
-const StringId32 COMPONENT_TYPE_SPRITE_RENDERER = StringId32("sprite_renderer");
-const StringId32 COMPONENT_TYPE_TRANSFORM       = StringId32("transform");
-const StringId32 COMPONENT_TYPE_SCRIPT          = StringId32("script");
+#define DEBUG_LINE_MARKER       0xd7c17715
+#define DEBUG_GUI_MARKER        0xf081a80a
+#define LEVEL_MARKER            0x1f2b43fe
+#define RENDER_WORLD_MARKER     0xc82277de
+#define RESOURCE_PACKAGE_MARKER 0x9a1ac68c
+#define SCENE_GRAPH_MARKER      0x63a44dbf
+#define WORLD_MARKER            0xfb6ce2d3
+#define SCRIPT_WORLD_MARKER     0x78486cdc
+
+static const StringId32 COMPONENT_TYPE_ACTOR           = StringId32("actor");
+static const StringId32 COMPONENT_TYPE_CAMERA          = StringId32("camera");
+static const StringId32 COMPONENT_TYPE_COLLIDER        = StringId32("collider");
+static const StringId32 COMPONENT_TYPE_CONTROLLER      = StringId32("controller");
+static const StringId32 COMPONENT_TYPE_LIGHT           = StringId32("light");
+static const StringId32 COMPONENT_TYPE_MESH_RENDERER   = StringId32("mesh_renderer");
+static const StringId32 COMPONENT_TYPE_SPRITE_RENDERER = StringId32("sprite_renderer");
+static const StringId32 COMPONENT_TYPE_TRANSFORM       = StringId32("transform");
+static const StringId32 COMPONENT_TYPE_SCRIPT          = StringId32("script");
 
 /// Enumerates camera projection types.
 ///