summaryrefslogtreecommitdiff
path: root/core/math
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
commit118eed485e8f928a5a0dab530ae93211afa10525 (patch)
tree83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /core/math
parentce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff)
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
Diffstat (limited to 'core/math')
-rw-r--r--core/math/a_star.cpp26
-rw-r--r--core/math/a_star.h2
-rw-r--r--core/math/triangle_mesh.h2
3 files changed, 15 insertions, 15 deletions
diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp
index 0b45577b58..29f61834b4 100644
--- a/core/math/a_star.cpp
+++ b/core/math/a_star.cpp
@@ -407,23 +407,23 @@ DVector<int> AStar::get_id_path(int p_from_id, int p_to_id) {
void AStar::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("get_available_point_id"),&AStar::get_available_point_id);
- ObjectTypeDB::bind_method(_MD("add_point","id","pos","weight_scale"),&AStar::add_point,DEFVAL(1.0));
- ObjectTypeDB::bind_method(_MD("get_point_pos","id"),&AStar::get_point_pos);
- ObjectTypeDB::bind_method(_MD("get_point_weight_scale","id"),&AStar::get_point_weight_scale);
- ObjectTypeDB::bind_method(_MD("remove_point","id"),&AStar::remove_point);
+ ClassDB::bind_method(_MD("get_available_point_id"),&AStar::get_available_point_id);
+ ClassDB::bind_method(_MD("add_point","id","pos","weight_scale"),&AStar::add_point,DEFVAL(1.0));
+ ClassDB::bind_method(_MD("get_point_pos","id"),&AStar::get_point_pos);
+ ClassDB::bind_method(_MD("get_point_weight_scale","id"),&AStar::get_point_weight_scale);
+ ClassDB::bind_method(_MD("remove_point","id"),&AStar::remove_point);
- ObjectTypeDB::bind_method(_MD("connect_points","id","to_id"),&AStar::connect_points);
- ObjectTypeDB::bind_method(_MD("disconnect_points","id","to_id"),&AStar::disconnect_points);
- ObjectTypeDB::bind_method(_MD("are_points_connected","id","to_id"),&AStar::are_points_connected);
+ ClassDB::bind_method(_MD("connect_points","id","to_id"),&AStar::connect_points);
+ ClassDB::bind_method(_MD("disconnect_points","id","to_id"),&AStar::disconnect_points);
+ ClassDB::bind_method(_MD("are_points_connected","id","to_id"),&AStar::are_points_connected);
- ObjectTypeDB::bind_method(_MD("clear"),&AStar::clear);
+ ClassDB::bind_method(_MD("clear"),&AStar::clear);
- ObjectTypeDB::bind_method(_MD("get_closest_point","to_pos"),&AStar::get_closest_point);
- ObjectTypeDB::bind_method(_MD("get_closest_pos_in_segment","to_pos"),&AStar::get_closest_pos_in_segment);
+ ClassDB::bind_method(_MD("get_closest_point","to_pos"),&AStar::get_closest_point);
+ ClassDB::bind_method(_MD("get_closest_pos_in_segment","to_pos"),&AStar::get_closest_pos_in_segment);
- ObjectTypeDB::bind_method(_MD("get_point_path","from_id","to_id"),&AStar::get_point_path);
- ObjectTypeDB::bind_method(_MD("get_id_path","from_id","to_id"),&AStar::get_id_path);
+ ClassDB::bind_method(_MD("get_point_path","from_id","to_id"),&AStar::get_point_path);
+ ClassDB::bind_method(_MD("get_id_path","from_id","to_id"),&AStar::get_id_path);
}
diff --git a/core/math/a_star.h b/core/math/a_star.h
index f9ffc477fc..66a983a6ce 100644
--- a/core/math/a_star.h
+++ b/core/math/a_star.h
@@ -37,7 +37,7 @@
class AStar: public Reference {
- OBJ_TYPE(AStar,Reference)
+ GDCLASS(AStar,Reference)
uint64_t pass;
diff --git a/core/math/triangle_mesh.h b/core/math/triangle_mesh.h
index a310f7e32b..d42f9c8dde 100644
--- a/core/math/triangle_mesh.h
+++ b/core/math/triangle_mesh.h
@@ -33,7 +33,7 @@
#include "face3.h"
class TriangleMesh : public Reference {
- OBJ_TYPE( TriangleMesh, Reference);
+ GDCLASS( TriangleMesh, Reference);
struct Triangle {