Skip to content
Snippets Groups Projects

Fix compilation of geometry grass sample with latest glow

Merged Jonathan Kunstwald requested to merge feature/fix-geometry-grass-sample into master
3 files
+ 17
10
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -306,7 +306,11 @@ void GeometryGrassSample::init()
mGrassUBO = UniformBuffer::create();
mGrassUBO->bind().setData(mGrassUBOData);
mTrampleSSBOData.mowerPos = glm::vec2(0);
mTrampleSSBOData.mowerPosX = 0;
mTrampleSSBOData.mowerPosY = 0;
// mTrampleSSBOData.mowerPos = glm::vec2(0);
static auto constexpr mowerRange = .75f;
mTrampleSSBOData.mowerRangeSquared = mowerRange * mowerRange;
mTrampleSSBO = ShaderStorageBuffer::create();
@@ -381,8 +385,9 @@ void GeometryGrassSample::onRenderOpaquePass(glow::pipeline::RenderContext const
{
// UBO + SSBO Update
{
mTrampleSSBOData.mowerPos = mMowerPosition;
mTrampleSSBO->bind().setData(mTrampleSSBOData);
mTrampleSSBOData.mowerPosX = mMowerPosition.x;
mTrampleSSBOData.mowerPosY = mMowerPosition.y;
mTrampleSSBO->bind().setData(mTrampleSSBOData, GL_STREAM_DRAW);
applyConfigToUBO();
mGrassUBOData.cameraUp = getCamera()->handle.getTransform().getUpVector();
@@ -390,7 +395,7 @@ void GeometryGrassSample::onRenderOpaquePass(glow::pipeline::RenderContext const
mGrassUBOData.cleanVp = info.camData.cleanVp;
mGrassUBOData.prevCleanVp = info.camData.prevCleanVp;
mGrassUBOData.runtime = getCurrentTime();
mGrassUBO->bind().setData(mGrassUBOData);
mGrassUBO->bind().setData(mGrassUBOData, GL_STREAM_DRAW);
}
// Trampling and mowing
Loading