From 0fd24780492d2c9542e55c6768225b51e993c446 Mon Sep 17 00:00:00 2001
From: h4570 <sandro.sobczynski@gmail.com>
Date: Wed, 24 Aug 2022 19:50:11 +0200
Subject: [PATCH] demo fixes

---
 demo/src/states/game/enemy/enemy_manager.cpp | 8 +++-----
 demo/src/states/game/player/weapon.cpp       | 5 ++---
 demo/src/states/game/ship/ship.cpp           | 5 ++---
 demo/src/states/game/skybox/skybox.cpp       | 7 +++----
 demo/src/states/game/terrain/terrain.cpp     | 8 ++++----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/demo/src/states/game/enemy/enemy_manager.cpp b/demo/src/states/game/enemy/enemy_manager.cpp
index c463dd6..62f30a7 100644
--- a/demo/src/states/game/enemy/enemy_manager.cpp
+++ b/demo/src/states/game/enemy/enemy_manager.cpp
@@ -28,12 +28,10 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) {
   objOptions.flipUVs = true;
   objOptions.scale = 250.0F;
 
-  auto* data = loader.load(FileUtils::fromCwd("game/models/zombie/zombie.obj"),
-                           objOptions);
+  auto data = loader.load(FileUtils::fromCwd("game/models/zombie/zombie.obj"),
+                          objOptions);
   data->normalsEnabled = false;
-  motherMesh = new DynamicMesh(*data);
-
-  delete data;
+  motherMesh = new DynamicMesh(data.get());
 
   bodyTexture = textureRepo->add(
       FileUtils::fromCwd("game/models/zombie/BodyMaterial.png"));
diff --git a/demo/src/states/game/player/weapon.cpp b/demo/src/states/game/player/weapon.cpp
index dc36c1e..c3144e6 100644
--- a/demo/src/states/game/player/weapon.cpp
+++ b/demo/src/states/game/player/weapon.cpp
@@ -26,11 +26,10 @@ Weapon::Weapon(Engine* engine) {
   pad = &engine->pad;
   audio = &engine->audio;
   auto* repo = &engine->renderer.core.texture.repository;
-  auto* data =
+  auto data =
       loader.load(FileUtils::fromCwd("game/models/ak47/ak47.obj"), objOptions);
   data->normalsEnabled = false;
-  mesh = new StaticMesh(*data);
-  delete data;
+  mesh = new StaticMesh(data.get());
 
   mesh->translation.translateX(2.85F);
   mesh->translation.translateY(-3.40F);
diff --git a/demo/src/states/game/ship/ship.cpp b/demo/src/states/game/ship/ship.cpp
index 062e1a2..37fee41 100644
--- a/demo/src/states/game/ship/ship.cpp
+++ b/demo/src/states/game/ship/ship.cpp
@@ -23,10 +23,9 @@ Ship::Ship(TextureRepository* repo) {
   objOptions.flipUVs = true;
   objOptions.scale = 200.0F;
 
-  auto* data =
+  auto data =
       loader.load(FileUtils::fromCwd("game/models/ship/ship.obj"), objOptions);
-  mesh = new StaticMesh(*data);
-  delete data;
+  mesh = new StaticMesh(data.get());
 
   for (std::size_t i = 0; i < mesh->materials.size(); i++) {
     mesh->materials[i]->ambient /= 2.0F;
diff --git a/demo/src/states/game/skybox/skybox.cpp b/demo/src/states/game/skybox/skybox.cpp
index 435cd72..a59acc4 100644
--- a/demo/src/states/game/skybox/skybox.cpp
+++ b/demo/src/states/game/skybox/skybox.cpp
@@ -23,11 +23,10 @@ Skybox::Skybox(TextureRepository* repo) {
   objOptions.flipUVs = true;
   objOptions.scale = 100.0F;
 
-  auto* data = loader.load(FileUtils::fromCwd("game/models/skybox/skybox.obj"),
-                           objOptions);
+  auto data = loader.load(FileUtils::fromCwd("game/models/skybox/skybox.obj"),
+                          objOptions);
   data->normalsEnabled = false;
-  mesh = new StaticMesh(*data);
-  delete data;
+  mesh = new StaticMesh(data.get());
 
   repo->addByMesh(mesh, FileUtils::fromCwd("game/models/skybox/"), "png");
 
diff --git a/demo/src/states/game/terrain/terrain.cpp b/demo/src/states/game/terrain/terrain.cpp
index b4835ba..6848bfc 100644
--- a/demo/src/states/game/terrain/terrain.cpp
+++ b/demo/src/states/game/terrain/terrain.cpp
@@ -27,11 +27,11 @@ Terrain::Terrain(TextureRepository* repo)
   objOptions.flipUVs = true;
   objOptions.scale = 100.0F;
 
-  auto* data = loader.load(
-      FileUtils::fromCwd("game/models/terrain/terrain.obj"), objOptions);
+  auto data = loader.load(FileUtils::fromCwd("game/models/terrain/terrain.obj"),
+                          objOptions);
   data->normalsEnabled = false;
-  mesh = new StaticMesh(*data);
-  delete data;
+  mesh = new StaticMesh(data.get());
+
   repo->addByMesh(mesh, FileUtils::fromCwd("game/models/terrain/"), "png");
 
   allocateOptions();