Cleanup

src/resource/font_resource.cpp

@@ -42,7 +42,6 @@ namespace font_resource
 		sjson::parse(buf, object);
 		sjson::parse_array(object["glyphs"], glyphs);
 
-		const u32 count      = sjson::parse_int(object["count"]);
 		const u32 size       = sjson::parse_int(object["size"]);
 		const u32 font_size  = sjson::parse_int(object["font_size"]);
 		const u32 num_glyphs = array::size(glyphs);

src/resource/font_resource.h

@@ -18,7 +18,7 @@ struct FontResource
 {
 	u32 version;
 	u32 num_glyphs;
-	u32 texture_size; // Font texture size -- pow of 2
+	u32 texture_size;
 	u32 font_size;
 };
 

src/resource/material_resource.h

@@ -29,10 +29,10 @@ struct MaterialResource
 
 struct TextureData
 {
-	u32 sampler_name_offset;	// Sampler uniform name
+	u32 sampler_name_offset; // Sampler uniform name
 	u32 _pad;
-	StringId64 id;					// Resource name
-	u32 data_offset;			// Offset into dynamic blob
+	StringId64 id;           // Resource name
+	u32 data_offset;         // Offset into dynamic blob
 	u32 _pad1;
 };
 
@@ -56,9 +56,9 @@ struct UniformType
 
 struct UniformData
 {
-	u32 name_offset;	// Uniform name
-	u32 type;			// UniformType::Enum
-	u32 data_offset;	// Offset into dynamic blob
+	u32 name_offset; // Uniform name
+	u32 type;        // UniformType::Enum
+	u32 data_offset; // Offset into dynamic blob
 };
 
 struct UniformHandle

src/resource/mesh_resource.h

@@ -26,7 +26,7 @@ struct VertexData
 struct IndexData
 {
 	u32 num;
-	char* data;   // size = num*sizeof(u16)
+	char* data; // size = num*sizeof(u16)
 };
 
 struct MeshGeometry

src/resource/physics_resource.h

@@ -65,9 +65,9 @@ struct PhysicsConfigActor
 {
 	enum
 	{
-		DYNAMIC         = (1 << 0),
-		KINEMATIC       = (1 << 1),
-		DISABLE_GRAVITY = (1 << 2)
+		DYNAMIC         = 1 << 0,
+		KINEMATIC       = 1 << 1,
+		DISABLE_GRAVITY = 1 << 2
 	};
 
 	StringId32 name;

src/resource/sprite_resource.cpp

@@ -25,9 +25,9 @@ namespace sprite_resource
 	struct SpriteFrame
 	{
 		StringId32 name;
-		Vector4 region;		// [x0, y0, x1, y1]
-		Vector2 scale;		// [Sx, Sy]
-		Vector2 offset;		// [Ox, Oy]
+		Vector4 region;  // [x0, y0, x1, y1]
+		Vector2 scale;   // [Sx, Sy]
+		Vector2 offset;  // [Ox, Oy]
 	};
 
 	void parse_frame(const char* json, SpriteFrame& frame)
@@ -54,8 +54,8 @@ namespace sprite_resource
 		sjson::parse_array(object["frames"], frames);
 
 		// Read width/height
-		const f32 width         = sjson::parse_float(object["width" ]);
-		const f32 height        = sjson::parse_float(object["height"]);
+		const f32 width      = sjson::parse_float(object["width" ]);
+		const f32 height     = sjson::parse_float(object["height"]);
 		const u32 num_frames = array::size(frames);
 
 		Array<f32> vertices(default_allocator());

src/resource/texture_resource.cpp

@@ -88,21 +88,21 @@ struct DdsPixelFormat
 
 struct DdsHeader
 {
-	u32       magic;
-	u32       size;
-	u32       flags;
-	u32       height;
-	u32       width;
-	u32       pitch_or_linear_size;
-	u32       depth;
-	u32       num_mips;
-	u32       reserved[11];
+	u32 magic;
+	u32 size;
+	u32 flags;
+	u32 height;
+	u32 width;
+	u32 pitch_or_linear_size;
+	u32 depth;
+	u32 num_mips;
+	u32 reserved[11];
 	DdsPixelFormat ddspf;
-	u32       caps;
-	u32       caps2;
-	u32       caps3;
-	u32       caps4;
-	u32       reserved2;
+	u32 caps;
+	u32 caps2;
+	u32 caps3;
+	u32 caps4;
+	u32 reserved2;
 };
 
 struct PixelFormat

src/world/world_types.h

@@ -78,12 +78,12 @@ struct ActorFlags
 {
 	enum Enum
 	{
-		LOCK_TRANSLATION_X = (1 << 0),
-		LOCK_TRANSLATION_Y = (1 << 1),
-		LOCK_TRANSLATION_Z = (1 << 2),
-		LOCK_ROTATION_X    = (1 << 3),
-		LOCK_ROTATION_Y    = (1 << 4),
-		LOCK_ROTATION_Z    = (1 << 5)
+		LOCK_TRANSLATION_X = 1 << 0,
+		LOCK_TRANSLATION_Y = 1 << 1,
+		LOCK_TRANSLATION_Z = 1 << 2,
+		LOCK_ROTATION_X    = 1 << 3,
+		LOCK_ROTATION_Y    = 1 << 4,
+		LOCK_ROTATION_Z    = 1 << 5
 	};
 };
 
@@ -127,38 +127,38 @@ struct CollisionGroup
 {
 	enum Enum
 	{
-		GROUP_0  = (1<<0), // Reserved
-		GROUP_1  = (1<<1),
-		GROUP_2  = (1<<2),
-		GROUP_3  = (1<<3),
-		GROUP_4  = (1<<4),
-		GROUP_5  = (1<<5),
-		GROUP_6  = (1<<6),
-		GROUP_7  = (1<<7),
-		GROUP_8  = (1<<8),
-		GROUP_9  = (1<<9),
-		GROUP_10 = (1<<10),
-		GROUP_11 = (1<<11),
-		GROUP_12 = (1<<12),
-		GROUP_13 = (1<<13),
-		GROUP_14 = (1<<14),
-		GROUP_15 = (1<<15),
-		GROUP_16 = (1<<16),
-		GROUP_17 = (1<<17),
-		GROUP_18 = (1<<18),
-		GROUP_19 = (1<<19),
-		GROUP_20 = (1<<20),
-		GROUP_21 = (1<<21),
-		GROUP_22 = (1<<22),
-		GROUP_23 = (1<<23),
-		GROUP_24 = (1<<24),
-		GROUP_25 = (1<<25),
-		GROUP_26 = (1<<26),
-		GROUP_27 = (1<<27),
-		GROUP_28 = (1<<28),
-		GROUP_29 = (1<<29),
-		GROUP_30 = (1<<30),
-		GROUP_31 = (1<<31)
+		GROUP_0  = 1 <<  0, // Reserved
+		GROUP_1  = 1 <<  1,
+		GROUP_2  = 1 <<  2,
+		GROUP_3  = 1 <<  3,
+		GROUP_4  = 1 <<  4,
+		GROUP_5  = 1 <<  5,
+		GROUP_6  = 1 <<  6,
+		GROUP_7  = 1 <<  7,
+		GROUP_8  = 1 <<  8,
+		GROUP_9  = 1 <<  9,
+		GROUP_10 = 1 << 10,
+		GROUP_11 = 1 << 11,
+		GROUP_12 = 1 << 12,
+		GROUP_13 = 1 << 13,
+		GROUP_14 = 1 << 14,
+		GROUP_15 = 1 << 15,
+		GROUP_16 = 1 << 16,
+		GROUP_17 = 1 << 17,
+		GROUP_18 = 1 << 18,
+		GROUP_19 = 1 << 19,
+		GROUP_20 = 1 << 20,
+		GROUP_21 = 1 << 21,
+		GROUP_22 = 1 << 22,
+		GROUP_23 = 1 << 23,
+		GROUP_24 = 1 << 24,
+		GROUP_25 = 1 << 25,
+		GROUP_26 = 1 << 26,
+		GROUP_27 = 1 << 27,
+		GROUP_28 = 1 << 28,
+		GROUP_29 = 1 << 29,
+		GROUP_30 = 1 << 30,
+		GROUP_31 = 1 << 31
 	};
 };
 
@@ -310,11 +310,11 @@ struct SpriteRendererDesc
 /// @ingroup World
 struct LightDesc
 {
-	u32 type;    ///< LightType::Enum
+	u32 type;       ///< LightType::Enum
 	f32 range;      ///< In meters.
 	f32 intensity;
 	f32 spot_angle; ///< In radians.
-	Vector3 color;    ///< Color of the light.
+	Vector3 color;  ///< Color of the light.
 };
 
 /// Transform description.
@@ -332,7 +332,7 @@ struct TransformDesc
 /// @ingroup World
 struct CameraDesc
 {
-	u32 type;    ///< ProjectionType::Enum
+	u32 type;       ///< ProjectionType::Enum
 	f32 fov;        ///< Vertical FOV
 	f32 near_range; ///< Near clipping plane distance
 	f32 far_range;  ///< Far clipping plane distance
@@ -343,11 +343,11 @@ struct CameraDesc
 /// @ingroup World
 struct ControllerDesc
 {
-	f32 height;                ///< Height of the capsule
-	f32 radius;                ///< Radius of the capsule
-	f32 slope_limit;           ///< The maximum slope which the character can walk up in radians.
-	f32 step_offset;           ///< Maximum height of an obstacle which the character can climb.
-	f32 contact_offset;        ///< Skin around the object within which contacts will be generated. Use it to avoid numerical precision issues.
+	f32 height;                  ///< Height of the capsule
+	f32 radius;                  ///< Radius of the capsule
+	f32 slope_limit;             ///< The maximum slope which the character can walk up in radians.
+	f32 step_offset;             ///< Maximum height of an obstacle which the character can climb.
+	f32 contact_offset;          ///< Skin around the object within which contacts will be generated. Use it to avoid numerical precision issues.
 	StringId32 collision_filter; ///< Collision filter from global.physics_config
 };
 
@@ -357,8 +357,8 @@ struct ControllerDesc
 struct ActorResource
 {
 	StringId32 actor_class;      ///< Name of actor in global.physics resource.
-	f32 mass;                  ///< Mass of the actor.
-	u32 flags;              ///< ActorFlags::Enum
+	f32 mass;                    ///< Mass of the actor.
+	u32 flags;                   ///< ActorFlags::Enum
 	StringId32 collision_filter; ///< Name of collision filter in global.physics_config resource.
 };
 
@@ -390,7 +390,7 @@ struct HeightfieldShape
 struct ShapeDesc
 {
 	StringId32 shape_class;       ///< Name of shape in global.physics_config resource.
-	u32 type;                ///< ShapeType::Enum
+	u32 type;                     ///< ShapeType::Enum
 	StringId32 material;          ///< Name of material in global.physics_config resource.
 	Matrix4x4 local_tm;           ///< In actor-space
 	SphereShape sphere;
@@ -416,7 +416,7 @@ struct HingeJoint
 
 struct JointDesc
 {
-	u32 type;    ///< JointType::Enum
+	u32 type;         ///< JointType::Enum
 	Vector3 anchor_0;
 	Vector3 anchor_1;