diff --git a/src/Editor/Window/SceneView.cpp b/src/Editor/Window/SceneView.cpp index 20f6d84..42e96ce 100644 --- a/src/Editor/Window/SceneView.cpp +++ b/src/Editor/Window/SceneView.cpp @@ -22,11 +22,6 @@ SceneView::SceneView(Gfx::PGraphics graphics, PWindow owner, const ViewportCreat )) , cameraSystem(createInfo.dimensions, Vector(0, 0, 10)) { - - //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Ely\\Ely.fbx"); - //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Cube\\cube.obj"); - //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Plane\\plane.fbx"); - cameraSystem.update(viewportCamera, static_cast(Gfx::getCurrentFrameDelta())); renderGraph.updateViewport(viewport); diff --git a/src/Editor/Window/ViewportControl.cpp b/src/Editor/Window/ViewportControl.cpp index 7738fdd..16e7b07 100644 --- a/src/Editor/Window/ViewportControl.cpp +++ b/src/Editor/Window/ViewportControl.cpp @@ -53,24 +53,7 @@ void ViewportControl::update(Component::Camera& camera, float deltaTime) { moveVector += glm::vec3(0, -cameraMove, 0); } - position += moveVector; - static float lastX, lastY; - if(mouse2) - { - float deltaX = mouseX - lastX; - float deltaY = mouseY - lastY; - yaw += deltaX / 500.f; - pitch -= deltaY / 500.f; - } - lastX = mouseX; - lastY = mouseY; - springArm = glm::normalize( - Vector( - cos(yaw) * cos(pitch), - sin(pitch), - sin(yaw) * cos(pitch))); - camera.viewMatrix = glm::lookAt(position, position + springArm, Vector(0, 1, 0)); - std::cout << yaw << " " << pitch << std::endl; + throw std::logic_error("Not implemented"); } void ViewportControl::keyCallback(KeyCode key, InputAction action) diff --git a/src/Engine/Component/Camera.h b/src/Engine/Component/Camera.h index 2f9609d..b8a31ed 100644 --- a/src/Engine/Component/Camera.h +++ b/src/Engine/Component/Camera.h @@ -33,8 +33,6 @@ struct Camera private: float yaw; float pitch; - // Spring arm transform - Math::Transform relativeTransform; Matrix4 viewMatrix; Vector cameraPos; bool bNeedsViewBuild; diff --git a/src/Engine/Game.h b/src/Engine/Game.h index 2913093..f7e567f 100644 --- a/src/Engine/Game.h +++ b/src/Engine/Game.h @@ -1,14 +1,13 @@ #pragma once #include "Scene/Scene.h" #include "System/SystemGraph.h" -#include "Asset/AssetRegistry.h" namespace Seele { class Game { public: - Game(AssetRegistry*) {} + Game() {} virtual ~Game() {} virtual void setupScene(PScene scene, PSystemGraph graph) = 0; }; diff --git a/src/Engine/Platform/Windows/GameInterface.cpp b/src/Engine/Platform/Windows/GameInterface.cpp index a7c0727..7ead9de 100644 --- a/src/Engine/Platform/Windows/GameInterface.cpp +++ b/src/Engine/Platform/Windows/GameInterface.cpp @@ -17,7 +17,7 @@ Game* GameInterface::getGame() return game; } -void GameInterface::reload(AssetRegistry* registry) +void GameInterface::reload() { if(lib != NULL) { @@ -27,5 +27,5 @@ void GameInterface::reload(AssetRegistry* registry) lib = LoadLibraryA(dllPath.c_str()); createInstance = (decltype(createInstance))GetProcAddress(lib, "createInstance"); destroyInstance = (decltype(destroyInstance))GetProcAddress(lib, "destroyInstance"); - game = createInstance(registry); + game = createInstance(); } \ No newline at end of file diff --git a/src/Engine/Platform/Windows/GameInterface.h b/src/Engine/Platform/Windows/GameInterface.h index e397ca2..ed0e447 100644 --- a/src/Engine/Platform/Windows/GameInterface.h +++ b/src/Engine/Platform/Windows/GameInterface.h @@ -10,12 +10,12 @@ public: GameInterface(std::string dllPath); ~GameInterface(); Game* getGame(); - void reload(AssetRegistry* registry); + void reload(); private: HMODULE lib = NULL; std::string dllPath; Game* game; - Game* (*createInstance)(AssetRegistry*) = nullptr; + Game* (*createInstance)() = nullptr; void (*destroyInstance)(Game*) = nullptr; }; } // namespace Seele \ No newline at end of file