Many fixes to make exported scenes work better, still buggy.

1 files changed, 3 insertions, 19 deletions

diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h
index 04d140cdc6..5d4133383b 100644
--- a/modules/gridmap/grid_map.h
+++ b/modules/gridmap/grid_map.h
@@ -103,8 +103,6 @@ class GridMap : public Spatial {
 			Ref<NavigationMesh> navmesh;
 		};
 
-		Ref<Mesh> baked;
-		RID bake_instance;
 		RID collision_debug;
 		RID collision_debug_instance;
 
@@ -140,14 +138,12 @@ class GridMap : public Spatial {
 	float cell_size;
 	int octant_size;
 	bool center_x,center_y,center_z;
-	bool bake;
 	float cell_scale;
 	Navigation *navigation;
 
 	bool clip;
 	bool clip_above;
 	int clip_floor;
-	bool baked_lock;
 	Vector3::Axis clip_axis;
 
 
@@ -205,9 +201,7 @@ class GridMap : public Spatial {
 	void _octant_exit_world(const OctantKey &p_key);
 	void _octant_update(const OctantKey &p_key);
 	void _octant_transform(const OctantKey &p_key);
-	void _octant_clear_baked(const OctantKey &p_key);
 	void _octant_clear_navmesh(const GridMap::OctantKey&);
-	void _octant_bake(const OctantKey &p_key,const Ref<TriangleMesh>& p_tmesh=RES(),const Vector<BakeLight> &p_lights=Vector<BakeLight>(),List<Vector3> *r_prebake=NULL);
 	bool awaiting_update;
 
 	void _queue_dirty_map();
@@ -221,14 +215,6 @@ class GridMap : public Spatial {
 
 	void _clear_internal(bool p_keep_areas=false);
 
-	BakedLightInstance *baked_light_instance;
-	bool use_baked_light;
-	void _find_baked_light();
-	void _baked_light_changed();
-
-
-	Array _get_baked_light_meshes();
-
 protected:
 
 	bool _set(const StringName& p_name, const Variant& p_value);
@@ -285,13 +271,11 @@ public:
 	void set_cell_scale(float p_scale);
 	float get_cell_scale() const;
 
-	void set_bake(bool p_bake);
-	bool is_baking_enabled() const;
 
-	void bake_geometry();
 
-	void set_use_baked_light(bool p_use);
-	bool is_using_baked_light() const;
+	Array get_meshes();
+
+
 	void clear();
 
 	GridMap();