Moved WaveFrontReader to DX namespace

microsoft · Oct 8, 2024 · d3d2d59 · d3d2d59
1 parent 70c5fe0
commit d3d2d59
Show file tree

Hide file tree

Showing 2 changed files with 577 additions and 572 deletions.
diff --git a/Meshconvert/MeshOBJ.cpp b/Meshconvert/MeshOBJ.cpp
@@ -65,7 +65,9 @@ HRESULT LoadFromOBJ(
     bool ccw,
     bool dds)
 {
-    WaveFrontReader<uint32_t> wfReader;
+    using Vertex = DX::WaveFrontReader<uint32_t>::Vertex;
+
+    DX::WaveFrontReader<uint32_t> wfReader;
     HRESULT hr = wfReader.Load(szFilename, ccw);
     if (FAILED(hr))
         return hr;
@@ -117,7 +119,7 @@ HRESULT LoadFromOBJ(
     if (FAILED(hr))
         return hr;
 
-    hr = vbr.AddStream(wfReader.vertices.data(), wfReader.vertices.size(), 0, sizeof(WaveFrontReader<uint32_t>::Vertex));
+    hr = vbr.AddStream(wfReader.vertices.data(), wfReader.vertices.size(), 0, sizeof(Vertex));
     if (FAILED(hr))
         return hr;