Work on fixing compile.

clutter/ground_clutter_2d_foliage.cpp

@@ -33,7 +33,7 @@ Ref<Texture> GroundClutter2DFoliage::get_texture(const int index) {
 void GroundClutter2DFoliage::remove_texture(const int index) {
 	ERR_FAIL_INDEX(index, _textures.size());
 
-	_textures.remove(index);
+	_textures.remove_at(index);
 }
 void GroundClutter2DFoliage::add_texture(Ref<Texture> texture) {
 	_textures.push_back(texture);

jobs/prop_2d_texture_job.h

@@ -32,7 +32,7 @@ SOFTWARE.
 #include "core/version.h"
 
 #if VERSION_MAJOR > 3
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #define Texture Texture2D
 #else
 #include "core/reference.h"

lights/prop_2d_light.h

@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/version.h"
 
 #if VERSION_MAJOR > 3
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/templates/vector.h"
 #include "core/math/color.h"
 #else

material_cache/prop_2d_material_cache.cpp

@@ -108,7 +108,7 @@ void Prop2DMaterialCache::texture_remove(const Ref<Texture> &texture) {
 void Prop2DMaterialCache::texture_remove_index(const int index) {
 	ERR_FAIL_INDEX(index, _textures.size());
 
-	_textures.remove(index);
+	_textures.remove_at(index);
 }
 void Prop2DMaterialCache::textures_clear() {
 	_textures.clear();

material_cache/prop_2d_material_cache_pcm.cpp

@@ -156,7 +156,7 @@ void Prop2DMaterialCachePCM::_setup_material_albedo(Ref<Texture> texture) {
 }
 
 Prop2DMaterialCachePCM::Prop2DMaterialCachePCM() {
-	_packer.instance();
+	_packer.instantiate();
 
 #if GODOT4
 #warning implement

prop_2d_instance_job.h

@@ -32,7 +32,7 @@ SOFTWARE.
 #include "core/version.h"
 
 #if VERSION_MAJOR > 3
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #define Texture Texture2D
 #else
 #include "core/reference.h"

prop_2d_instance_merger.cpp

@@ -420,7 +420,7 @@ void Prop2DInstanceMerger::_prop_preprocess(Transform2D transform, const Ref<Pro
 
 			if (tiled_wall_data->get_collision()) {
 				Ref<BoxShape> tws;
-				tws.instance();
+				tws.instantiate();
 
 				float hew = tiled_wall_data->get_width() / 2.0;
 				float heh = tiled_wall_data->get_heigth() / 2.0;
@@ -464,7 +464,7 @@ void Prop2DInstanceMerger::_prop_preprocess(Transform2D transform, const Ref<Pro
 
 		if (light_data.is_valid()) {
 			Ref<Prop2DLight> light;
-			light.instance();
+			light.instantiate();
 
 			Vector2 v = t.xform(Vector2());
 

prop_2d_instance_prop_job.cpp

@@ -521,7 +521,7 @@ Prop2DInstanceProp2DJob::Prop2DInstanceProp2DJob() {
 	_prop_instace = NULL;
 
 	//todo allocate this in a virtual method
-	_prop_mesher.instance();
+	_prop_mesher.instantiate();
 	_prop_mesher->set_build_flags(Prop2DMesher::BUILD_FLAG_USE_LIGHTING | Prop2DMesher::BUILD_FLAG_USE_AO | Prop2DMesher::BUILD_FLAG_USE_RAO | Prop2DMesher::BUILD_FLAG_BAKE_LIGHTS);
 }
 

prop_2d_mesher.cpp

@@ -268,7 +268,7 @@ void Prop2DMesher::remove_doubles() {
 		for (int j = 0; j < indices.size(); ++j) {
 			int index = indices[j];
 
-			_vertices.remove(index);
+			_vertices.remove_at(index);
 
 			//make all indices that were bigger than the one we replaced one lower
 			for (int k = 0; k < _indices.size(); ++k) {
@@ -317,7 +317,7 @@ void Prop2DMesher::remove_doubles_hashed() {
 			int index = indices[j];
 
 			hashes.remove(index);
-			_vertices.remove(index);
+			_vertices.remove_at(index);
 
 			//make all indices that were bigger than the one we replaced one lower
 			for (int k = 0; k < _indices.size(); ++k) {
@@ -1129,7 +1129,7 @@ Prop2DMesher::Prop2DMesher() {
 
 	_format = VisualServer::ARRAY_FORMAT_TEX_UV;
 
-	_noise.instance();
+	_noise.instantiate();
 	//todo add properties for these if needed
 	_noise->set_octaves(4);
 	_noise->set_period(30);

prop_2d_mesher.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #if VERSION_MAJOR > 3
 #include "core/math/color.h"
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/templates/vector.h"
 
 template <class N>

props/prop_2d_data.cpp

@@ -58,7 +58,7 @@ void Prop2DData::add_prop(const Ref<Prop2DDataEntry> prop) {
 void Prop2DData::remove_prop(const int index) {
 	ERR_FAIL_INDEX(index, _props.size());
 
-	_props.remove(index);
+	_props.remove_at(index);
 }
 
 int Prop2DData::get_prop_count() const {
@@ -162,7 +162,7 @@ void Prop2DData::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_room_bounds"), &Prop2DData::get_room_bounds);
 	ClassDB::bind_method(D_METHOD("set_room_bounds", "value"), &Prop2DData::set_room_bounds);
-	ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY, "room_bounds"), "set_room_bounds", "get_room_bounds");
+	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR3_ARRAY, "room_bounds"), "set_room_bounds", "get_room_bounds");
 
 	ClassDB::bind_method(D_METHOD("copy_from", "prop_data"), &Prop2DData::copy_from);
 }

props/prop_2d_data.h

@@ -35,7 +35,7 @@ SOFTWARE.
 #else
 #include "core/reference.h"
 #include "core/vector.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #endif
 
 #include "core/math/rect2.h"
@@ -74,8 +74,8 @@ public:
 	bool get_is_room() const;
 	void set_is_room(const bool value);
 
-	PoolVector3Array get_room_bounds();
-	void set_room_bounds(const PoolVector3Array &bounds);
+	PackedVector3Array get_room_bounds();
+	void set_room_bounds(const PackedVector3Array &bounds);
 
 	void copy_from(const Ref<Prop2DData> &prop_data);
 
@@ -93,7 +93,7 @@ private:
 	Vector<Ref<Prop2DDataEntry>> _props;
 
 	bool _is_room;
-	PoolVector3Array _room_bounds;
+	PackedVector3Array _room_bounds;
 };
 
 #endif

props/prop_2d_data_entry.cpp

@@ -143,7 +143,7 @@ void Prop2DDataEntry::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		e = entry;
 	} else {
-		e.instance();
+		e.instantiate();
 	}
 
 	e->set_transform_2d(transform * n->get_transform());

props/prop_2d_data_entry.h

@@ -33,7 +33,7 @@ SOFTWARE.
 #define Transform Transform3D
 #endif
 #else
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/transform_2d.h"
 #include "core/resource.h"
 #endif

props/prop_2d_data_light.cpp

@@ -84,7 +84,7 @@ void Prop2DDataLight::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		l = entry;
 	} else {
-		l.instance();
+		l.instantiate();
 	}
 
 	l->set_light_color(i->get_color());

props/prop_2d_data_portal.cpp

@@ -77,7 +77,7 @@ void Prop2DDataPortal::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		l = entry;
 	} else {
-		l.instance();
+		l.instantiate();
 	}
 
 	l->set_is_active(p->get_portal_active());

props/prop_2d_data_prop.cpp

@@ -56,7 +56,7 @@ void Prop2DDataProp2D::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		l = entry;
 	} else {
-		l.instance();
+		l.instantiate();
 	}
 
 	l->set_prop(i->get_prop_data());

props/prop_2d_data_scene.cpp

@@ -48,7 +48,7 @@ void Prop2DDataScene::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		l = entry;
 	} else {
-		l.instance();
+		l.instantiate();
 	}
 
 	l->set_scene(i->get_scene());

props/prop_2d_data_sprite.cpp

@@ -133,7 +133,7 @@ void Prop2DDataSprite::_processor_process(Ref<Prop2DData> prop_data, Node *node,
 	if (entry.is_valid()) {
 		l = entry;
 	} else {
-		l.instance();
+		l.instantiate();
 	}
 
 	l->set_texture(s->get_texture());

props/prop_2d_data_tiled_wall_2d.cpp

@@ -71,7 +71,7 @@ void Prop2DDataTiledWall2D::_processor_process(Ref<Prop2DData> prop_data, Node *
 	if (entry.is_valid()) {
 		tw = entry;
 	} else {
-		tw.instance();
+		tw.instantiate();
 	}
 
 	tw->set_width(t->get_width());

singleton/prop_2d_cache.h

@@ -29,7 +29,7 @@ SOFTWARE.
 #include "core/core_bind.h"
 #include "core/math/color.h"
 #include "core/object/object.h"
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/vector.h"
 #else

singleton/prop_2d_utils.cpp

@@ -61,7 +61,7 @@ Ref<Prop2DData> Prop2DUtils::convert_tree(Node *root) {
 #endif
 
 	Ref<Prop2DData> data;
-	data.instance();
+	data.instantiate();
 	Transform2D t;
 
 	_convert_tree(data, root, t);

singleton/prop_2d_utils.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #if VERSION_MAJOR > 3
 #include "core/object/object.h"
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/templates/vector.h"
 #include "scene/3d/node_3d.h"
 #else

tiled_wall/tiled_wall_2d.cpp

@@ -267,7 +267,7 @@ TiledWall2D::TiledWall2D() {
 	_width = 1;
 	_height = 1;
 
-	_mesher.instance();
+	_mesher.instantiate();
 	//_mesher->set_build_flags(Prop2DMesher::BUILD_FLAG_USE_LIGHTING | Prop2DMesher::BUILD_FLAG_USE_AO | Prop2DMesher::BUILD_FLAG_USE_RAO | Prop2DMesher::BUILD_FLAG_BAKE_LIGHTS);
 }
 TiledWall2D::~TiledWall2D() {

tiled_wall/tiled_wall_2d_data.cpp

@@ -88,7 +88,7 @@ void TiledWall2DData::add_texture(const Ref<Texture> &texture) {
 void TiledWall2DData::remove_texture(const int index) {
 	ERR_FAIL_INDEX(index, _textures.size());
 
-	_textures.remove(index);
+	_textures.remove_at(index);
 
 	emit_changed();
 }
@@ -136,7 +136,7 @@ void TiledWall2DData::add_flavour_texture(const Ref<Texture> &texture) {
 void TiledWall2DData::remove_flavour_texture(const int index) {
 	ERR_FAIL_INDEX(index, _flavour_textures.size());
 
-	_flavour_textures.remove(index);
+	_flavour_textures.remove_at(index);
 
 	emit_changed();
 }
@@ -298,7 +298,7 @@ void TiledWall2DData::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_flavour_chance"), &TiledWall2DData::get_flavour_chance);
 	ClassDB::bind_method(D_METHOD("set_flavour_chance", "texture"), &TiledWall2DData::set_flavour_chance);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "flavour_chance"), "set_flavour_chance", "get_flavour_chance");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "flavour_chance"), "set_flavour_chance", "get_flavour_chance");
 
 	//materials
 	ClassDB::bind_method(D_METHOD("material_get"), &TiledWall2DData::material_get);
@@ -309,7 +309,7 @@ void TiledWall2DData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_textures_into", "texture_packer"), &TiledWall2DData::add_textures_into);
 #endif
 
-	BIND_VMETHOD(MethodInfo("_setup_cache", PropertyInfo(Variant::OBJECT, "cache", PROPERTY_HINT_RESOURCE_TYPE, "Prop2DMaterialCache")));
+	//BIND_VMETHOD(MethodInfo("_setup_cache", PropertyInfo(Variant::OBJECT, "cache", PROPERTY_HINT_RESOURCE_TYPE, "Prop2DMaterialCache")));
 
 	ClassDB::bind_method(D_METHOD("setup_cache", "cache"), &TiledWall2DData::setup_cache);
 	ClassDB::bind_method(D_METHOD("_setup_cache", "cache"), &TiledWall2DData::_setup_cache);

tiled_wall/tiled_wall_2d_data.h

@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/version.h"
 
 #if VERSION_MAJOR > 3
-#include "core/object/reference.h"
+#include "core/object/ref_counted.h"
 #include "core/templates/vector.h"
 #else
 #include "core/reference.h"
@@ -34,7 +34,7 @@ SOFTWARE.
 #endif
 
 #include "core/math/rect2.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"