GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/plane_camera_controller'

Browse Source 
# Conflicts:
#	examples/ExampleApps/MovingCubeApp.cpp
This commit is contained in:
GeorgH93
2024-07-14 18:30:15 +02:00
parent ec161aa498 4035d10c12
commit 29bad103e6
3 changed files with 147 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/ExampleApps/MovingCubeApp.cpp
View File

@@ -17,6 +17,7 @@
#include "Scene/SimpleAnimationController.hpp"
#include "Scene/SequenceAnimationController.hpp"
#include "Scene/MorphableCameraController.hpp"
#include "Scene/PlaneCameraController.hpp"
#include "Scene/UI/PerformanceInfo.hpp"
#include "Input/InputManager.hpp"
#include "Host/GraphicsAppManager.hpp"
@@ -24,6 +25,8 @@
#include "Base/Logger.hpp"
#include "Controller/FreeCamCameraController.hpp"
#define USE_PLANE_CAM_CONTROL 0
namespace OpenVulkano
{
namespace
@@ -34,13 +37,18 @@ namespace OpenVulkano
Scene::SimpleDrawable m_drawable;
Scene::Node m_node;
};
const Math::Vector3f PLANE_NORMAL(1, 0, 1);
}
class MovingCubeAppImpl final : public MovingCubeApp
{
Scene::Scene m_scene;
Scene::MorphableCamera m_camera;
Scene::MorphableCameraController m_morphableCameraControl;
#if USE_PLANE_CAM_CONTROL
Scene::PlaneCameraController m_cameraControl;
#else
FreeCamCameraController m_cameraControl;
#endif
Scene::Material m_material;
Scene::Shader m_shader;
@@ -117,7 +125,12 @@ namespace OpenVulkano
MovingCubeAppImpl() : m_camera(90)
{
m_morphableCameraControl.Init(&m_camera);
#if USE_PLANE_CAM_CONTROL
m_cameraControl.Init(&m_camera, PLANE_NORMAL);
// m_cameraControl.Init(&m_camera, Scene::PlaneCameraController::DefaultAxis::OYZ);
#else
m_cameraControl.Init(&m_camera);
#endif
m_camera.SetZoom(50);
}
@@ -133,7 +146,12 @@ namespace OpenVulkano
m_shader.AddVertexInputDescription(Vertex::GetVertexInputDescription());
GetGraphicsAppManager()->GetRenderer()->SetScene(&m_scene);
#if USE_PLANE_CAM_CONTROL
m_cameraControl.Init(&m_camera, PLANE_NORMAL);
// m_cameraControl.Init(&m_camera, Scene::PlaneCameraController::DefaultAxis::OYZ);
#else
m_cameraControl.Init(&m_camera);
#endif
m_cameraControl.SetDefaultKeybindings();
CreateSceneElement(&m_whiteBox, Math::Vector4f(1, 1, 1, 1), 1);