Using morphable and freecam controllers in example app, blending matrices using vectors, improvements regarding updating projection matrices, removed FreeCam components from MorphableController, renamed variable to m_targetMorphStatePerspective, setting target morph state using setter
This commit is contained in:
@@ -39,7 +39,8 @@ namespace OpenVulkano
|
||||
{
|
||||
Scene::Scene m_scene;
|
||||
Scene::MorphableCamera m_camera;
|
||||
Scene::MorphableCameraController m_cameraControl;
|
||||
Scene::MorphableCameraController m_morphableCameraControl;
|
||||
FreeCamCameraController m_cameraControl;
|
||||
Scene::Material m_material;
|
||||
Scene::Shader m_shader;
|
||||
|
||||
@@ -113,7 +114,11 @@ namespace OpenVulkano
|
||||
}
|
||||
|
||||
public:
|
||||
MovingCubeAppImpl() : m_camera(90, 16, 9, 0.1, 1000) { m_cameraControl.Init(&m_camera); }
|
||||
MovingCubeAppImpl() : m_camera(90, 16, 9, 0.1, 1000)
|
||||
{
|
||||
m_morphableCameraControl.Init(&m_camera);
|
||||
m_cameraControl.Init(&m_camera);
|
||||
}
|
||||
|
||||
void Init() override
|
||||
{
|
||||
@@ -190,6 +195,7 @@ namespace OpenVulkano
|
||||
void Tick() override
|
||||
{
|
||||
m_cameraControl.Tick();
|
||||
m_morphableCameraControl.Tick();
|
||||
m_simpleAnimationController.Tick();
|
||||
m_sequenceAnimationController.Tick();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user