From 52dd0f8751b2de72b41f06e637411c9e2a0f9e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 11 Jun 2019 17:47:24 +0200
Subject: Implement missing orbit velocity for CPUParticles and CPUParticles2D

The relevant code was copied from (GPU) ParticlesMaterial but commented
out initially, and never ported.

Closes #29580.
---
 doc/classes/CPUParticles.xml   | 30 ++++++++++++++++++++----------
 doc/classes/CPUParticles2D.xml | 12 +++++++++++-
 2 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'doc/classes')

diff --git a/doc/classes/CPUParticles.xml b/doc/classes/CPUParticles.xml
index 599c067328..5458a87a9e 100644
--- a/doc/classes/CPUParticles.xml
+++ b/doc/classes/CPUParticles.xml
@@ -116,6 +116,12 @@
 		</member>
 		<member name="one_shot" type="bool" setter="set_one_shot" getter="get_one_shot">
 		</member>
+		<member name="orbit_velocity" type="float" setter="set_param" getter="get_param">
+		</member>
+		<member name="orbit_velocity_curve" type="Curve" setter="set_param_curve" getter="get_param_curve">
+		</member>
+		<member name="orbit_velocity_random" type="float" setter="set_param_randomness" getter="get_param_randomness">
+		</member>
 		<member name="preprocess" type="float" setter="set_pre_process_time" getter="get_pre_process_time">
 		</member>
 		<member name="radial_accel" type="float" setter="set_param" getter="get_param">
@@ -154,30 +160,34 @@
 		</constant>
 		<constant name="PARAM_ANGULAR_VELOCITY" value="1" enum="Parameter">
 		</constant>
-		<constant name="PARAM_LINEAR_ACCEL" value="2" enum="Parameter">
+		<constant name="PARAM_ORBIT_VELOCITY" value="2" enum="Parameter">
 		</constant>
-		<constant name="PARAM_RADIAL_ACCEL" value="3" enum="Parameter">
+		<constant name="PARAM_LINEAR_ACCEL" value="3" enum="Parameter">
 		</constant>
-		<constant name="PARAM_TANGENTIAL_ACCEL" value="4" enum="Parameter">
+		<constant name="PARAM_RADIAL_ACCEL" value="4" enum="Parameter">
 		</constant>
-		<constant name="PARAM_DAMPING" value="5" enum="Parameter">
+		<constant name="PARAM_TANGENTIAL_ACCEL" value="5" enum="Parameter">
 		</constant>
-		<constant name="PARAM_ANGLE" value="6" enum="Parameter">
+		<constant name="PARAM_DAMPING" value="6" enum="Parameter">
 		</constant>
-		<constant name="PARAM_SCALE" value="7" enum="Parameter">
+		<constant name="PARAM_ANGLE" value="7" enum="Parameter">
 		</constant>
-		<constant name="PARAM_HUE_VARIATION" value="8" enum="Parameter">
+		<constant name="PARAM_SCALE" value="8" enum="Parameter">
 		</constant>
-		<constant name="PARAM_ANIM_SPEED" value="9" enum="Parameter">
+		<constant name="PARAM_HUE_VARIATION" value="9" enum="Parameter">
 		</constant>
-		<constant name="PARAM_ANIM_OFFSET" value="10" enum="Parameter">
+		<constant name="PARAM_ANIM_SPEED" value="10" enum="Parameter">
 		</constant>
-		<constant name="PARAM_MAX" value="11" enum="Parameter">
+		<constant name="PARAM_ANIM_OFFSET" value="11" enum="Parameter">
+		</constant>
+		<constant name="PARAM_MAX" value="12" enum="Parameter">
 		</constant>
 		<constant name="FLAG_ALIGN_Y_TO_VELOCITY" value="0" enum="Flags">
 		</constant>
 		<constant name="FLAG_ROTATE_Y" value="1" enum="Flags">
 		</constant>
+		<constant name="FLAG_DISABLE_Z" value="2" enum="Flags">
+		</constant>
 		<constant name="FLAG_MAX" value="3" enum="Flags">
 		</constant>
 		<constant name="EMISSION_SHAPE_POINT" value="0" enum="EmissionShape">
diff --git a/doc/classes/CPUParticles2D.xml b/doc/classes/CPUParticles2D.xml
index e1f71e3600..17c68ccb87 100644
--- a/doc/classes/CPUParticles2D.xml
+++ b/doc/classes/CPUParticles2D.xml
@@ -111,6 +111,12 @@
 		</member>
 		<member name="one_shot" type="bool" setter="set_one_shot" getter="get_one_shot">
 		</member>
+		<member name="orbit_velocity" type="float" setter="set_param" getter="get_param">
+		</member>
+		<member name="orbit_velocity_curve" type="Curve" setter="set_param_curve" getter="get_param_curve">
+		</member>
+		<member name="orbit_velocity_random" type="float" setter="set_param_randomness" getter="get_param_randomness">
+		</member>
 		<member name="preprocess" type="float" setter="set_pre_process_time" getter="get_pre_process_time">
 		</member>
 		<member name="radial_accel" type="float" setter="set_param" getter="get_param">
@@ -173,7 +179,11 @@
 		</constant>
 		<constant name="FLAG_ALIGN_Y_TO_VELOCITY" value="0" enum="Flags">
 		</constant>
-		<constant name="FLAG_MAX" value="1" enum="Flags">
+		<constant name="FLAG_ROTATE_Y" value="1" enum="Flags">
+		</constant>
+		<constant name="FLAG_DISABLE_Z" value="2" enum="Flags">
+		</constant>
+		<constant name="FLAG_MAX" value="3" enum="Flags">
 		</constant>
 		<constant name="EMISSION_SHAPE_POINT" value="0" enum="EmissionShape">
 		</constant>
-- 
cgit v1.2.3