From 616121ee7a7daa3d902f0681921264d1f846f7da Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 9 May 2022 15:58:19 -0700 Subject: [PATCH] nodevalue: remove unnecessary vecs --- app/node/value.cpp | 4 ---- app/node/value.h | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/node/value.cpp b/app/node/value.cpp index d103b1973..5b1355451 100644 --- a/app/node/value.cpp +++ b/app/node/value.cpp @@ -34,10 +34,6 @@ namespace olive { -const QVector NodeValue::kNumber = {kFloat, kInt, kRational}; -const QVector NodeValue::kBuffer = {kTexture, kSamples}; -const QVector NodeValue::kVector = {kVec2, kVec3, kVec4}; - QString NodeValue::ValueToString(Type data_type, const QVariant &value, bool value_is_a_key_track) { if (!value_is_a_key_track && data_type == kVec2) { diff --git a/app/node/value.h b/app/node/value.h index 345b7ed4d..49f977ad0 100644 --- a/app/node/value.h +++ b/app/node/value.h @@ -184,10 +184,6 @@ public: kDataTypeCount }; - static const QVector kNumber; - static const QVector kBuffer; - static const QVector kVector; - NodeValue() : type_(kNone), from_(nullptr), @@ -295,12 +291,22 @@ public: static bool type_is_numeric(NodeValue::Type type) { - return kNumber.contains(type); + return type == kFloat + || type == kInt + || type == kRational; } static bool type_is_vector(NodeValue::Type type) { - return kVector.contains(type); + return type == kVec2 + || type == kVec3 + || type == kVec4; + } + + static bool type_is_buffer(NodeValue::Type type) + { + return type == kTexture + || type == kSamples; } static int get_number_of_keyframe_tracks(Type type);