Replace Gfx 3D API backends with sokol_gfx.h

code/Modules/Assets/CMakeLists.txt

@@ -2,24 +2,10 @@ fips_begin_module(Assets)
     fips_vs_warning_level(3)
     fips_dir(Gfx)
     fips_files(
+        FullscreenQuadBuilder.cc FullscreenQuadBuilder.h
         MeshBuilder.cc MeshBuilder.h
         ShapeBuilder.cc ShapeBuilder.h
         VertexWriter.cc VertexWriter.h
         TextureLoader.cc TextureLoader.h
-        OmshParser.cc OmshParser.h
-        MeshLoader.cc MeshLoader.h
     )
 fips_end_module()
-
-fips_begin_unittest(Assets)
-    fips_vs_warning_level(3)
-    fips_dir(UnitTests)
-    fips_files(
-        MeshBuilderTest.cc
-        ShapeBuilderTest.cc
-        VertexWriterTest.cc
-    )
-    fips_deps(Gfx Assets)
-fips_end_unittest()
-
-

code/Modules/Assets/Gfx/FullscreenQuadBuilder.cc

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//  FullscreenQuadBuilder.cc
+//------------------------------------------------------------------------------
+#include "Pre.h"
+#include "FullscreenQuadBuilder.h"
+
+namespace Oryol {
+
+static const float vertsNoFlip[20] = {
+    -1.0f, +1.0f, 0.0f, 0.0f, 1.0f,
+    +1.0f, +1.0f, 0.0f, 1.0f, 1.0f,
+    -1.0f, -1.0f, 0.0f, 0.0f, 0.0f,
+    +1.0f, -1.0f, 0.0f, 1.0f, 0.0f
+};
+
+static const float vertsFlip[20] = {
+    -1.0f, +1.0f, 0.0f, 0.0f, 0.0f,
+    +1.0f, +1.0f, 0.0f, 1.0f, 0.0f,
+    -1.0f, -1.0f, 0.0f, 0.0f, 1.0f,
+    +1.0f, -1.0f, 0.0f, 1.0f, 1.0f
+};
+
+static_assert(sizeof(vertsNoFlip) == sizeof(vertsFlip), "FullscreenQuadBuilder");
+
+FullscreenQuadBuilder::Result
+FullscreenQuadBuilder::Build() {
+    Result res;
+    res.VertexBufferDesc
+        .SetType(BufferType::VertexBuffer)
+        .SetSize(sizeof(vertsNoFlip))
+        .SetContent(this->flipV ? vertsFlip : vertsNoFlip);
+    res.PipelineDesc
+        .SetLayout(0, {
+            { "position", VertexFormat::Float3 },
+            { "texcoord0", VertexFormat::Float2 }
+        })
+        .SetPrimitiveType(PrimitiveType::TriangleStrip);
+    return res;
+}
+
+} // namespace Oryol

code/Modules/Assets/Gfx/FullscreenQuadBuilder.h

@@ -0,0 +1,49 @@
+#pragma once
+//------------------------------------------------------------------------------
+/**
+    @class Oryol::FullscreenQuadBuilder
+    @ingroup Assets
+    @brief helper class to build a fullscreen quad mesh.
+
+    FIXME: probably makes sense to rewrite this to a single triangle
+
+    Positions (vertex attr name: "position")
+    0:  -1.0,+1.0,0.0
+    1:  +1.0,+1.0,0.0
+    2:  -1.0,-1.0,0.0
+    3:  +1.0,-1.0,0.0
+
+    UV Coords (vertex attr name: "texcoord0", FlipV == false:
+    0:  0.0, 1.0
+    1:  1.0, 1.0
+    2:  0.0, 0.0
+    3:  1.0, 0.0
+
+    UV Coords, FlipV == true:
+    0:  0.0, 0.0
+    1:  1.0, 0.0
+    2:  0.0, 1.0
+    3:  1.0, 1.0
+*/
+#include "Gfx/GfxTypes.h"
+
+namespace Oryol {
+
+class FullscreenQuadBuilder {
+public:
+    struct Result {
+        BufferDesc VertexBufferDesc;
+        struct PipelineDesc PipelineDesc;  // blueprint pipeline desc
+        int NumElements = 4;        // rendered as triangle strip
+    };
+    bool flipV = false;
+
+    // texture v coord is (1.0 - y) 
+    FullscreenQuadBuilder& FlipV(bool b) { flipV = b; return *this; }
+    bool FlipV() const { return flipV; }
+
+    // populate and return Result object
+    Result Build();
+};
+
+} // namespace Oryol

code/Modules/Assets/Gfx/MeshBuilder.cc

@@ -4,64 +4,55 @@
 #include "Pre.h"
 #include "MeshBuilder.h"
 #include "Core/Assertion.h"
-#include <cstring>
 
 namespace Oryol {
 
 //------------------------------------------------------------------------------
-MeshBuilder&
-MeshBuilder::Begin() {
-    o_assert(!this->inBegin);
-    o_assert(this->NumVertices > 0);
-    o_assert(!this->Layout.Empty());
-    this->inBegin = true;
-
-    // setup MeshSetup object
-    MeshSetup& meshSetup = this->setupAndData.Setup;
-    meshSetup = MeshSetup::FromData(this->VertexUsage, this->IndexUsage);
-    meshSetup.Layout = this->Layout;
-    meshSetup.NumVertices = this->NumVertices;
-    meshSetup.NumIndices = this->NumIndices;
-    meshSetup.IndicesType = this->IndicesType;
-    for (const auto& primGroup : this->PrimitiveGroups) {
-        meshSetup.AddPrimitiveGroup(primGroup);
-    }
-
-    // compute the required stream size
-    const int vbSize  = Memory::RoundUp(this->NumVertices * this->Layout.ByteSize(), 4);
-    const int ibSize  = this->NumIndices * IndexType::ByteSize(this->IndicesType);
+MeshBuilder::Result
+MeshBuilder::Build(std::function<void(MeshBuilder& mb)> func) {
+    o_assert_dbg(!this->inBuild);
+    o_assert_dbg(this->numVertices > 0);
+    o_assert_dbg(!this->layout.Empty());
+    this->inBuild = true;
+
+    // compute the data buffer size
+    const int vbSize  = this->numVertices * this->layout.ByteSize();
+    const int ibSize  = this->numIndices * IndexType::ByteSize(this->indexType);
     int allSize = vbSize + ibSize;
-    meshSetup.VertexDataOffset = 0;
-    if (ibSize > 0) {
-        meshSetup.IndexDataOffset = vbSize;
-    }
-
+
     // setup the data buffer object
-    this->vertexPointer = this->setupAndData.Data.Add(allSize);
+    this->vertexPointer = (uint8_t*) Memory::Alloc(allSize);
     this->indexPointer  = this->vertexPointer + vbSize;
     this->endPointer    = this->indexPointer + ibSize;
-
-    return *this;
-}
 
-//------------------------------------------------------------------------------
-SetupAndData<MeshSetup>
-MeshBuilder::Build() {
-    o_assert(this->inBegin);
-
-    this->inBegin = false;
-
-    // NOTE: explicit moves required by VS2013
-    SetupAndData<MeshSetup> result(std::move(this->setupAndData));
-
-    // clear private data, not configuration data
+    // call the content-build function
+    func(*this);
+
+    // setup the Result object
+    Result res;
+    res.Data.MoveRaw(this->vertexPointer, allSize);
+    res.Layout = this->layout;
+    res.IndexType = this->indexType;
+    res.VertexBufferDesc = BufferDesc()
+        .SetSize(vbSize)
+        .SetType(BufferType::VertexBuffer)
+        .SetUsage(this->vertexUsage)
+        .SetContent(this->vertexPointer);
+    if (ibSize > 0) {
+        res.IndexBufferDesc = BufferDesc()
+            .SetSize(ibSize)
+            .SetType(BufferType::IndexBuffer)
+            .SetUsage(this->indexUsage)
+            .SetContent(this->indexPointer);
+    }
+    else {
+        res.IndexBufferDesc = BufferDesc();
+    }
+    this->inBuild = false;
     this->vertexPointer = nullptr;
     this->indexPointer = nullptr;
     this->endPointer = nullptr;
-    this->setupAndData.Setup = MeshSetup::FromData();
-    this->setupAndData.Data.Clear();
-
-    return result;
+    return res;
 }
 
 } // namespace Oryol