Merge pull request #58972 from reduz/expose-more-gdextension

10 files changed, 10 insertions, 15 deletions

diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index fec2d3137c..137df52215 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -491,10 +491,6 @@ Vector<Vector3> CSGShape3D::get_brush_faces() {
 	return faces;
 }
 
-Vector<Face3> CSGShape3D::get_faces(uint32_t p_usage_flags) const {
-	return Vector<Face3>();
-}
-
 void CSGShape3D::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_PARENTED: {
diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h
index d16250e30d..4721d0c11c 100644
--- a/modules/csg/csg_shape.h
+++ b/modules/csg/csg_shape.h
@@ -128,7 +128,6 @@ public:
 	virtual Vector<Vector3> get_brush_faces();
 
 	virtual AABB get_aabb() const override;
-	virtual Vector<Face3> get_faces(uint32_t p_usage_flags) const override;
 
 	void set_use_collision(bool p_enable);
 	bool is_using_collision() const;
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index f01907bef3..f8db42b1a9 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -36,8 +36,8 @@
 void register_csg_types() {
 #ifndef _3D_DISABLED
 
-	GDREGISTER_VIRTUAL_CLASS(CSGShape3D);
-	GDREGISTER_VIRTUAL_CLASS(CSGPrimitive3D);
+	GDREGISTER_ABSTRACT_CLASS(CSGShape3D);
+	GDREGISTER_ABSTRACT_CLASS(CSGPrimitive3D);
 	GDREGISTER_CLASS(CSGMesh3D);
 	GDREGISTER_CLASS(CSGSphere3D);
 	GDREGISTER_CLASS(CSGBox3D);
diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp
index 36a4e6e6e7..ebc5d95348 100644
--- a/modules/enet/register_types.cpp
+++ b/modules/enet/register_types.cpp
@@ -44,7 +44,7 @@ void register_enet_types() {
 	}
 
 	GDREGISTER_CLASS(ENetMultiplayerPeer);
-	GDREGISTER_VIRTUAL_CLASS(ENetPacketPeer);
+	GDREGISTER_ABSTRACT_CLASS(ENetPacketPeer);
 	GDREGISTER_CLASS(ENetConnection);
 }
 
diff --git a/modules/minimp3/audio_stream_mp3.cpp b/modules/minimp3/audio_stream_mp3.cpp
index 63fec6db8c..b5b51403f7 100644
--- a/modules/minimp3/audio_stream_mp3.cpp
+++ b/modules/minimp3/audio_stream_mp3.cpp
@@ -83,7 +83,7 @@ void AudioStreamPlaybackMP3::start(float p_from_pos) {
 	active = true;
 	seek(p_from_pos);
 	loops = 0;
-	_begin_resample();
+	begin_resample();
 }
 
 void AudioStreamPlaybackMP3::stop() {
diff --git a/modules/visual_script/register_types.cpp b/modules/visual_script/register_types.cpp
index e7b5f58174..d19870921d 100644
--- a/modules/visual_script/register_types.cpp
+++ b/modules/visual_script/register_types.cpp
@@ -53,10 +53,10 @@ void register_visual_script_types() {
 	ScriptServer::register_language(visual_script_language);
 
 	GDREGISTER_CLASS(VisualScript);
-	GDREGISTER_VIRTUAL_CLASS(VisualScriptNode);
+	GDREGISTER_ABSTRACT_CLASS(VisualScriptNode);
 	GDREGISTER_CLASS(VisualScriptFunctionState);
 	GDREGISTER_CLASS(VisualScriptFunction);
-	GDREGISTER_VIRTUAL_CLASS(VisualScriptLists);
+	GDREGISTER_ABSTRACT_CLASS(VisualScriptLists);
 	GDREGISTER_CLASS(VisualScriptComposeArray);
 	GDREGISTER_CLASS(VisualScriptOperator);
 	GDREGISTER_CLASS(VisualScriptVariableSet);
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 049d816a5a..5ff5b2339c 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -166,7 +166,7 @@ void AudioStreamPlaybackOGGVorbis::start(float p_from_pos) {
 	active = true;
 	seek(p_from_pos);
 	loops = 0;
-	_begin_resample();
+	begin_resample();
 }
 
 void AudioStreamPlaybackOGGVorbis::stop() {
diff --git a/modules/webrtc/register_types.cpp b/modules/webrtc/register_types.cpp
index e6a8dcc31a..283e421e11 100644
--- a/modules/webrtc/register_types.cpp
+++ b/modules/webrtc/register_types.cpp
@@ -47,7 +47,7 @@ void register_webrtc_types() {
 	ClassDB::register_custom_instance_class<WebRTCPeerConnection>();
 	GDREGISTER_CLASS(WebRTCPeerConnectionExtension);
 
-	GDREGISTER_VIRTUAL_CLASS(WebRTCDataChannel);
+	GDREGISTER_ABSTRACT_CLASS(WebRTCDataChannel);
 	GDREGISTER_CLASS(WebRTCDataChannelExtension);
 
 	GDREGISTER_CLASS(WebRTCMultiplayerPeer);
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index 1e9a4c0392..ff900f496f 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -63,7 +63,7 @@ void register_websocket_types() {
 	WSLServer::make_default();
 #endif
 
-	GDREGISTER_VIRTUAL_CLASS(WebSocketMultiplayerPeer);
+	GDREGISTER_ABSTRACT_CLASS(WebSocketMultiplayerPeer);
 	ClassDB::register_custom_instance_class<WebSocketServer>();
 	ClassDB::register_custom_instance_class<WebSocketClient>();
 	ClassDB::register_custom_instance_class<WebSocketPeer>();
diff --git a/modules/webxr/register_types.cpp b/modules/webxr/register_types.cpp
index 78fed3fbd6..a15dc93248 100644
--- a/modules/webxr/register_types.cpp
+++ b/modules/webxr/register_types.cpp
@@ -38,7 +38,7 @@ Ref<WebXRInterfaceJS> webxr;
 #endif
 
 void register_webxr_types() {
-	GDREGISTER_VIRTUAL_CLASS(WebXRInterface);
+	GDREGISTER_ABSTRACT_CLASS(WebXRInterface);
 
 #ifdef JAVASCRIPT_ENABLED
 	webxr.instantiate();