Support ptex mesh - step 3: better naming

src/esp/assets/PTexMeshData.cpp

@@ -579,10 +579,10 @@ void PTexMeshData::uploadBuffersToGPU(bool forceReload) {
         std::make_unique<PTexMeshData::RenderingBuffer>());
 
     auto& currentMesh = renderingBuffers_.back();
-    currentMesh->vbo.setData(submeshes_[iMesh].vbo,
-                             Magnum::GL::BufferUsage::StaticDraw);
-    currentMesh->ibo.setData(submeshes_[iMesh].ibo,
-                             Magnum::GL::BufferUsage::StaticDraw);
+    currentMesh->vertexBuffer.setData(submeshes_[iMesh].vbo,
+                                      Magnum::GL::BufferUsage::StaticDraw);
+    currentMesh->indexBuffer.setData(submeshes_[iMesh].ibo,
+                                     Magnum::GL::BufferUsage::StaticDraw);
   }
   LOG(INFO) << "... done" << std::endl;
 
@@ -598,19 +598,21 @@ void PTexMeshData::uploadBuffersToGPU(bool forceReload) {
   for (int iMesh = 0; iMesh < submeshes_.size(); ++iMesh) {
     auto& currentMesh = renderingBuffers_[iMesh];
 
-    currentMesh->adjTex.setBuffer(Magnum::GL::BufferTextureFormat::R32UI,
-                                  currentMesh->abo);
-    currentMesh->abo.setData(adjFaces[iMesh],
-                             Magnum::GL::BufferUsage::StaticDraw);
+    currentMesh->adjFacesBufferTexture.setBuffer(
+        Magnum::GL::BufferTextureFormat::R32UI, currentMesh->adjFacesBuffer);
+    currentMesh->adjFacesBuffer.setData(adjFaces[iMesh],
+                                        Magnum::GL::BufferUsage::StaticDraw);
+    GLintptr offset = 0;
     currentMesh->mesh
         .setPrimitive(Magnum::GL::MeshPrimitive::LinesAdjacency)
         // Warning:
         // CANNOT use currentMesh.ibo.size() when calling
         // setCount because that returns the number of bytes of the buffer, NOT
         // the index counts
         .setCount(submeshes_[iMesh].ibo.size())
-        .addVertexBuffer(currentMesh->vbo, 0, gfx::PTexMeshShader::Position{})
-        .setIndexBuffer(currentMesh->ibo, 0,
+        .addVertexBuffer(currentMesh->vertexBuffer, offset,
+                         gfx::PTexMeshShader::Position{})
+        .setIndexBuffer(currentMesh->indexBuffer, offset,
                         Magnum::GL::MeshIndexType::UnsignedInt);
   }
 
@@ -627,9 +629,10 @@ void PTexMeshData::uploadBuffersToGPU(bool forceReload) {
     Cr::Containers::Array<const char, Cr::Utility::Directory::MapDeleter> data =
         Cr::Utility::Directory::mapRead(rgbFile);
     const int dim = static_cast<int>(std::sqrt(data.size() / 3));  // square
+
     Magnum::ImageView2D image(Magnum::PixelFormat::RGB8UI, {dim, dim}, data);
     renderingBuffers_[iMesh]
-        ->tex.setWrapping(Magnum::GL::SamplerWrapping::ClampToEdge)
+        ->atlasTexture.setWrapping(Magnum::GL::SamplerWrapping::ClampToEdge)
         .setMagnificationFilter(Magnum::GL::SamplerFilter::Linear)
         .setMinificationFilter(Magnum::GL::SamplerFilter::Linear)
         // .setStorage(1, GL::TextureFormat::RGB8UI, image.size())

src/esp/assets/PTexMeshData.h

@@ -30,11 +30,14 @@ class PTexMeshData : public BaseMesh {
 
   struct RenderingBuffer {
     Magnum::GL::Mesh mesh;
-    Magnum::GL::Texture2D tex;
-    Magnum::GL::Buffer vbo;
-    Magnum::GL::Buffer ibo;
-    Magnum::GL::Buffer abo;
-    Magnum::GL::BufferTexture adjTex;
+    Magnum::GL::Texture2D atlasTexture;
+    Magnum::GL::Buffer vertexBuffer;
+    Magnum::GL::Buffer indexBuffer;
+    Magnum::GL::Buffer adjFacesBuffer;
+    Magnum::GL::BufferTexture adjFacesBufferTexture;
+
+    RenderingBuffer()
+        : adjFacesBuffer{Magnum::GL::Buffer::TargetHint::Texture} {}
   };
 
   PTexMeshData() : BaseMesh(SupportedMeshType::PTEX_MESH) {}

src/esp/gfx/PTexMeshDrawable.cpp

@@ -17,17 +17,18 @@ PTexMeshDrawable::PTexMeshDrawable(
     Magnum::SceneGraph::DrawableGroup3D* group /* = nullptr */)
     : Drawable{node, shader, ptexMeshData.getRenderingBuffer(submeshID)->mesh,
                group},
-      tex_(ptexMeshData.getRenderingBuffer(submeshID)->tex),
-      adjTex_(ptexMeshData.getRenderingBuffer(submeshID)->adjTex),
+      atlasTexture_(ptexMeshData.getRenderingBuffer(submeshID)->atlasTexture),
+      adjFacesBufferTexture_(
+          ptexMeshData.getRenderingBuffer(submeshID)->adjFacesBufferTexture),
       tileSize_(ptexMeshData.tileSize()),
       exposure_(ptexMeshData.exposure()) {}
 
 void PTexMeshDrawable::draw(const Magnum::Matrix4& transformationMatrix,
                             Magnum::SceneGraph::Camera3D& camera) {
   PTexMeshShader& ptexMeshShader = static_cast<PTexMeshShader&>(shader_);
-  ptexMeshShader.setPTexUniforms(tex_, tileSize_, exposure_)
-      .bindAtlasTexture(tex_)
-      .bindAdjFacesBufferTexture(adjTex_)
+  ptexMeshShader.setPTexUniforms(atlasTexture_, tileSize_, exposure_)
+      .bindAtlasTexture(atlasTexture_)
+      .bindAdjFacesBufferTexture(adjFacesBufferTexture_)
       .setMVPMatrix(camera.projectionMatrix() * transformationMatrix);
   mesh_.draw(ptexMeshShader);
 }

src/esp/gfx/PTexMeshDrawable.h

@@ -28,8 +28,8 @@ class PTexMeshDrawable : public Drawable {
   virtual void draw(const Magnum::Matrix4& transformationMatrix,
                     Magnum::SceneGraph::Camera3D& camera) override;
 
-  Magnum::GL::Texture2D& tex_;
-  Magnum::GL::BufferTexture& adjTex_;
+  Magnum::GL::Texture2D& atlasTexture_;
+  Magnum::GL::BufferTexture& adjFacesBufferTexture_;
   uint32_t tileSize_;
   float exposure_;
 };

src/esp/gfx/PTexMeshShader.h

@@ -41,8 +41,8 @@ class PTexMeshShader : public Magnum::GL::AbstractShaderProgram {
                                   int submeshID,
                                   uint32_t tileSize,
                                   float exposure) {
-    setPTexUniforms(ptexMeshData.getRenderingBuffer(submeshID)->tex, tileSize,
-                    exposure);
+    setPTexUniforms(ptexMeshData.getRenderingBuffer(submeshID)->atlasTexture,
+                    tileSize, exposure);
     return *this;
   }