common: add entdict_t::get_vec3f

Author: ericwa

common/entdata.cc

@@ -83,6 +83,14 @@ int32_t entdict_t::get_vector(std::string_view key, qvec3f &vec) const
     return sscanf(value.data(), "%f %f %f", &vec[0], &vec[1], &vec[2]);
 }
 
+qvec3f entdict_t::get_vec3f(std::string_view key) const
+{
+    qvec3f result{};
+    if (3 == get_vector(key, result))
+        return result;
+    return {};
+}
+
 void entdict_t::set(std::string_view key, std::string_view value)
 {
     // search for existing key to update

include/common/entdata.h

@@ -47,6 +47,8 @@ class entdict_t
     int32_t get_int(std::string_view key) const;
     // returns number of vector components read
     int32_t get_vector(std::string_view key, qvec3f &out) const;
+    // returns {0 0 0} if we couldn't parse exactly 3 components
+    qvec3f get_vec3f(std::string_view key) const;
     void set(std::string_view key, std::string_view value);
     void remove(std::string_view key);
     void rename(std::string_view from, std::string_view to);

tests/test_common.cc

@@ -726,3 +726,20 @@ TEST(tests, logMessagesPrefix)
     logging::print("WARNING: something\n");
     EXPECT_THAT(get_current_test_log(), WarningMatcher);
 }
+
+TEST(entdict, getVec3f)
+{
+    entdict_t test;
+    test.set("vec3key1", "1 2 3");
+    test.set("vec3key2", "1.0 2.0 3.0");
+
+    EXPECT_EQ(qvec3f(1, 2, 3), test.get_vec3f("vec3key1"));
+    EXPECT_EQ(qvec3f(1, 2, 3), test.get_vec3f("vec3key2"));
+
+    test.set("fail1", "1");
+    test.set("fail2", "asdf");
+
+    EXPECT_EQ(qvec3f(0, 0, 0), test.get_vec3f("fail1"));
+    EXPECT_EQ(qvec3f(0, 0, 0), test.get_vec3f("fail2"));
+    EXPECT_EQ(qvec3f(0, 0, 0), test.get_vec3f("fail3"));
+}