瀏覽代碼

Merge pull request #95013 from smix8/navmesh_geo_parse

Change NavigationMesh to also parse collision shapes by default
Rémi Verschelde 1 年之前
父節點
當前提交
43c46b9b1b
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      doc/classes/NavigationMesh.xml
  2. 1 1
      scene/resources/navigation_mesh.h

+ 1 - 1
doc/classes/NavigationMesh.xml

@@ -139,7 +139,7 @@
 			The physics layers to scan for static colliders.
 			The physics layers to scan for static colliders.
 			Only used when [member geometry_parsed_geometry_type] is [constant PARSED_GEOMETRY_STATIC_COLLIDERS] or [constant PARSED_GEOMETRY_BOTH].
 			Only used when [member geometry_parsed_geometry_type] is [constant PARSED_GEOMETRY_STATIC_COLLIDERS] or [constant PARSED_GEOMETRY_BOTH].
 		</member>
 		</member>
-		<member name="geometry_parsed_geometry_type" type="int" setter="set_parsed_geometry_type" getter="get_parsed_geometry_type" enum="NavigationMesh.ParsedGeometryType" default="0">
+		<member name="geometry_parsed_geometry_type" type="int" setter="set_parsed_geometry_type" getter="get_parsed_geometry_type" enum="NavigationMesh.ParsedGeometryType" default="2">
 			Determines which type of nodes will be parsed as geometry. See [enum ParsedGeometryType] for possible values.
 			Determines which type of nodes will be parsed as geometry. See [enum ParsedGeometryType] for possible values.
 		</member>
 		</member>
 		<member name="geometry_source_geometry_mode" type="int" setter="set_source_geometry_mode" getter="get_source_geometry_mode" enum="NavigationMesh.SourceGeometryMode" default="0">
 		<member name="geometry_source_geometry_mode" type="int" setter="set_source_geometry_mode" getter="get_source_geometry_mode" enum="NavigationMesh.SourceGeometryMode" default="0">

+ 1 - 1
scene/resources/navigation_mesh.h

@@ -93,7 +93,7 @@ protected:
 	float detail_sample_max_error = 1.0f;
 	float detail_sample_max_error = 1.0f;
 
 
 	SamplePartitionType partition_type = SAMPLE_PARTITION_WATERSHED;
 	SamplePartitionType partition_type = SAMPLE_PARTITION_WATERSHED;
-	ParsedGeometryType parsed_geometry_type = PARSED_GEOMETRY_MESH_INSTANCES;
+	ParsedGeometryType parsed_geometry_type = PARSED_GEOMETRY_BOTH;
 	uint32_t collision_mask = 0xFFFFFFFF;
 	uint32_t collision_mask = 0xFFFFFFFF;
 
 
 	SourceGeometryMode source_geometry_mode = SOURCE_GEOMETRY_ROOT_NODE_CHILDREN;
 	SourceGeometryMode source_geometry_mode = SOURCE_GEOMETRY_ROOT_NODE_CHILDREN;