Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
eecd1cda
Verified
Commit
eecd1cda
authored
3 years ago
by
Josch Morgenstern
Browse files
Options
Downloads
Patches
Plain Diff
[
#111
] simplify fragment shader
parent
8024e3ee
No related branches found
No related tags found
1 merge request
!95
Resolve "Wassersimulation mit Interaktion"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
projects/sph/shaders/shader_water.frag
+3
-22
3 additions, 22 deletions
projects/sph/shaders/shader_water.frag
with
3 additions
and
22 deletions
projects/sph/shaders/shader_water.frag
+
3
−
22
View file @
eecd1cda
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
layout
(
location
=
0
)
in
vec2
passTriangleCoordinates
;
layout
(
location
=
0
)
in
vec2
passTriangleCoordinates
;
layout
(
location
=
1
)
in
vec3
passVelocity
;
layout
(
location
=
1
)
in
vec3
passVelocity
;
layout
(
location
=
2
)
in
float
passlifeTime
;
layout
(
location
=
0
)
out
vec3
outColor
;
layout
(
location
=
0
)
out
vec3
outColor
;
...
@@ -20,27 +19,9 @@ layout(set=0,binding=1) uniform uPosition{
...
@@ -20,27 +19,9 @@ layout(set=0,binding=1) uniform uPosition{
void
main
()
void
main
()
{
{
float
normlt
=
1
-
normalize
(
passlifeTime
);
outColor
=
vec3
(
1
.
0
,
1
.
0
,
1
.
0
);
vec2
mouse
=
vec2
(
Position
.
position
.
x
,
Position
.
position
.
y
);
vec3
c0
=
vec3
(
0
.
2
,
0
.
5
,
1
);
vec3
c1
=
vec3
(
0
.
3
,
0
.
7
,
1
);
vec3
c2
=
vec3
(
0
.
5
,
0
.
9
,
1
);
vec3
c3
=
vec3
(
0
.
9
,
1
,
1
);
if
(
passlifeTime
<
1
){
outColor
=
mix
(
c0
,
c1
,
passlifeTime
);
}
else
if
(
passlifeTime
<
2
){
outColor
=
mix
(
c1
,
c2
,
passlifeTime
-
1
);
}
else
{
outColor
=
mix
(
c2
,
c3
,
clamp
((
passlifeTime
-
2
)
*
0
.
5
,
0
,
1
));
}
// make the triangle look like a circle
// make the triangle look like a circle
outColor
*=
circleFactor
(
passTriangleCoordinates
);
outColor
*=
circleFactor
(
passTriangleCoordinates
);
// fade out particle shortly before it dies
outColor
*=
clamp
(
passlifeTime
*
2
,
0
,
1
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment