Merge pull request #47349 from nekomatata/heightmap-support-3.x

[3.x] Heightmap collision shape support in Godot Physics
godotengine · Apr 28, 2021 · f85d59c · f85d59c
2 parents 80619a0 + 3ea72b2
commit f85d59c
Show file tree

Hide file tree

Showing 4 changed files with 358 additions and 47 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -103,6 +103,8 @@ Files: ./servers/physics/gjk_epa.cpp
  ./servers/physics/joints/pin_joint_sw.h
  ./servers/physics/joints/slider_joint_sw.cpp
  ./servers/physics/joints/slider_joint_sw.h
+ ./servers/physics/shape_sw.cpp
+ ./servers/physics/shape_sw.h
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2003-2008, Erwin Coumans
  2007-2021, Juan Linietsky, Ariel Manzur.

diff --git a/doc/classes/HeightMapShape.xml b/doc/classes/HeightMapShape.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="HeightMapShape" inherits="Shape" version="3.4">
 	<brief_description>
-		Height map shape for 3D physics (Bullet only).
+		Height map shape for 3D physics.
 	</brief_description>
 	<description>
 		Height map shape resource, which can be added to a [PhysicsBody] or [Area].