src/*: code-style: use #defines for flags

src/core/process.cpp

@@ -72,7 +72,7 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	int fildes[2];
 	pid_t pid;
 
-	if (flags & ProcessFlags::STDIN_PIPE || flags & ProcessFlags::STDOUT_PIPE)
+	if (flags & CROWN_PROCESS_STDIN_PIPE || flags & CROWN_PROCESS_STDOUT_PIPE)
 	{
 		if (pipe(fildes) < 0)
 			return -1;
@@ -87,7 +87,7 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	}
 	else if (pid == 0) // Child
 	{
-		if (flags & ProcessFlags::STDOUT_PIPE)
+		if (flags & CROWN_PROCESS_STDOUT_PIPE)
 		{
 			if (fildes[1] != STDOUT_FILENO)
 			{
@@ -97,12 +97,12 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 			}
 			close(fildes[0]);
 
-			if (flags & ProcessFlags::STDERR_MERGE)
+			if (flags & CROWN_PROCESS_STDERR_MERGE)
 			{
 				dup2(fildes[1], 2);
 			}
 		}
-		else if (flags & ProcessFlags::STDIN_PIPE)
+		else if (flags & CROWN_PROCESS_STDIN_PIPE)
 		{
 			if (fildes[0] != STDIN_FILENO)
 			{
@@ -119,12 +119,12 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	}
 
 	// Parent
-	if (flags & ProcessFlags::STDOUT_PIPE)
+	if (flags & CROWN_PROCESS_STDOUT_PIPE)
 	{
 		_priv->file = fdopen(fildes[0], "r");
 		close(fildes[1]);
 	}
-	else if (flags & ProcessFlags::STDIN_PIPE)
+	else if (flags & CROWN_PROCESS_STDIN_PIPE)
 	{
 		_priv->file = fdopen(fildes[1], "w");
 		close(fildes[0]);
@@ -166,7 +166,7 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	sattr.bInheritHandle = TRUE;
 	sattr.lpSecurityDescriptor = NULL;
 
-	if (flags & ProcessFlags::STDOUT_PIPE)
+	if (flags & CROWN_PROCESS_STDOUT_PIPE)
 	{
 		// Pipe for STDOUT of child process
 		BOOL ret;
@@ -183,8 +183,8 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	STARTUPINFO info;
 	memset(&info, 0, sizeof(info));
 	info.cb = sizeof(info);
-	info.hStdOutput = (flags & ProcessFlags::STDOUT_PIPE) ? _priv->stdout_wr : 0;
-	info.hStdError = (info.hStdOutput != 0) && (flags & ProcessFlags::STDERR_MERGE) ? _priv->stdout_wr : 0;
+	info.hStdOutput = (flags & CROWN_PROCESS_STDOUT_PIPE) ? _priv->stdout_wr : 0;
+	info.hStdError = (info.hStdOutput != 0) && (flags & CROWN_PROCESS_STDERR_MERGE) ? _priv->stdout_wr : 0;
 	info.dwFlags |= (info.hStdOutput != 0 || info.hStdError != 0) ? STARTF_USESTDHANDLES : 0;
 
 	BOOL err = CreateProcess(argv[0]
@@ -201,7 +201,7 @@ s32 Process::spawn(const char* const* argv, u32 flags)
 	if (err == 0)
 		return -1;
 
-	if (flags & ProcessFlags::STDOUT_PIPE)
+	if (flags & CROWN_PROCESS_STDOUT_PIPE)
 		CloseHandle(_priv->stdout_wr);
 	return 0;
 #endif

src/core/process.h

@@ -19,21 +19,12 @@
 
 #define EXE_PATH(exe) EXE_PREFIX exe EXE_SUFFIX
 
+#define CROWN_PROCESS_STDIN_PIPE   UINT32_C(0x1) ///< Create stdin pipe.
+#define CROWN_PROCESS_STDOUT_PIPE  UINT32_C(0x2) ///< Create stdout pipe.
+#define CROWN_PROCESS_STDERR_MERGE UINT32_C(0x4) ///< Merge stderr with stdout.
+
 namespace crown
 {
-/// ProcessFlags
-///
-/// @ingroup Core
-struct ProcessFlags
-{
-	enum Enum
-	{
-		STDIN_PIPE   = 1 << 0, ///< Create stdin pipe.
-		STDOUT_PIPE  = 1 << 1, ///< Create stdout pipe.
-		STDERR_MERGE = 1 << 2  ///< Merge stderr with stdout.
-	};
-};
-
 /// Process.
 ///
 /// @ingroup Core

src/core/unit_tests.cpp

@@ -1490,7 +1490,7 @@ static void test_process()
 		};
 
 		Process pr;
-		s32 err = pr.spawn(argv, ProcessFlags::STDOUT_PIPE);
+		s32 err = pr.spawn(argv, CROWN_PROCESS_STDOUT_PIPE);
 		ENSURE(err == 0);
 		u32 nbr;
 		char buf[128] = {0};

src/resource/lua_resource.cpp

@@ -50,7 +50,7 @@ namespace lua_resource_internal
 			NULL
 		};
 		Process pr;
-		s32 sc = pr.spawn(argv, ProcessFlags::STDOUT_PIPE | ProcessFlags::STDERR_MERGE);
+		s32 sc = pr.spawn(argv, CROWN_PROCESS_STDOUT_PIPE | CROWN_PROCESS_STDERR_MERGE);
 		DATA_COMPILER_ASSERT(sc == 0
 			, opts
 			, "Failed to spawn `%s`"

src/resource/physics_resource.cpp

@@ -503,13 +503,13 @@ namespace physics_config_resource_internal
 
 			pa.flags = 0;
 			if (json_object::has(actor, "dynamic") && sjson::parse_bool(actor["dynamic"]))
-				pa.flags |= PhysicsActor::DYNAMIC;
+				pa.flags |= CROWN_PHYSICS_ACTOR_DYNAMIC;
 			if (json_object::has(actor, "kinematic") && sjson::parse_bool(actor["kinematic"]))
-				pa.flags |= PhysicsActor::KINEMATIC;
+				pa.flags |= CROWN_PHYSICS_ACTOR_KINEMATIC;
 			if (json_object::has(actor, "disable_gravity") && sjson::parse_bool(actor["disable_gravity"]))
-				pa.flags |= PhysicsActor::DISABLE_GRAVITY;
+				pa.flags |= CROWN_PHYSICS_ACTOR_DISABLE_GRAVITY;
 			if (json_object::has(actor, "trigger") && sjson::parse_bool(actor["trigger"]))
-				pa.flags |= PhysicsActor::TRIGGER;
+				pa.flags |= CROWN_PHYSICS_ACTOR_TRIGGER;
 
 			array::push_back(objects, pa);
 		}

src/resource/physics_resource.h

@@ -49,16 +49,13 @@ struct PhysicsCollisionFilter
 	u32 mask;
 };
 
+#define CROWN_PHYSICS_ACTOR_DYNAMIC         UINT32_C(0x1)
+#define CROWN_PHYSICS_ACTOR_KINEMATIC       UINT32_C(0x2)
+#define CROWN_PHYSICS_ACTOR_DISABLE_GRAVITY UINT32_C(0x4)
+#define CROWN_PHYSICS_ACTOR_TRIGGER         UINT32_C(0x8)
+
 struct PhysicsActor
 {
-	enum
-	{
-		DYNAMIC         = 1 << 0,
-		KINEMATIC       = 1 << 1,
-		DISABLE_GRAVITY = 1 << 2,
-		TRIGGER         = 1 << 3
-	};
-
 	StringId32 name;
 	f32 linear_damping;
 	f32 angular_damping;

src/resource/shader_resource.cpp

@@ -499,7 +499,7 @@ namespace shader_resource_internal
 			return -1;
 		}
 
-		return pr.spawn(argv, ProcessFlags::STDOUT_PIPE | ProcessFlags::STDERR_MERGE);
+		return pr.spawn(argv, CROWN_PROCESS_STDOUT_PIPE | CROWN_PROCESS_STDERR_MERGE);
 	}
 
 	struct RenderState

src/resource/texture_resource.cpp

@@ -114,7 +114,7 @@ namespace texture_resource_internal
 			NULL
 		};
 		Process pr;
-		s32 sc = pr.spawn(argv, ProcessFlags::STDOUT_PIPE | ProcessFlags::STDERR_MERGE);
+		s32 sc = pr.spawn(argv, CROWN_PROCESS_STDOUT_PIPE | CROWN_PROCESS_STDERR_MERGE);
 		DATA_COMPILER_ASSERT(sc == 0
 			, opts
 			, "Failed to spawn `%s`"

src/world/physics_world_bullet.cpp

@@ -469,10 +469,10 @@ struct PhysicsWorldImpl
 		const PhysicsActor* actor_class = physics_config_resource::actor(_config_resource, ar->actor_class);
 		const PhysicsMaterial* material = physics_config_resource::material(_config_resource, ar->material);
 
-		const bool is_kinematic = (actor_class->flags & PhysicsActor::KINEMATIC) != 0;
-		const bool is_dynamic   = (actor_class->flags & PhysicsActor::DYNAMIC) != 0;
+		const bool is_kinematic = (actor_class->flags & CROWN_PHYSICS_ACTOR_KINEMATIC) != 0;
+		const bool is_dynamic   = (actor_class->flags & CROWN_PHYSICS_ACTOR_DYNAMIC) != 0;
 		const bool is_static    = !is_kinematic && !is_dynamic;
-		const bool is_trigger   = (actor_class->flags & PhysicsActor::TRIGGER) != 0;
+		const bool is_trigger   = (actor_class->flags & CROWN_PHYSICS_ACTOR_TRIGGER) != 0;
 
 		const f32 mass = is_dynamic ? ar->mass : 0.0f;