Add 'operator<<' for tinyusdz::Interpolation

lighttransport · Jun 7, 2024 · 3666b55 · 3666b55
1 parent 2c43e48
commit 3666b55
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 11 deletions.
diff --git a/src/pprinter.cc b/src/pprinter.cc
@@ -85,12 +85,18 @@ std::string pquote(const Path &p) {
 
 namespace std {
 
-std::ostream &operator<<(std::ostream &ofs, tinyusdz::Visibility v) {
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Visibility v) {
   ofs << to_string(v);
   return ofs;
 }
 
-std::ostream &operator<<(std::ostream &ofs, tinyusdz::Extent v) {
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Extent v) {
+  ofs << to_string(v);
+
+  return ofs;
+}
+
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Interpolation v) {
   ofs << to_string(v);
 
   return ofs;

diff --git a/src/pprinter.hh b/src/pprinter.hh
@@ -277,8 +277,9 @@ std::string print_collection(const Collection *coll, const uint32_t indent);
 
 namespace std {
 
-std::ostream &operator<<(std::ostream &ofs, tinyusdz::Visibility v);
-std::ostream &operator<<(std::ostream &ofs, tinyusdz::Extent v);
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Visibility v);
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Extent v);
+std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Interpolation v);
 std::ostream &operator<<(std::ostream &ofs, const tinyusdz::Layer &layer);
 
 }  // namespace std
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -8,6 +8,7 @@ set(TEST_SOURCES
 	unit-prim-types.cc
 	unit-primvar.cc
 	unit-pathutil.cc
+	unit-pprint.cc
 	unit-strutil.cc
 	unit-value-types.cc
 	unit-xform.cc

diff --git a/tests/unit/unit-main.cc b/tests/unit/unit-main.cc
@@ -15,6 +15,7 @@
 #include "unit-ioutil.h"
 #include "unit-strutil.h"
 #include "unit-timesamples.h"
+#include "unit-pprint.h"
 
 #if defined(TINYUSDZ_WITH_PXR_COMPAT_API)
 #include "unit-pxr-compat-api.h"

diff --git a/tests/unit/unit-pprint.cc b/tests/unit/unit-pprint.cc
@@ -0,0 +1,31 @@
+#ifdef _MSC_VER
+#define NOMINMAX
+#endif
+
+#define TEST_NO_MAIN
+#include "acutest.h"
+
+#include "unit-pprint.h"
+#include "prim-types.hh"
+#include "value-types.hh"
+#include "value-pprint.hh"
+#include "pprinter.hh"
+
+using namespace tinyusdz;
+
+void value_type_pprint_test(void) {
+
+  {
+    std::stringstream ss;
+    tinyusdz::Interpolation interp = tinyusdz::Interpolation::Vertex;
+    ss << interp;
+    TEST_CHECK(ss.str() == "vertex");
+  }
+
+  {
+    value::normal3f v{1.0f, 2.0f, 3.f};
+    std::string s = to_string(v);
+    TEST_CHECK(s == "(1, 2, 3)");
+  }
+}
+
diff --git a/tests/unit/unit-pprint.h b/tests/unit/unit-pprint.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void value_type_pprint_test(void);
diff --git a/tests/unit/unit-value-types.cc b/tests/unit/unit-value-types.cc
@@ -7,7 +7,6 @@
 
 #include "unit-value-types.h"
 #include "value-types.hh"
-#include "value-pprint.hh"
 
 using namespace tinyusdz;
 
@@ -28,11 +27,5 @@ void value_types_test(void) {
 
   TEST_CHECK(!value::TryGetTypeName(value::TYPE_ID_ALL));
 
-  // pprint test
-  {
-    value::normal3f v{1.0f, 2.0f, 3.f};
-    std::string s = to_string(v);
-    TEST_CHECK(s == "(1, 2, 3)");
-  }
 }