From 5e551a584e3f26ad41cad43aed22bca725e13ff7 Mon Sep 17 00:00:00 2001
From: Bastiaan Olij <mux213@gmail.com>
Date: Sat, 28 Apr 2018 18:46:00 +1000
Subject: [PATCH] added custom aabb to primitives

(cherry picked from commit 1ee40206d49736d57d97c37f738c961ab0bda28c)
---
 scene/resources/primitive_meshes.cpp | 16 ++++++++++++++++
 scene/resources/primitive_meshes.h   |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp
index 94c54c91d3f..4ddcc68ab83 100644
--- a/scene/resources/primitive_meshes.cpp
+++ b/scene/resources/primitive_meshes.cpp
@@ -164,7 +164,11 @@ void PrimitiveMesh::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_mesh_arrays"), &PrimitiveMesh::get_mesh_arrays);
 
+	ClassDB::bind_method(D_METHOD("set_custom_aabb", "aabb"), &PrimitiveMesh::set_custom_aabb);
+	ClassDB::bind_method(D_METHOD("get_custom_aabb"), &PrimitiveMesh::get_custom_aabb);
+
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::AABB, "custom_aabb", PROPERTY_HINT_NONE, ""), "set_custom_aabb", "get_custom_aabb");
 }
 
 void PrimitiveMesh::set_material(const Ref<Material> &p_material) {
@@ -185,6 +189,18 @@ Array PrimitiveMesh::get_mesh_arrays() const {
 	return surface_get_arrays(0);
 }
 
+void PrimitiveMesh::set_custom_aabb(const AABB &p_custom) {
+
+	custom_aabb = p_custom;
+	VS::get_singleton()->mesh_set_custom_aabb(mesh, custom_aabb);
+	emit_changed();
+}
+
+AABB PrimitiveMesh::get_custom_aabb() const {
+
+	return custom_aabb;
+}
+
 PrimitiveMesh::PrimitiveMesh() {
 	// defaults
 	mesh = VisualServer::get_singleton()->mesh_create();
diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h
index 94a7a055a30..23d1671d5c3 100644
--- a/scene/resources/primitive_meshes.h
+++ b/scene/resources/primitive_meshes.h
@@ -48,6 +48,7 @@ class PrimitiveMesh : public Mesh {
 private:
 	RID mesh;
 	mutable AABB aabb;
+	AABB custom_aabb;
 
 	Ref<Material> material;
 
@@ -81,6 +82,9 @@ public:
 
 	Array get_mesh_arrays() const;
 
+	void set_custom_aabb(const AABB &p_custom);
+	AABB get_custom_aabb() const;
+
 	PrimitiveMesh();
 	~PrimitiveMesh();
 };