Browse Source

Merge pull request #41758 from akien-mga/classref-sync

doc: Sync classref with current source
Rémi Verschelde 5 years ago
parent
commit
44e89cb88f

+ 5 - 5
doc/classes/EditorFeatureProfile.xml

@@ -135,15 +135,15 @@
 		<constant name="FEATURE_SCENE_TREE" value="3" enum="Feature">
 			Scene tree editing. If this feature is disabled, the Scene tree dock will still be visible but will be read-only.
 		</constant>
-		<constant name="FEATURE_IMPORT_DOCK" value="4" enum="Feature">
-			The Import dock. If this feature is disabled, the Import dock won't be visible.
-		</constant>
-		<constant name="FEATURE_NODE_DOCK" value="5" enum="Feature">
+		<constant name="FEATURE_NODE_DOCK" value="4" enum="Feature">
 			The Node dock. If this feature is disabled, signals and groups won't be visible and modifiable from the editor.
 		</constant>
-		<constant name="FEATURE_FILESYSTEM_DOCK" value="6" enum="Feature">
+		<constant name="FEATURE_FILESYSTEM_DOCK" value="5" enum="Feature">
 			The FileSystem dock. If this feature is disabled, the FileSystem dock won't be visible.
 		</constant>
+		<constant name="FEATURE_IMPORT_DOCK" value="6" enum="Feature">
+			The Import dock. If this feature is disabled, the Import dock won't be visible.
+		</constant>
 		<constant name="FEATURE_MAX" value="7" enum="Feature">
 			Represents the size of the [enum Feature] enum.
 		</constant>

+ 1 - 1
doc/classes/GPUParticles2D.xml

@@ -33,7 +33,7 @@
 		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="GPUParticles2D.DrawOrder" default="0">
 			Particle draw order. Uses [enum DrawOrder] values.
 		</member>
-		<member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" default="false">
+		<member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" default="true">
 			If [code]true[/code], particles are being emitted.
 		</member>
 		<member name="explosiveness" type="float" setter="set_explosiveness_ratio" getter="get_explosiveness_ratio" default="0.0">

+ 1 - 1
doc/classes/GPUParticles3D.xml

@@ -68,7 +68,7 @@
 		<member name="draw_passes" type="int" setter="set_draw_passes" getter="get_draw_passes" default="1">
 			The number of draw passes when rendering particles.
 		</member>
-		<member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" default="false">
+		<member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" default="true">
 			If [code]true[/code], particles are being emitted.
 		</member>
 		<member name="explosiveness" type="float" setter="set_explosiveness_ratio" getter="get_explosiveness_ratio" default="0.0">

+ 4 - 2
doc/classes/VisualShader.xml

@@ -193,7 +193,6 @@
 		</method>
 	</methods>
 	<members>
-		<member name="code" type="String" setter="set_code" getter="get_code" override="true" default="&quot;shader_type spatial;void vertex() {// Output:0}void fragment() {// Output:0}void light() {// Output:0}&quot;" />
 		<member name="graph_offset" type="Vector2" setter="set_graph_offset" getter="get_graph_offset" default="Vector2( 0, 0 )">
 			The offset vector of the whole graph.
 		</member>
@@ -210,7 +209,10 @@
 		<constant name="TYPE_LIGHT" value="2" enum="Type">
 			A shader for light calculations.
 		</constant>
-		<constant name="TYPE_MAX" value="3" enum="Type">
+		<constant name="TYPE_COMPUTE" value="3" enum="Type">
+			A compute shader, to use the GPU for abstract computation.
+		</constant>
+		<constant name="TYPE_MAX" value="4" enum="Type">
 			Represents the size of the [enum Type] enum.
 		</constant>
 		<constant name="NODE_ID_INVALID" value="-1">

+ 1 - 1
editor/editor_feature_profile.cpp

@@ -271,9 +271,9 @@ void EditorFeatureProfile::_bind_methods() {
 	BIND_ENUM_CONSTANT(FEATURE_SCRIPT);
 	BIND_ENUM_CONSTANT(FEATURE_ASSET_LIB);
 	BIND_ENUM_CONSTANT(FEATURE_SCENE_TREE);
-	BIND_ENUM_CONSTANT(FEATURE_IMPORT_DOCK);
 	BIND_ENUM_CONSTANT(FEATURE_NODE_DOCK);
 	BIND_ENUM_CONSTANT(FEATURE_FILESYSTEM_DOCK);
+	BIND_ENUM_CONSTANT(FEATURE_IMPORT_DOCK);
 	BIND_ENUM_CONSTANT(FEATURE_MAX);
 }
 

+ 0 - 2
scene/resources/shader.cpp

@@ -142,8 +142,6 @@ void Shader::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("has_param", "name"), &Shader::has_param);
 
-	//ClassDB::bind_method(D_METHOD("get_param_list"),&Shader::get_fragment_code);
-
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_code", "get_code");
 
 	BIND_ENUM_CONSTANT(MODE_SPATIAL);

+ 3 - 0
scene/resources/visual_shader.cpp

@@ -1577,9 +1577,12 @@ void VisualShader::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "graph_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_graph_offset", "get_graph_offset");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "version", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_version", "get_version");
 
+	ADD_PROPERTY_DEFAULT("code", ""); // Inherited from Shader, prevents showing default code as override in docs.
+
 	BIND_ENUM_CONSTANT(TYPE_VERTEX);
 	BIND_ENUM_CONSTANT(TYPE_FRAGMENT);
 	BIND_ENUM_CONSTANT(TYPE_LIGHT);
+	BIND_ENUM_CONSTANT(TYPE_COMPUTE);
 	BIND_ENUM_CONSTANT(TYPE_MAX);
 
 	BIND_CONSTANT(NODE_ID_INVALID);