testing of TSE on a real project, and fixing the project itself
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
void GravityHolder::GenerateRing()
|
void GravityHolder::GenerateRing()
|
||||||
{
|
{
|
||||||
planetMapRing = new Transformable();
|
planetMapRing = new Transformable("GravityHolder");
|
||||||
mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader"));
|
mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader"));
|
||||||
const float pixelsNormal = gravityDistance * 4 * 32;
|
const float pixelsNormal = gravityDistance * 4 * 32;
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ GravityHolder::GravityHolder(float gravityWell)
|
|||||||
|
|
||||||
GravityHolder::~GravityHolder()
|
GravityHolder::~GravityHolder()
|
||||||
{
|
{
|
||||||
Transformable::HardDelete(planetMapRing, true);
|
Transformable::HardDelete(planetMapRing, false);
|
||||||
delete mat;
|
delete mat;
|
||||||
delete mesh;
|
delete mesh;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ PlanetRotater::PlanetRotater(float distance)
|
|||||||
|
|
||||||
PlanetRotater::~PlanetRotater()
|
PlanetRotater::~PlanetRotater()
|
||||||
{
|
{
|
||||||
Transformable::HardDelete(planetMapRing, true);
|
Transformable::HardDelete(planetMapRing, false);
|
||||||
delete mat;
|
delete mat;
|
||||||
delete mesh;
|
delete mesh;
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,7 @@ Vector3 PlanetRotater::GetPosChange()
|
|||||||
|
|
||||||
void PlanetRotater::GenerateRing()
|
void PlanetRotater::GenerateRing()
|
||||||
{
|
{
|
||||||
planetMapRing = new Transformable();
|
planetMapRing = new Transformable("PlanetRotater");
|
||||||
mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader"));
|
mat = new Material("ringMaterial", ShaderRegistry::GetShader("Planet Shader"));
|
||||||
const float pixelsNormal = distanceToKeep * 2 * 32;
|
const float pixelsNormal = distanceToKeep * 2 * 32;
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ void Asteroid::DeleteResources()
|
|||||||
delete planetMesh;
|
delete planetMesh;
|
||||||
delete planetMat;
|
delete planetMat;
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ void BlackHole::DeleteResources()
|
|||||||
delete planetMat;
|
delete planetMat;
|
||||||
Transformable::HardDelete(planetLand, true);
|
Transformable::HardDelete(planetLand, true);
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ void Galaxy::DeleteResources()
|
|||||||
delete planetMesh;
|
delete planetMesh;
|
||||||
delete planetMat;
|
delete planetMat;
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ void Moon::DeleteResources()
|
|||||||
delete planetMat;
|
delete planetMat;
|
||||||
Transformable::HardDelete(planetLand, true);
|
Transformable::HardDelete(planetLand, true);
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ void Planet::DeleteResources()
|
|||||||
Transformable::HardDelete(planetClouds, true);
|
Transformable::HardDelete(planetClouds, true);
|
||||||
Transformable::HardDelete(planetLand, true);
|
Transformable::HardDelete(planetLand, true);
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Planet.hpp"
|
#include "Planet.hpp"
|
||||||
#include "Asteroidbelt.hpp"
|
#include "AsteroidBelt.hpp"
|
||||||
#include "Star.hpp"
|
#include "Star.hpp"
|
||||||
|
|
||||||
class PlanetarySystem : public ISpace
|
class PlanetarySystem : public ISpace
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ void Star::DeleteResources()
|
|||||||
Transformable::HardDelete(planetClouds, true);
|
Transformable::HardDelete(planetClouds, true);
|
||||||
Transformable::HardDelete(planetLand, true);
|
Transformable::HardDelete(planetLand, true);
|
||||||
planetBase->SetParent(nullptr);
|
planetBase->SetParent(nullptr);
|
||||||
Transformable::HardDelete(planetBase, true);
|
Transformable::HardDelete(planetBase, false);
|
||||||
|
|
||||||
resources.clear();
|
resources.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
void TextureHandler::LoadTextures()
|
void TextureHandler::LoadTextures()
|
||||||
{
|
{
|
||||||
mainTextures = new Texture(".textures/mainSprites.png");
|
mainTextures = new Texture("./textures/mainSprites.png");
|
||||||
mainSet = new TileSet(mainTextures, 8, 8);
|
mainSet = new TileSet(mainTextures, 8, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ void CleanUp()
|
|||||||
#ifdef USE_EDITOR
|
#ifdef USE_EDITOR
|
||||||
delete(editor);
|
delete(editor);
|
||||||
#endif
|
#endif
|
||||||
Transformable::DeleteAll();
|
//Transformable::DeleteAll();
|
||||||
PlanetShader::Destroy();
|
PlanetShader::Destroy();
|
||||||
UnLoadBasicShaders();
|
UnLoadBasicShaders();
|
||||||
TextureHandler::UnLoadTextures();
|
TextureHandler::UnLoadTextures();
|
||||||
|
|||||||
2
TSE
2
TSE
Submodule TSE updated: 37958449a2...11e8d343af
Reference in New Issue
Block a user