From 8ece8ca96fd436e4dcae458827d3cceef92246c6dbed700f8d741de9dff837e5 Mon Sep 17 00:00:00 2001 From: Mexpert_PRO Date: Tue, 20 Jan 2026 23:12:17 +0100 Subject: [PATCH] testing of TSE on a real project, and fixing the project itself --- PlanetExplorerGameDemo/src/BehaviourScripts/GravityHolder.cpp | 4 ++-- PlanetExplorerGameDemo/src/BehaviourScripts/PlanetRotater.cpp | 4 ++-- .../src/Elements/spaceElements/Asteroid.cpp | 2 +- .../src/Elements/spaceElements/BlackHole.cpp | 2 +- PlanetExplorerGameDemo/src/Elements/spaceElements/Galaxy.cpp | 2 +- PlanetExplorerGameDemo/src/Elements/spaceElements/Moon.cpp | 2 +- PlanetExplorerGameDemo/src/Elements/spaceElements/Planet.cpp | 2 +- .../src/Elements/spaceElements/PlanetarySystem.hpp | 2 +- PlanetExplorerGameDemo/src/Elements/spaceElements/Star.cpp | 2 +- PlanetExplorerGameDemo/src/Utilities/TextureHandler.cpp | 2 +- PlanetExplorerGameDemo/src/main.cpp | 2 +- TSE | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PlanetExplorerGameDemo/src/BehaviourScripts/GravityHolder.cpp b/PlanetExplorerGameDemo/src/BehaviourScripts/GravityHolder.cpp index 631e30e..45c5e25 100644 --- a/PlanetExplorerGameDemo/src/BehaviourScripts/GravityHolder.cpp +++ b/PlanetExplorerGameDemo/src/BehaviourScripts/GravityHolder.cpp @@ -8,7 +8,7 @@ void GravityHolder::GenerateRing() { - planetMapRing = new Transformable(); + planetMapRing = new Transformable("GravityHolder"); mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader")); const float pixelsNormal = gravityDistance * 4 * 32; @@ -36,7 +36,7 @@ GravityHolder::GravityHolder(float gravityWell) GravityHolder::~GravityHolder() { - Transformable::HardDelete(planetMapRing, true); + Transformable::HardDelete(planetMapRing, false); delete mat; delete mesh; } diff --git a/PlanetExplorerGameDemo/src/BehaviourScripts/PlanetRotater.cpp b/PlanetExplorerGameDemo/src/BehaviourScripts/PlanetRotater.cpp index 815cbf1..19ac987 100644 --- a/PlanetExplorerGameDemo/src/BehaviourScripts/PlanetRotater.cpp +++ b/PlanetExplorerGameDemo/src/BehaviourScripts/PlanetRotater.cpp @@ -14,7 +14,7 @@ PlanetRotater::PlanetRotater(float distance) PlanetRotater::~PlanetRotater() { - Transformable::HardDelete(planetMapRing, true); + Transformable::HardDelete(planetMapRing, false); delete mat; delete mesh; } @@ -45,7 +45,7 @@ Vector3 PlanetRotater::GetPosChange() void PlanetRotater::GenerateRing() { - planetMapRing = new Transformable(); + planetMapRing = new Transformable("PlanetRotater"); mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader")); const float pixelsNormal = distanceToKeep * 2 * 32; diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/Asteroid.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/Asteroid.cpp index 9cd1d8b..c9bb2c7 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/Asteroid.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/Asteroid.cpp @@ -87,7 +87,7 @@ void Asteroid::DeleteResources() delete planetMesh; delete planetMat; planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/BlackHole.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/BlackHole.cpp index 66b5862..67ef790 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/BlackHole.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/BlackHole.cpp @@ -65,7 +65,7 @@ void BlackHole::DeleteResources() delete planetMat; Transformable::HardDelete(planetLand, true); planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/Galaxy.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/Galaxy.cpp index 75a5421..6942694 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/Galaxy.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/Galaxy.cpp @@ -106,7 +106,7 @@ void Galaxy::DeleteResources() delete planetMesh; delete planetMat; planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/Moon.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/Moon.cpp index 15ab693..8d44937 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/Moon.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/Moon.cpp @@ -150,7 +150,7 @@ void Moon::DeleteResources() delete planetMat; Transformable::HardDelete(planetLand, true); planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/Planet.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/Planet.cpp index 7bf1405..15b15fd 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/Planet.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/Planet.cpp @@ -216,7 +216,7 @@ void Planet::DeleteResources() Transformable::HardDelete(planetClouds, true); Transformable::HardDelete(planetLand, true); planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/PlanetarySystem.hpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/PlanetarySystem.hpp index d2b41cc..f157d30 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/PlanetarySystem.hpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/PlanetarySystem.hpp @@ -1,7 +1,7 @@ #pragma once #include "Planet.hpp" -#include "Asteroidbelt.hpp" +#include "AsteroidBelt.hpp" #include "Star.hpp" class PlanetarySystem : public ISpace diff --git a/PlanetExplorerGameDemo/src/Elements/spaceElements/Star.cpp b/PlanetExplorerGameDemo/src/Elements/spaceElements/Star.cpp index b74ee2d..255ca7e 100644 --- a/PlanetExplorerGameDemo/src/Elements/spaceElements/Star.cpp +++ b/PlanetExplorerGameDemo/src/Elements/spaceElements/Star.cpp @@ -154,7 +154,7 @@ void Star::DeleteResources() Transformable::HardDelete(planetClouds, true); Transformable::HardDelete(planetLand, true); planetBase->SetParent(nullptr); - Transformable::HardDelete(planetBase, true); + Transformable::HardDelete(planetBase, false); resources.clear(); } diff --git a/PlanetExplorerGameDemo/src/Utilities/TextureHandler.cpp b/PlanetExplorerGameDemo/src/Utilities/TextureHandler.cpp index 86865d0..64ca32d 100644 --- a/PlanetExplorerGameDemo/src/Utilities/TextureHandler.cpp +++ b/PlanetExplorerGameDemo/src/Utilities/TextureHandler.cpp @@ -2,7 +2,7 @@ void TextureHandler::LoadTextures() { - mainTextures = new Texture(".textures/mainSprites.png"); + mainTextures = new Texture("./textures/mainSprites.png"); mainSet = new TileSet(mainTextures, 8, 8); } diff --git a/PlanetExplorerGameDemo/src/main.cpp b/PlanetExplorerGameDemo/src/main.cpp index 7d22b42..14d2848 100644 --- a/PlanetExplorerGameDemo/src/main.cpp +++ b/PlanetExplorerGameDemo/src/main.cpp @@ -79,7 +79,7 @@ void CleanUp() #ifdef USE_EDITOR delete(editor); #endif - Transformable::DeleteAll(); + //Transformable::DeleteAll(); PlanetShader::Destroy(); UnLoadBasicShaders(); TextureHandler::UnLoadTextures(); diff --git a/TSE b/TSE index 3795844..11e8d34 160000 --- a/TSE +++ b/TSE @@ -1 +1 @@ -Subproject commit 37958449a2d68be30f2207241f8565821af65e30632554637bcfe0e05ab8f043 +Subproject commit 11e8d343af724a65601cc16bff3609d8d8ff6285bb95ffea3c95a0558ba347c2