summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--game/scenary/foliage.cpp4
-rw-r--r--game/scenary/illuminator.cpp2
-rw-r--r--game/vehicles/railVehicleClass.cpp12
-rw-r--r--game/water.cpp2
-rw-r--r--gfx/gl/billboardPainter.cpp2
-rw-r--r--gfx/gl/shadowStenciller.cpp2
-rw-r--r--gfx/models/mesh.cpp12
-rw-r--r--gfx/models/mesh.h30
8 files changed, 33 insertions, 33 deletions
diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp
index edfb0e9..bd88a06 100644
--- a/game/scenary/foliage.cpp
+++ b/game/scenary/foliage.cpp
@@ -113,7 +113,7 @@ Foliage::render(const SceneShader & shader, const Frustum &) const
texture->bind();
}
instanceVAO.useBuffer(1, instances);
- bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
+ bodyMesh->drawInstanced(instanceVAO, static_cast<GLsizei>(count));
}
}
}
@@ -142,7 +142,7 @@ Foliage::shadows(const ShadowMapper & mapper, const Frustum &) const
mapper.dynamicPointInst.use();
}
instanceVAO.useBuffer(1, instances);
- bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
+ bodyMesh->drawInstanced(instanceVAO, static_cast<GLsizei>(count));
}
}
}
diff --git a/game/scenary/illuminator.cpp b/game/scenary/illuminator.cpp
index 1dd0644..0c5919a 100644
--- a/game/scenary/illuminator.cpp
+++ b/game/scenary/illuminator.cpp
@@ -75,7 +75,7 @@ Illuminator::render(const SceneShader & shader, const Frustum &) const
texture->bind();
}
instanceVAO.useBuffer(1, instances);
- bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
+ bodyMesh->drawInstanced(instanceVAO, static_cast<GLsizei>(count));
}
}
diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index 2bdd7c4..6e8870a 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -55,9 +55,9 @@ RailVehicleClass::render(const SceneShader & shader, const Frustum &) const
instanceVAO.useBuffer(1, instances);
instancesBogiesVAO.front().useBuffer(1, instances);
instancesBogiesVAO.back().useBuffer(1, instances);
- bodyMesh->DrawInstanced(instanceVAO, count);
- bogies.front()->DrawInstanced(instancesBogiesVAO.front(), count);
- bogies.back()->DrawInstanced(instancesBogiesVAO.back(), count);
+ bodyMesh->drawInstanced(instanceVAO, count);
+ bogies.front()->drawInstanced(instancesBogiesVAO.front(), count);
+ bogies.back()->drawInstanced(instancesBogiesVAO.back(), count);
}
}
@@ -66,8 +66,8 @@ RailVehicleClass::shadows(const ShadowMapper & mapper, const Frustum &) const
{
if (const auto count = static_cast<GLsizei>(instances.size())) {
mapper.dynamicPointInst.use();
- bodyMesh->DrawInstanced(instanceVAO, count);
- bogies.front()->DrawInstanced(instancesBogiesVAO.front(), count);
- bogies.back()->DrawInstanced(instancesBogiesVAO.back(), count);
+ bodyMesh->drawInstanced(instanceVAO, count);
+ bogies.front()->drawInstanced(instancesBogiesVAO.front(), count);
+ bogies.back()->drawInstanced(instancesBogiesVAO.back(), count);
}
}
diff --git a/game/water.cpp b/game/water.cpp
index 0657214..0f72918 100644
--- a/game/water.cpp
+++ b/game/water.cpp
@@ -106,5 +106,5 @@ Water::render(const SceneShader & shader, const Frustum &) const
{
shader.water.use(waveCycle);
water->bind();
- meshes.apply(&MeshT<GlobalPosition3D>::Draw);
+ meshes.apply(&MeshT<GlobalPosition3D>::draw);
}
diff --git a/gfx/gl/billboardPainter.cpp b/gfx/gl/billboardPainter.cpp
index 38c4d3e..d021efb 100644
--- a/gfx/gl/billboardPainter.cpp
+++ b/gfx/gl/billboardPainter.cpp
@@ -90,5 +90,5 @@ BillboardPainter::renderBillBoard(
const auto & view) {
return this->view * view * extentsMat;
}});
- mesh.Draw();
+ mesh.draw();
}
diff --git a/gfx/gl/shadowStenciller.cpp b/gfx/gl/shadowStenciller.cpp
index cc25f30..3625524 100644
--- a/gfx/gl/shadowStenciller.cpp
+++ b/gfx/gl/shadowStenciller.cpp
@@ -75,5 +75,5 @@ ShadowStenciller::renderStencil(const glTexture & stencil, const MeshBase & mesh
const auto & viewProjection) {
return viewProjection * extentsMat;
}});
- mesh.Draw();
+ mesh.draw();
}
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index 2eae160..88314ae 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -1,7 +1,7 @@
#include "mesh.h"
MeshBase::MeshBase(GLsizei m_numIndices, GLenum mode, const std::vector<RelativePosition3D> & positions) :
- m_numIndices {m_numIndices}, mode {mode}, dimensions {positions}
+ numIndices {m_numIndices}, mode {mode}, dimensions {positions}
{
}
@@ -29,21 +29,21 @@ MeshBase::Dimensions::extents(const std::span<const RelativePosition3D> position
}
void
-MeshBase::Draw() const
+MeshBase::draw() const
{
- glBindVertexArray(m_vertexArrayObject);
+ glBindVertexArray(vertexArrayObject);
- glDrawElements(mode, m_numIndices, GL_UNSIGNED_INT, nullptr);
+ glDrawElements(mode, numIndices, GL_UNSIGNED_INT, nullptr);
glBindVertexArray(0);
}
void
-MeshBase::DrawInstanced(GLuint vao, GLsizei count, GLuint base) const
+MeshBase::drawInstanced(GLuint vao, GLsizei count, GLuint base) const
{
glBindVertexArray(vao);
- glDrawElementsInstancedBaseInstance(mode, m_numIndices, GL_UNSIGNED_INT, nullptr, count, base);
+ glDrawElementsInstancedBaseInstance(mode, numIndices, GL_UNSIGNED_INT, nullptr, count, base);
glBindVertexArray(0);
}
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index e78d27e..f578625 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -15,19 +15,19 @@ public:
class Dimensions {
public:
using Extents1D = std::ranges::minmax_result<RelativeDistance>;
- explicit Dimensions(const std::span<const RelativePosition3D>);
+ explicit Dimensions(std::span<const RelativePosition3D>);
RelativePosition3D minExtent, maxExtent;
RelativePosition3D centre;
RelativeDistance size;
private:
- Dimensions(const std::span<const RelativePosition3D>, const std::array<Extents1D, 3> &);
- static Extents1D extents(const std::span<const RelativePosition3D>, glm::length_t D);
+ Dimensions(std::span<const RelativePosition3D>, const std::array<Extents1D, 3> &);
+ static Extents1D extents(std::span<const RelativePosition3D>, glm::length_t);
};
- void Draw() const;
- void DrawInstanced(GLuint vao, GLsizei count, GLuint base = 0) const;
+ void draw() const;
+ void drawInstanced(GLuint vao, GLsizei count, GLuint base = 0) const;
[[nodiscard]] const Dimensions &
getDimensions() const
@@ -36,11 +36,11 @@ public:
}
protected:
- MeshBase(GLsizei m_numIndices, GLenum mode, const std::vector<RelativePosition3D> &);
+ MeshBase(GLsizei numIndices, GLenum mode, const std::vector<RelativePosition3D> &);
- glVertexArray m_vertexArrayObject;
- glBuffers<2> m_vertexArrayBuffers;
- GLsizei m_numIndices;
+ glVertexArray vertexArrayObject;
+ glBuffers<2> vertexArrayBuffers;
+ GLsizei numIndices;
GLenum mode;
Dimensions dimensions;
};
@@ -49,19 +49,19 @@ template<typename V> class MeshT : public MeshBase, public ConstTypeDefs<MeshT<V
public:
MeshT(const std::span<const V> vertices, const std::span<const unsigned int> indices, GLenum mode = GL_TRIANGLES) :
MeshBase {static_cast<GLsizei>(indices.size()), mode,
- materializeRange(vertices | std::views::transform([](const auto & v) {
- return static_cast<RelativePosition3D>(v.pos);
+ materializeRange(vertices | std::views::transform([](const auto & vertex) {
+ return static_cast<RelativePosition3D>(vertex.pos);
}))}
{
- m_vertexArrayBuffers[0].storage(vertices, 0);
- m_vertexArrayBuffers[1].storage(indices, 0);
- configureVAO(m_vertexArrayObject, 0);
+ vertexArrayBuffers[0].storage(vertices, 0);
+ vertexArrayBuffers[1].storage(indices, 0);
+ configureVAO(vertexArrayObject, 0);
}
auto
configureVAO(glVertexArray & vao, GLuint divisor) const
{
- return vao.configure().addAttribsFor<V>(divisor, m_vertexArrayBuffers[0]).addIndices(m_vertexArrayBuffers[1]);
+ return vao.configure().addAttribsFor<V>(divisor, vertexArrayBuffers[0]).addIndices(vertexArrayBuffers[1]);
}
};
generated by cgit v1.3 (git 2.53.0) at 2026-03-09 14:26:22 +0000