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
0704aff5
Commit
0704aff5
authored
3 years ago
by
Katharina Krämer
Browse files
Options
Downloads
Patches
Plain Diff
[
#69
][Fix] removed deprecated particle creation
parent
1b0bdc75
No related branches found
No related tags found
1 merge request
!56
Resolve "Partikelsystem"
Pipeline
#25893
passed
3 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
projects/particle_simulation/src/main.cpp
+0
-13
0 additions, 13 deletions
projects/particle_simulation/src/main.cpp
with
0 additions
and
13 deletions
projects/particle_simulation/src/main.cpp
+
0
−
13
View file @
0704aff5
...
@@ -161,19 +161,6 @@ int main(int argc, const char **argv) {
...
@@ -161,19 +161,6 @@ int main(int argc, const char **argv) {
std
::
uniform_real_distribution
<
float
>
rdmVel
(
-
0.1
f
,
0.1
f
);
std
::
uniform_real_distribution
<
float
>
rdmVel
(
-
0.1
f
,
0.1
f
);
std
::
default_random_engine
rdmEngine
;
std
::
default_random_engine
rdmEngine
;
ParticleSystem
particleSystem
;
particleSystem
.
setMaxLifeTime
(
3.
f
);
glm
::
vec3
vel0
=
glm
::
vec3
(
rdmVel
(
rdmEngine
),
rdmVel
(
rdmEngine
),
0.0
f
);
glm
::
vec3
vel1
=
glm
::
vec3
(
rdmVel
(
rdmEngine
),
rdmVel
(
rdmEngine
),
0.0
f
);
glm
::
vec3
vel2
=
glm
::
vec3
(
rdmVel
(
rdmEngine
),
rdmVel
(
rdmEngine
),
0.0
f
);
particleSystem
.
addParticles
({
Particle
(
glm
::
vec3
(
0.
f
,
1.
f
,
0.0
f
),
vel0
,
1.
f
),
Particle
(
glm
::
vec3
(
0.2
f
,
0.1
f
,
0.0
f
),
vel1
,
1.5
f
),
Particle
(
glm
::
vec3
(
0.15
f
,
0.
f
,
0.0
f
),
vel2
,
2.
f
),
Particle
(
glm
::
vec3
(
-
0.15
f
,
0.1
f
,
0.0
f
),
vel2
,
2.5
f
),
Particle
(
glm
::
vec3
(
0.25
f
,
0.
f
,
0.0
f
),
vel2
,
3.
f
),
Particle
(
glm
::
vec3
(
-
0.15
f
,
0.2
f
,
0.0
f
),
vel2
,
3.5
f
)});
glm
::
vec2
pos
=
glm
::
vec2
(
0.
f
);
glm
::
vec2
pos
=
glm
::
vec2
(
0.
f
);
glm
::
vec3
spawnPosition
=
glm
::
vec3
(
0.
f
);
glm
::
vec3
spawnPosition
=
glm
::
vec3
(
0.
f
);
glm
::
vec4
tempPosition
=
glm
::
vec4
(
0.
f
);
glm
::
vec4
tempPosition
=
glm
::
vec4
(
0.
f
);
...
...
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