Remove projects

Author: catastropher

src/CMakeLists.txt

@@ -160,8 +160,6 @@ add_library(Strife.Engine STATIC
 		Net/FileTransfer.hpp
 		Net/FileTransfer.cpp
         Net/SyncVar.cpp
-		Project/Project.cpp
-		Project/Project.hpp
 		Resource/ResourceManager.hpp Resource/SpriteResource.hpp Resource/SpriteResource.cpp Resource/ResourceManager.cpp Resource/TilemapResource.hpp Resource/TilemapResource.cpp Resource/SpriteFontResource.hpp Resource/SpriteFontResource.cpp
 		Resource/ShaderResource.cpp Resource/ShaderResource.hpp Components/ParticleSystemComponent.hpp Components/ParticleSystemComponent.cpp Scene/Isometric.hpp Scene/Isometric.cpp Components/IsometricSpriteComponent.hpp Components/IsometricSpriteComponent.cpp Resource/FileResource.hpp Resource/FileResource.cpp ML/UtilityAI.hpp Resource/ScriptResource.hpp Resource/ScriptResource.cpp ML/GridSensor.hpp Renderer/SpriteEffect.hpp Renderer/SpriteEffect.cpp Renderer/Stage/RenderPipeline.hpp Renderer/Stage/RenderPipeline.cpp Resource/SpriteAtlasResource.hpp Resource/SpriteAtlasResource.cpp Resource/ResourceSettings.hpp Components/AnimatorComponent.hpp Components/AnimatorComponent.cpp)
 

src/Components/AnimatorComponent.hpp

@@ -33,7 +33,6 @@ DEFINE_COMPONENT(AnimatorComponent)
 
     bool AnimationComplete() const { return _animationComplete; }
 
-
     void PlayAnimation(StringId name, AnimationPlayMode mode);
 
     void Render(Renderer* renderer) override;

src/Engine.hpp

@@ -1,8 +1,7 @@
 #pragma once
 #include <functional>
 #include <optional>
-#include <Project/Project.hpp>
-
+#include <memory>
 
 #include "Memory/BlockAllocator.hpp"
 #include "Tools/ConsoleVar.hpp"
@@ -106,8 +105,6 @@ class Engine
     bool _activeGame = true;
     EngineConfig _config;
 
-    Project _project;
-
     std::function<void()> _loadResources;
 };
 

src/Project/Project.cpp

@@ -100,17 +100,24 @@ SdlManager::SdlManager(Input* input, bool isHeadless)
 void SdlManager::Init()
 {
 #ifdef _WIN32
-    HRESULT hr = SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
+    HRESULT hr = SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);unsigned int flags = SDL_INIT_EVENTS | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER;
+
+    if (SDL_Init(flags) < 0)
+    {
+        FatalError("Failed to initialize SDL: %s", SDL_GetError());
+    }
     if (FAILED(hr))
     {
         _com_error err(hr);
         fwprintf(stderr, L"SetProcessDpiAwareness: %hs\n", err.ErrorMessage());
     }
 #endif
 
-    if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
+    unsigned int flags = SDL_INIT_EVENTS | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER;
+
+    if (SDL_Init(flags) < 0)
     {
-        FatalError("Failed to initialize SDL");
+        FatalError("Failed to initialize SDL: %s", SDL_GetError());
     }
 
     SetDefaultValuesOnFirstRun();

src/Project/Project.hpp

@@ -184,3 +184,10 @@ bool IsContactBeginWith(const IEntityEvent& ev, TEntity*& outEntity)
     const ContactBeginEvent* contactBegin;
     return ev.Is(contactBegin) && contactBegin->other.OwningEntity()->Is<TEntity>(outEntity);
 }
+
+template<typename TEntity>
+bool IsContactBeginWith(const IEntityEvent& ev)
+{
+    const ContactBeginEvent* contactBegin;
+    return ev.Is(contactBegin) && contactBegin->other.OwningEntity()->Is<TEntity>();
+}

src/Renderer/SdlManager.cpp

@@ -5,7 +5,6 @@
 #include "System/BinaryStreamReader.hpp"
 #include "Tools/Console.hpp"
 #include "Renderer/SdlManager.hpp"
-#include "Project/Project.hpp"
 
 void IGame::Run()
 {
@@ -41,8 +40,6 @@ void IGame::Run()
         {
             _engine->GetSdlManager()->SetWindowCaption(_config.windowCaption.value().c_str());
         }
-
-        project = std::make_shared<Project>(_config.projectFilePath);
     }
 
     // Run the game

src/Scene/IEntityEvent.hpp

@@ -54,12 +54,6 @@ struct GameConfig
         return *this;
     }
 
-    GameConfig& SetProjectFile(const std::filesystem::path& path)
-    {
-        projectFilePath = path;
-        return *this;
-    }
-
     GameConfig& EnableMultiplayer()
     {
         isMultiplayer = true;
@@ -74,7 +68,6 @@ struct GameConfig
 
     StringId defaultScene = "empty-map"_sid;
     std::string gameName;
-    std::filesystem::path projectFilePath;
     std::optional<std::string> windowCaption;
     std::optional<std::string> userConfigFile;
     std::optional<std::string> devConsoleFont;
@@ -118,7 +111,6 @@ class IGame
         return _config;
     }
 
-    std::shared_ptr<Project> project;
 private:
     std::unique_ptr<Engine> _engine = nullptr;
     GameConfig _config;

src/Scene/IGame.cpp

@@ -200,7 +200,7 @@ void Scene::LoadMapSegment(const char* name)
 
 void Scene::LoadMapSegment(const MapSegment& segment)
 {
-    auto tileMap = CreateEntity<TilemapEntity>({ 0, 0 });
+    auto tileMap = CreateEntity<TilemapEntity>(Vector2(0, 0 ));
     tileMap->SetMapSegment(segment);
 
 }