Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Zhengjiang Hu
glow-samples
Commits
c7b11b5e
Commit
c7b11b5e
authored
Apr 22, 2019
by
Jonathan Kunstwald
Browse files
Fix compilation of geometry grass sample with latest glow
parent
5e904faa
Changes
3
Hide whitespace changes
Inline
Side-by-side
samples/wip/geometry-grass/GeometryGrassSample.cc
View file @
c7b11b5e
...
...
@@ -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
=
.75
f
;
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
...
...
samples/wip/geometry-grass/GeometryGrassSample.hh
View file @
c7b11b5e
...
...
@@ -39,15 +39,17 @@ struct GrassUBOData
struct
Trampler
{
gl
ow
::
std140
vec2
pos
;
gl
ow
::
std140
vec2
velocity
;
gl
m
::
vec2
pos
;
gl
m
::
vec2
velocity
;
};
struct
TrampleSSBOData
{
glow
::
std140vec2
mowerPos
;
glow
::
std140float
mowerRangeSquared
=
1.
f
;
std
::
vector
<
Trampler
>
tramplers
;
float
mowerPosX
;
float
mowerPosY
;
// glm::vec2 mowerPos;
float
mowerRangeSquared
=
1.
f
;
// std::vector<Trampler> tramplers;
};
}
...
...
samples/wip/geometry-grass/trample.csh
View file @
c7b11b5e
...
...
@@ -15,7 +15,7 @@ layout(std430) buffer sTrampleInfo
vec2 mowerPosition;
float mowerRange2;
Trampler tramplers[];
//
Trampler tramplers[];
} ssboTrampleInfo;
void main()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment