diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 18:49:16 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-27 14:54:04 +0100 |
| commit | eaae4b6408361eb34363adcb22a08046f43147f4 (patch) | |
| tree | 4baf4cd8758696d260bef2cb149e27bf3135a284 /modules/gridmap/grid_map.h | |
| parent | 9a7dbc2acafdd04ff0fe09bc5f4838b4920348a8 (diff) | |
| download | redot-engine-eaae4b6408361eb34363adcb22a08046f43147f4.tar.gz | |
Renamed 2D and 3D nodes to make their types explicit
Fixes #30736.
Diffstat (limited to 'modules/gridmap/grid_map.h')
| -rw-r--r-- | modules/gridmap/grid_map.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h index cc1c8c2923..43f4c09715 100644 --- a/modules/gridmap/grid_map.h +++ b/modules/gridmap/grid_map.h @@ -31,17 +31,17 @@ #ifndef GRID_MAP_H #define GRID_MAP_H -#include "scene/3d/navigation.h" -#include "scene/3d/spatial.h" +#include "scene/3d/navigation_3d.h" +#include "scene/3d/node_3d.h" #include "scene/resources/mesh_library.h" #include "scene/resources/multimesh.h" //heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done.. //should scale better with hardware that supports instancing -class GridMap : public Spatial { +class GridMap : public Node3D { - GDCLASS(GridMap, Spatial); + GDCLASS(GridMap, Node3D); enum { MAP_DIRTY_TRANSFORMS = 1, @@ -147,7 +147,7 @@ class GridMap : public Spatial { int octant_size; bool center_x, center_y, center_z; float cell_scale; - Navigation *navigation; + Navigation3D *navigation; bool clip; bool clip_above; |