style: cleanup

src/core/strings/string_id.cpp

@@ -61,8 +61,7 @@ void StringId64::parse(const char* str)
 	u32 id[2];
 	CE_ENSURE(NULL != str);
 	int num = sscanf(str, "%8x%8x", &id[0], &id[1]);
-	_id = 0;
-	_id |= u64(id[0]) << 32;
+	_id =  u64(id[0]) << 32;
 	_id |= u64(id[1]) <<  0;
 	CE_ENSURE(num == 2);
 	CE_UNUSED(num);

src/resource/physics_resource.cpp

@@ -237,19 +237,12 @@ namespace physics_resource_internal
 		ar.material         = sjson::parse_string_id(obj["material"]);
 
 		ar.flags = 0;
-
-		if (json_object::has(obj, "lock_translation_x") && sjson::parse_bool(obj["lock_translation_x"]))
-			ar.flags |= ActorFlags::LOCK_TRANSLATION_X;
-		if (json_object::has(obj, "lock_translation_y") && sjson::parse_bool(obj["lock_translation_y"]))
-			ar.flags |= ActorFlags::LOCK_TRANSLATION_Y;
-		if (json_object::has(obj, "lock_translation_z") && sjson::parse_bool(obj["lock_translation_z"]))
-			ar.flags |= ActorFlags::LOCK_TRANSLATION_Z;
-		if (json_object::has(obj, "lock_rotation_x") && sjson::parse_bool(obj["lock_rotation_x"]))
-			ar.flags |= ActorFlags::LOCK_ROTATION_X;
-		if (json_object::has(obj, "lock_rotation_y") && sjson::parse_bool(obj["lock_rotation_y"]))
-			ar.flags |= ActorFlags::LOCK_ROTATION_Y;
-		if (json_object::has(obj, "lock_rotation_z") && sjson::parse_bool(obj["lock_rotation_z"]))
-			ar.flags |= ActorFlags::LOCK_ROTATION_Z;
+		ar.flags |= (json_object::has(obj, "lock_translation_x") && sjson::parse_bool(obj["lock_translation_x"])) ? ActorFlags::LOCK_TRANSLATION_X : 0;
+		ar.flags |= (json_object::has(obj, "lock_translation_y") && sjson::parse_bool(obj["lock_translation_y"])) ? ActorFlags::LOCK_TRANSLATION_Y : 0;
+		ar.flags |= (json_object::has(obj, "lock_translation_z") && sjson::parse_bool(obj["lock_translation_z"])) ? ActorFlags::LOCK_TRANSLATION_Z : 0;
+		ar.flags |= (json_object::has(obj, "lock_rotation_x") && sjson::parse_bool(obj["lock_rotation_x"])) ? ActorFlags::LOCK_ROTATION_X : 0;
+		ar.flags |= (json_object::has(obj, "lock_rotation_y") && sjson::parse_bool(obj["lock_rotation_y"])) ? ActorFlags::LOCK_ROTATION_Y : 0;
+		ar.flags |= (json_object::has(obj, "lock_rotation_z") && sjson::parse_bool(obj["lock_rotation_z"])) ? ActorFlags::LOCK_ROTATION_Z : 0;
 
 		array::push(output, (char*)&ar, sizeof(ar));
 
@@ -356,41 +349,11 @@ namespace physics_config_resource_internal
 			if (json_object::has(actor, "angular_damping"))
 				pa.angular_damping = sjson::parse_float(actor["angular_damping"]);
 
-			const bool has_dynamic         = json_object::has(actor, "dynamic");
-			const bool has_kinematic       = json_object::has(actor, "kinematic");
-			const bool has_disable_gravity = json_object::has(actor, "disable_gravity");
-			const bool has_trigger         = json_object::has(actor, "trigger");
-
 			pa.flags = 0;
-
-			if (has_dynamic)
-			{
-				pa.flags |= (sjson::parse_bool(actor["dynamic"])
-					? 1
-					: 0
-					);
-			}
-			if (has_kinematic)
-			{
-				pa.flags |= (sjson::parse_bool(actor["kinematic"])
-					? PhysicsActor::KINEMATIC
-					: 0
-					);
-			}
-			if (has_disable_gravity)
-			{
-				pa.flags |= (sjson::parse_bool(actor["disable_gravity"])
-					? PhysicsActor::DISABLE_GRAVITY
-					: 0
-					);
-			}
-			if (has_trigger)
-			{
-				pa.flags |= (sjson::parse_bool(actor["trigger"])
-					? PhysicsActor::TRIGGER
-					: 0
-					);
-			}
+			pa.flags |= (json_object::has(actor, "dynamic")         && sjson::parse_bool(actor["dynamic"])        ) ? PhysicsActor::DYNAMIC         : 0;
+			pa.flags |= (json_object::has(actor, "kinematic")       && sjson::parse_bool(actor["kinematic"])      ) ? PhysicsActor::KINEMATIC       : 0;
+			pa.flags |= (json_object::has(actor, "disable_gravity") && sjson::parse_bool(actor["disable_gravity"])) ? PhysicsActor::DISABLE_GRAVITY : 0;
+			pa.flags |= (json_object::has(actor, "trigger")         && sjson::parse_bool(actor["trigger"])        ) ? PhysicsActor::TRIGGER         : 0;
 
 			array::push_back(objects, pa);
 		}

src/resource/shader_resource.cpp

@@ -495,31 +495,31 @@ namespace shader_resource_internal
 
 		u64 encode() const
 		{
-			const u64 depth_func = (_depth_enable
+			const u64 depth_func = _depth_enable
 				? _bgfx_depth_func_map[_depth_func]
 				: 0
-				);
-			const u64 blend_func = (_blend_enable
+				;
+			const u64 blend_func = _blend_enable
 				? BGFX_STATE_BLEND_FUNC(_bgfx_blend_func_map[_blend_src], _bgfx_blend_func_map[_blend_dst])
 				: 0
-				);
-			const u64 blend_eq = (_blend_enable
+				;
+			const u64 blend_eq = _blend_enable
 				? BGFX_STATE_BLEND_EQUATION(_bgfx_blend_equation_map[_blend_equation])
 				: 0
-				);
-			const u64 cull_mode = (_cull_mode != CullMode::COUNT
+				;
+			const u64 cull_mode = _cull_mode != CullMode::COUNT
 				? _bgfx_cull_mode_map[_cull_mode]
 				: 0
-				);
-			const u64 primitive_type = (_primitive_type != PrimitiveType::COUNT
+				;
+			const u64 primitive_type = _primitive_type != PrimitiveType::COUNT
 				? _bgfx_primitive_type_map[_primitive_type]
 				: 0
-				);
+				;
 
 			u64 state = 0;
-			state |= (_rgb_write_enable   ? BGFX_STATE_WRITE_RGB : 0);
-			state |= (_alpha_write_enable ? BGFX_STATE_WRITE_A   : 0);
-			state |= (_depth_write_enable ? BGFX_STATE_WRITE_Z   : 0);
+			state |= _rgb_write_enable   ? BGFX_STATE_WRITE_RGB : 0;
+			state |= _alpha_write_enable ? BGFX_STATE_WRITE_A   : 0;
+			state |= _depth_write_enable ? BGFX_STATE_WRITE_Z   : 0;
 			state |= depth_func;
 			state |= blend_func;
 			state |= blend_eq;
@@ -555,11 +555,11 @@ namespace shader_resource_internal
 		u32 encode() const
 		{
 			u32 state = 0;
-			state |= _filter_min == SamplerFilter::COUNT ? 0 : _bgfx_sampler_filter_min_map[_filter_min];
-			state |= _filter_mag == SamplerFilter::COUNT ? 0 : _bgfx_sampler_filter_mag_map[_filter_mag];
-			state |= _wrap_u == SamplerWrap::COUNT ? 0 : _bgfx_sampler_wrap_u_map[_wrap_u];
-			state |= _wrap_v == SamplerWrap::COUNT ? 0 : _bgfx_sampler_wrap_v_map[_wrap_v];
-			state |= _wrap_w == SamplerWrap::COUNT ? 0 : _bgfx_sampler_wrap_w_map[_wrap_w];
+			state |= _filter_min != SamplerFilter::COUNT ? _bgfx_sampler_filter_min_map[_filter_min] : 0;
+			state |= _filter_mag != SamplerFilter::COUNT ? _bgfx_sampler_filter_mag_map[_filter_mag] : 0;
+			state |= _wrap_u != SamplerWrap::COUNT ? _bgfx_sampler_wrap_u_map[_wrap_u] : 0;
+			state |= _wrap_v != SamplerWrap::COUNT ? _bgfx_sampler_wrap_v_map[_wrap_v] : 0;
+			state |= _wrap_w != SamplerWrap::COUNT ? _bgfx_sampler_wrap_w_map[_wrap_w] : 0;
 			return state;
 		}
 	};

src/world/physics_world_bullet.cpp

@@ -473,9 +473,9 @@ struct PhysicsWorldImpl
 		btRigidBody* actor = CE_NEW(*_allocator, btRigidBody)(rbinfo);
 
 		int cflags = actor->getCollisionFlags();
-		cflags |= is_kinematic ? btCollisionObject::CF_KINEMATIC_OBJECT : 0;
-		cflags |= is_static ? btCollisionObject::CF_STATIC_OBJECT : 0;
-		cflags |= is_trigger ? btCollisionObject::CF_NO_CONTACT_RESPONSE : 0;
+		cflags |= is_kinematic ? btCollisionObject::CF_KINEMATIC_OBJECT    : 0;
+		cflags |= is_static    ? btCollisionObject::CF_STATIC_OBJECT       : 0;
+		cflags |= is_trigger   ? btCollisionObject::CF_NO_CONTACT_RESPONSE : 0;
 		actor->setCollisionFlags(cflags);
 
 		actor->setLinearFactor(btVector3(