[fcelib][Python] rewrite version check, reduce fluff, refactor api

Author: bfut

python/fcecodecmodule.cpp

@@ -56,14 +56,18 @@ class Mesh : public FcelibMesh
   Mesh() : mesh_(*this) { FCELIB_MeshInit(&mesh_); }
   ~Mesh() { FCELIB_MeshRelease(&mesh_); }
 
+#if !defined(SCL_DEBUG) || SCL_DEBUG != 0
   // Service
-  bool MValid() const { return FCELIB_ValidateMesh(&mesh_); }
+  bool MValid() const { return FCELIB_MeshValidate(&mesh_); }
+#endif
 
   // Stats
   void PrintInfo() const { FCELIB_PrintMeshInfo(&mesh_); }
+#if !defined(SCL_DEBUG) || SCL_DEBUG != 0
   void PrintParts(void) const { FCELIB_PrintMeshParts(&mesh_); }
   void PrintTriags(void) const { FCELIB_PrintMeshTriangles(&mesh_); }
   void PrintVerts(void) const { FCELIB_PrintMeshVertices(&mesh_); }
+#endif
   int MNumParts() const { return mesh_.hdr.NumParts; }
   int MNumTriags() const { return mesh_.hdr.NumTriangles; }
   int MNumVerts() const { return mesh_.hdr.NumVertices; }
@@ -1090,7 +1094,8 @@ bool Mesh::OpDeletePart(const int pid)
 {
   if (pid > mesh_.hdr.NumParts || pid < 0)
     throw std::out_of_range("OpDeletePart: part index (pid) out of range");
-  return FCELIB_DeletePart(&mesh_, pid);
+  FCELIB_DeletePart(&mesh_, pid);
+  return 1;
 }
 
 bool Mesh::OpDeletePartTriags(const int pid, const std::vector<int> &idxs)
@@ -1149,17 +1154,21 @@ PYBIND11_MODULE(fcecodec, fcecodec_module, py::mod_gil_not_used())
 
   fcecodec_module.def("GetFceVersion", &FCECODECMODULE_GetFceVersion, py::arg("buf"), R"pbdoc( Returns 3 (FCE3), 4 (FCE4), 5 (FCE4M), negative (invalid) )pbdoc");
   fcecodec_module.def("PrintFceInfo", &FCECODECMODULE_PrintFceInfo, py::arg("buf"));
-  fcecodec_module.def("ValidateFce", &FCECODECMODULE_ValidateFce, py::arg("buf"), R"pbdoc( Returns 1 for valid FCE data, 0 otherwise. )pbdoc");
+  fcecodec_module.def("ValidateFce", &FCECODECMODULE_ValidateFce, py::arg("buf"), R"pbdoc( DEPRECATED as of 1.15 Returns 1 for valid FCE data, 0 otherwise. )pbdoc");  /* DEPRECATED as of 1.15 */
 
   py::class_<Mesh>(fcecodec_module, "Mesh", py::buffer_protocol())
     .def(py::init<>())
 
+#if !defined(SCL_DEBUG) || SCL_DEBUG != 0
     .def("MValid", &Mesh::MValid)
+#endif
 
     .def("PrintInfo", &Mesh::PrintInfo)
+#if !defined(SCL_DEBUG) || SCL_DEBUG != 0
     .def("PrintParts", &Mesh::PrintParts)
     .def("PrintTriags", &Mesh::PrintTriags)
     .def("PrintVerts", &Mesh::PrintVerts)
+#endif
     .def_property_readonly("MNumParts", &Mesh::MNumParts)
     .def_property_readonly("MNumTriags", &Mesh::MNumTriags)
     .def_property_readonly("MNumVerts", &Mesh::MNumVerts)

scripts/bfut_mywrappers.py

@@ -60,9 +60,8 @@ def GetFceVersion(path):
     return version
 
 def PrintFceInfo(path):
-    buf = fc.GetFceVersion(pathlib.Path(path).read_bytes())
+    buf = pathlib.Path(path).read_bytes()
     fc.PrintFceInfo(buf)
-    assert fc.ValidateFce(buf) == 1
 
 def LoadFce(mesh, path):
     mesh.IoDecode(pathlib.Path(path).read_bytes())
@@ -135,7 +134,7 @@ def FilterTexpageTriags(mesh, drop_texpages: int | list | None = None, select_te
     else:
         raise ValueError("FilterTexpageTriags: call with either drop_texpages or select_texpages, not both")
 
-    assert mesh.OpDelUnrefdVerts()
+    # assert mesh.OpDelUnrefdVerts()
     return mesh
 
 def DeleteEmptyParts(mesh):

setup.py

@@ -29,8 +29,8 @@
 # Available at setup time due to pyproject.toml
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 
-if os.environ.get("FCECVERBOSE") is not None:
-    print(f'FCECVERBOSE={os.environ["FCECVERBOSE"]}')
+if os.environ.get("SCL_DEBUG") is not None:
+    print(f'SCL_DEBUG={os.environ["SCL_DEBUG"]}')
 
 script_path = pathlib.Path(__file__).parent.resolve()
 os.chdir(script_path)
@@ -137,7 +137,7 @@
             # https://github.com/pybind/python_example/issues/12
             # https://github.com/pybind/python_example/blob/master/src/main.cpp
             ("VERSION_INFO", __version__),
-            ("FCECVERBOSE", os.environ.get("FCECVERBOSE", 0)),  # 0 if key not set
+            ("SCL_DEBUG", os.environ.get("SCL_DEBUG", 0)),  # 0 if key not set
         ],
         extra_compile_args=extra_compile_args
     ),