From a1586d48ac06b10b656f467b6290e337731738cf Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 25 Jan 2024 16:41:17 +0100 Subject: [PATCH] Always use memnew(), and memdelete(). --- demos/render_test_app/game_scene.cpp | 8 ++++---- demos/single_header_app/game_application.h | 6 +++--- sfw/core/logger.cpp | 2 +- sfw/game_scene.cpp | 8 ++++---- sfw/object/psignal.cpp | 2 +- sfw/object/psignal.h | 2 +- sfw/render_core/image.cpp | 2 +- sfw/render_objects/sprite.cpp | 2 +- sfwl/core/logger.cpp | 2 +- sfwl/object/psignal.cpp | 2 +- sfwl/object/psignal.h | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/demos/render_test_app/game_scene.cpp b/demos/render_test_app/game_scene.cpp index f6b4a6d..a674192 100644 --- a/demos/render_test_app/game_scene.cpp +++ b/demos/render_test_app/game_scene.cpp @@ -467,7 +467,7 @@ void GameScene::socket_thread_func(void *data) { ERR_PRINT("New connection! " + itos(a)); client_sockets.push_back(client_socket); - client_socket = new Socket(); + client_socket = memnew(Socket()); } for (int i = 0; i < client_sockets.size(); ++i) { @@ -579,7 +579,7 @@ GameScene::GameScene() { material.instance(); material->texture = texture; - sprite = new Sprite(); + sprite = memnew(Sprite()); sprite->mesh_instance->material = material; sprite->width = 500; sprite->height = 500; @@ -590,7 +590,7 @@ GameScene::GameScene() { //sprite->region_height = 1.0 / 16.0; sprite->update_mesh(); - tile_map = new TileMap(); + tile_map = memnew(TileMap()); tile_map->material = material; tile_map->atlas_size_x = 2; tile_map->atlas_size_y = 2; @@ -612,7 +612,7 @@ GameScene::GameScene() { tile_map->transform.scale(Vector2(32, 32)); tile_map->transform.set_origin(Vector2(500, 500)); - camera = new PerspectiveCamera(); + camera = memnew(PerspectiveCamera()); Transform t = camera->get_camera_transform(); //camera->width = 2; //camera->height = 2; diff --git a/demos/single_header_app/game_application.h b/demos/single_header_app/game_application.h index 8f5397d..2426757 100644 --- a/demos/single_header_app/game_application.h +++ b/demos/single_header_app/game_application.h @@ -218,7 +218,7 @@ public: material.instance(); material->texture = texture; - sprite = new Sprite(); + sprite = memnew(Sprite()); sprite->mesh_instance->material = material; sprite->width = 500; sprite->height = 500; @@ -229,7 +229,7 @@ public: //sprite->region_height = 1.0 / 16.0; sprite->update_mesh(); - tile_map = new TileMap(); + tile_map = memnew(TileMap()); tile_map->material = material; tile_map->atlas_size_x = 2; tile_map->atlas_size_y = 2; @@ -251,7 +251,7 @@ public: tile_map->transform.scale(Vector2(32, 32)); tile_map->transform.set_origin(Vector2(500, 500)); - camera = new PerspectiveCamera(); + camera = memnew(PerspectiveCamera()); Transform t = camera->get_camera_transform(); //camera->width = 2; //camera->height = 2; diff --git a/sfw/core/logger.cpp b/sfw/core/logger.cpp index 45ab91f..a996624 100644 --- a/sfw/core/logger.cpp +++ b/sfw/core/logger.cpp @@ -159,7 +159,7 @@ String *RLogger::get_string_ptr(const char *p_prefix, const char *p_function, co return s; } void RLogger::return_string_ptr(String *str) { - delete str; + memdelete(str); } String *RLogger::get_trace_string_ptr(const int p_default_size) { diff --git a/sfw/game_scene.cpp b/sfw/game_scene.cpp index e2c917f..4f89dfb 100644 --- a/sfw/game_scene.cpp +++ b/sfw/game_scene.cpp @@ -479,7 +479,7 @@ void GameScene::socket_thread_func(void *data) { ERR_PRINT("New connection! " + itos(a)); client_sockets.push_back(client_socket); - client_socket = new Socket(); + client_socket = memnew(Socket()); } for (int i = 0; i < client_sockets.size(); ++i) { @@ -591,7 +591,7 @@ GameScene::GameScene() { material.instance(); material->texture = texture; - sprite = new Sprite(); + sprite = memnew(Sprite()); sprite->mesh_instance->material = material; sprite->width = 500; sprite->height = 500; @@ -602,7 +602,7 @@ GameScene::GameScene() { //sprite->region_height = 1.0 / 16.0; sprite->update_mesh(); - tile_map = new TileMap(); + tile_map = memnew(TileMap()); tile_map->material = material; tile_map->atlas_size_x = 2; tile_map->atlas_size_y = 2; @@ -624,7 +624,7 @@ GameScene::GameScene() { tile_map->transform.scale(Vector2(32, 32)); tile_map->transform.set_origin(Vector2(500, 500)); - camera = new PerspectiveCamera(); + camera = memnew(PerspectiveCamera()); Transform t = camera->get_camera_transform(); //camera->width = 2; //camera->height = 2; diff --git a/sfw/object/psignal.cpp b/sfw/object/psignal.cpp index 79bf490..f6e56d1 100644 --- a/sfw/object/psignal.cpp +++ b/sfw/object/psignal.cpp @@ -4,7 +4,7 @@ //--STRIP void Signal::connect_static(void (*func)(Signal *)) { - StaticSignalEntry *se = new StaticSignalEntry(); + StaticSignalEntry *se = memnew(StaticSignalEntry()); se->func = func; entries.push_back(se); diff --git a/sfw/object/psignal.h b/sfw/object/psignal.h index 11a817b..8e8fa8f 100644 --- a/sfw/object/psignal.h +++ b/sfw/object/psignal.h @@ -119,7 +119,7 @@ protected: template void Signal::connect(T *obj, void (*func)(T*, Signal *)) { - ClassSignalEntrySpec *ce = new ClassSignalEntrySpec(); + ClassSignalEntrySpec *ce = memnew(ClassSignalEntrySpec()); ce->obj = obj; ce->func = func; diff --git a/sfw/render_core/image.cpp b/sfw/render_core/image.cpp index dcaf5d4..bf39c6b 100644 --- a/sfw/render_core/image.cpp +++ b/sfw/render_core/image.cpp @@ -1967,7 +1967,7 @@ Rect2 Image::get_used_rect() const { } Ref Image::get_rect(const Rect2 &p_area) const { - Ref img = new Image(p_area.position.x, p_area.position.y, mipmaps, format); + Ref img = memnew(Image(p_area.position.x, p_area.position.y, mipmaps, format)); img->blit_rect(Ref((Image *)this), p_area, Vector2(0, 0)); return img; } diff --git a/sfw/render_objects/sprite.cpp b/sfw/render_objects/sprite.cpp index a55efc2..e869e8b 100644 --- a/sfw/render_objects/sprite.cpp +++ b/sfw/render_objects/sprite.cpp @@ -73,5 +73,5 @@ Sprite::Sprite() { } Sprite::~Sprite() { - delete mesh_instance; + memdelete(mesh_instance); } diff --git a/sfwl/core/logger.cpp b/sfwl/core/logger.cpp index 45ab91f..a996624 100644 --- a/sfwl/core/logger.cpp +++ b/sfwl/core/logger.cpp @@ -159,7 +159,7 @@ String *RLogger::get_string_ptr(const char *p_prefix, const char *p_function, co return s; } void RLogger::return_string_ptr(String *str) { - delete str; + memdelete(str); } String *RLogger::get_trace_string_ptr(const int p_default_size) { diff --git a/sfwl/object/psignal.cpp b/sfwl/object/psignal.cpp index 79bf490..f6e56d1 100644 --- a/sfwl/object/psignal.cpp +++ b/sfwl/object/psignal.cpp @@ -4,7 +4,7 @@ //--STRIP void Signal::connect_static(void (*func)(Signal *)) { - StaticSignalEntry *se = new StaticSignalEntry(); + StaticSignalEntry *se = memnew(StaticSignalEntry()); se->func = func; entries.push_back(se); diff --git a/sfwl/object/psignal.h b/sfwl/object/psignal.h index 11a817b..8e8fa8f 100644 --- a/sfwl/object/psignal.h +++ b/sfwl/object/psignal.h @@ -119,7 +119,7 @@ protected: template void Signal::connect(T *obj, void (*func)(T*, Signal *)) { - ClassSignalEntrySpec *ce = new ClassSignalEntrySpec(); + ClassSignalEntrySpec *ce = memnew(ClassSignalEntrySpec()); ce->obj = obj; ce->func = func;