Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
bc94203a
Commit
bc94203a
authored
Sep 24, 2019
by
clayjohn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix particles scale randomization
parent
a1fcac64
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
cpu_particles_2d.cpp
scene/2d/cpu_particles_2d.cpp
+2
-2
cpu_particles.cpp
scene/3d/cpu_particles.cpp
+2
-2
particles_material.cpp
scene/resources/particles_material.cpp
+2
-2
No files found.
scene/2d/cpu_particles_2d.cpp
View file @
bc94203a
...
...
@@ -866,8 +866,8 @@ void CPUParticles2D::_particles_process(float p_delta) {
}
//scale by scale
float
base_scale
=
Math
::
lerp
(
parameters
[
PARAM_SCALE
]
*
tex_scale
,
1.0
f
,
p
.
scale_rand
*
randomness
[
PARAM_SCALE
]);
if
(
base_scale
==
0.0
)
base_scale
=
0.000001
;
float
base_scale
=
tex_scale
*
Math
::
lerp
(
parameters
[
PARAM_SCALE
]
,
1.0
f
,
p
.
scale_rand
*
randomness
[
PARAM_SCALE
]);
if
(
base_scale
<
0.000001
)
base_scale
=
0.000001
;
p
.
transform
.
elements
[
0
]
*=
base_scale
;
p
.
transform
.
elements
[
1
]
*=
base_scale
;
...
...
scene/3d/cpu_particles.cpp
View file @
bc94203a
...
...
@@ -915,8 +915,8 @@ void CPUParticles::_particles_process(float p_delta) {
}
//scale by scale
float
base_scale
=
Math
::
lerp
(
parameters
[
PARAM_SCALE
]
*
tex_scale
,
1.0
f
,
p
.
scale_rand
*
randomness
[
PARAM_SCALE
]);
if
(
base_scale
==
0.0
)
base_scale
=
0.000001
;
float
base_scale
=
tex_scale
*
Math
::
lerp
(
parameters
[
PARAM_SCALE
]
,
1.0
f
,
p
.
scale_rand
*
randomness
[
PARAM_SCALE
]);
if
(
base_scale
<
0.000001
)
base_scale
=
0.000001
;
p
.
transform
.
basis
.
scale
(
Vector3
(
1
,
1
,
1
)
*
base_scale
);
...
...
scene/resources/particles_material.cpp
View file @
bc94203a
...
...
@@ -567,8 +567,8 @@ void ParticlesMaterial::_update_shader() {
}
}
//scale by scale
code
+=
" float base_scale =
mix(scale * tex_
scale, 1.0, scale_random * scale_rand);
\n
"
;
code
+=
" if (base_scale
== 0.0
) {
\n
"
;
code
+=
" float base_scale =
tex_scale * mix(
scale, 1.0, scale_random * scale_rand);
\n
"
;
code
+=
" if (base_scale
< 0.000001
) {
\n
"
;
code
+=
" base_scale = 0.000001;
\n
"
;
code
+=
" }
\n
"
;
if
(
trail_size_modifier
.
is_valid
())
{
...
...
Write
Preview
Markdown
is supported
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