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
0fa3b808
Unverified
Commit
0fa3b808
authored
Feb 18, 2019
by
Rémi Verschelde
Committed by
GitHub
Feb 18, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #26025 from clayjohn/particles_lifetime
Allowing setting particles lifetime greater than 600
parents
07498d31
0fec83bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
cpu_particles_2d.cpp
scene/2d/cpu_particles_2d.cpp
+1
-1
cpu_particles.cpp
scene/3d/cpu_particles.cpp
+1
-1
particles.cpp
scene/3d/particles.cpp
+1
-1
No files found.
scene/2d/cpu_particles_2d.cpp
View file @
0fa3b808
...
@@ -1189,7 +1189,7 @@ void CPUParticles2D::_bind_methods() {
...
@@ -1189,7 +1189,7 @@ void CPUParticles2D::_bind_methods() {
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_GROUP
(
"Time"
,
""
);
ADD_GROUP
(
"Time"
,
""
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01
,or_greater
"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
...
...
scene/3d/cpu_particles.cpp
View file @
0fa3b808
...
@@ -1238,7 +1238,7 @@ void CPUParticles::_bind_methods() {
...
@@ -1238,7 +1238,7 @@ void CPUParticles::_bind_methods() {
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_GROUP
(
"Time"
,
""
);
ADD_GROUP
(
"Time"
,
""
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01
,or_greater
"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
...
...
scene/3d/particles.cpp
View file @
0fa3b808
...
@@ -354,7 +354,7 @@ void Particles::_bind_methods() {
...
@@ -354,7 +354,7 @@ void Particles::_bind_methods() {
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"emitting"
),
"set_emitting"
,
"is_emitting"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
INT
,
"amount"
,
PROPERTY_HINT_EXP_RANGE
,
"1,1000000,1"
),
"set_amount"
,
"get_amount"
);
ADD_GROUP
(
"Time"
,
""
);
ADD_GROUP
(
"Time"
,
""
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"lifetime"
,
PROPERTY_HINT_EXP_RANGE
,
"0.01,600.0,0.01
,or_greater
"
),
"set_lifetime"
,
"get_lifetime"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
BOOL
,
"one_shot"
),
"set_one_shot"
,
"get_one_shot"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"preprocess"
,
PROPERTY_HINT_EXP_RANGE
,
"0.00,600.0,0.01"
),
"set_pre_process_time"
,
"get_pre_process_time"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
REAL
,
"speed_scale"
,
PROPERTY_HINT_RANGE
,
"0,64,0.01"
),
"set_speed_scale"
,
"get_speed_scale"
);
...
...
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