From bd53556507588a33f1c4ce44b1ea6cd4856595fb Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 2 Mar 2024 19:36:29 +0100 Subject: [PATCH] Use bitshifts for all property usage flags. --- core/object/object.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/core/object/object.h b/core/object/object.h index 58b4a53a2..8d685a362 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -105,25 +105,25 @@ enum PropertyHint { enum PropertyUsageFlags { - PROPERTY_USAGE_STORAGE = 1, - PROPERTY_USAGE_EDITOR = 2, - PROPERTY_USAGE_NETWORK = 4, - PROPERTY_USAGE_EDITOR_HELPER = 8, - PROPERTY_USAGE_CHECKABLE = 16, //used for editing global variables - PROPERTY_USAGE_CHECKED = 32, //used for editing global variables - PROPERTY_USAGE_INTERNATIONALIZED = 64, //hint for internationalized strings - PROPERTY_USAGE_GROUP = 128, //used for grouping props in the editor - PROPERTY_USAGE_CATEGORY = 256, + PROPERTY_USAGE_STORAGE = 1 << 0, + PROPERTY_USAGE_EDITOR = 1 << 1, + PROPERTY_USAGE_NETWORK = 1 << 2, + PROPERTY_USAGE_EDITOR_HELPER = 1 << 3, + PROPERTY_USAGE_CHECKABLE = 1 << 4, //used for editing global variables + PROPERTY_USAGE_CHECKED = 1 << 5, //used for editing global variables + PROPERTY_USAGE_INTERNATIONALIZED = 1 << 6, //hint for internationalized strings + PROPERTY_USAGE_GROUP = 1 << 7, //used for grouping props in the editor + PROPERTY_USAGE_CATEGORY = 1 << 8, // FIXME: Drop in 4.0, possibly reorder other flags? // Those below are deprecated thanks to ClassDB's now class value cache - //PROPERTY_USAGE_STORE_IF_NONZERO = 512, //only store if nonzero - //PROPERTY_USAGE_STORE_IF_NONONE = 1024, //only store if false - PROPERTY_USAGE_NO_INSTANCE_STATE = 2048, - PROPERTY_USAGE_RESTART_IF_CHANGED = 4096, - PROPERTY_USAGE_SCRIPT_VARIABLE = 8192, - PROPERTY_USAGE_STORE_IF_NULL = 16384, - PROPERTY_USAGE_ANIMATE_AS_TRIGGER = 32768, - PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED = 65536, + //PROPERTY_USAGE_STORE_IF_NONZERO = 1 << 9, //only store if nonzero //512 + //PROPERTY_USAGE_STORE_IF_NONONE = 1 << 10, //only store if false //1024 + PROPERTY_USAGE_NO_INSTANCE_STATE = 1 << 11, + PROPERTY_USAGE_RESTART_IF_CHANGED = 1 << 12, + PROPERTY_USAGE_SCRIPT_VARIABLE = 1 << 13, + PROPERTY_USAGE_STORE_IF_NULL = 1 << 14, + PROPERTY_USAGE_ANIMATE_AS_TRIGGER = 1 << 15, + PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED = 1 << 16, PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE = 1 << 17, PROPERTY_USAGE_CLASS_IS_ENUM = 1 << 18, PROPERTY_USAGE_NIL_IS_VARIANT = 1 << 19,