diff options
| author | Dan Goodliffe <dan.goodliffe@octal.co.uk> | 2026-03-06 14:22:28 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan.goodliffe@octal.co.uk> | 2026-03-06 14:22:28 +0000 |
| commit | cf0ecc35ed114c6bf54fce9c6228d60dbba1a3b5 (patch) | |
| tree | 7ad39a785511e5137859dbef6c940124182b8447 /game/scenary/foliage.cpp | |
| parent | Extend glVertexArray with VertexArrayConfigurator (diff) | |
| download | ilt-cf0ecc35ed114c6bf54fce9c6228d60dbba1a3b5.tar.bz2 ilt-cf0ecc35ed114c6bf54fce9c6228d60dbba1a3b5.tar.xz ilt-cf0ecc35ed114c6bf54fce9c6228d60dbba1a3b5.zip | |
Replace use of VertexArrayObject with glVertexArray/glBuffer DSA versions
Diffstat (limited to 'game/scenary/foliage.cpp')
| -rw-r--r-- | game/scenary/foliage.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp index 0981ffc..49a4831 100644 --- a/game/scenary/foliage.cpp +++ b/game/scenary/foliage.cpp @@ -4,7 +4,6 @@ #include "gfx/gl/sceneShader.h" #include "gfx/gl/shadowMapper.h" #include "gfx/gl/shadowStenciller.h" -#include "gfx/gl/vertexArrayObject.h" #include <location.h> static_assert(std::is_constructible_v<Foliage>); @@ -38,11 +37,11 @@ void Foliage::postLoad() { texture = getTexture(); - bodyMesh->configureVAO(instanceVAO) + bodyMesh->configureVAO(instanceVAO, 0) .addAttribs<LocationVertex, &LocationVertex::rotation, &LocationVertex::position>( - instances.bufferName(), 1); - VertexArrayObject {instancePointVAO}.addAttribs<LocationVertex, &LocationVertex::position, &LocationVertex::yaw>( - instances.bufferName()); + 1, instances.bufferName()); + instancePointVAO.configure().addAttribs<LocationVertex, &LocationVertex::position, &LocationVertex::yaw>( + 0, instances.bufferName()); const auto & size = bodyMesh->getDimensions().size; billboardSize = billboardTextureSizeForObject(size); |