Silence some warnings
This commit is contained in:
@@ -16,7 +16,7 @@ namespace OpenVulkano
|
||||
ArCameraController::ArCameraController(Scene::Camera* camera, const std::shared_ptr<AR::ArSession>& session, const Math::Matrix4f& registration)
|
||||
: CameraController(camera), m_arSession(session), m_registration(registration), m_updated(false)
|
||||
{
|
||||
Init();
|
||||
CommonInit();
|
||||
}
|
||||
|
||||
ArCameraController::~ArCameraController()
|
||||
@@ -24,7 +24,7 @@ namespace OpenVulkano
|
||||
if (m_arSession) Close();
|
||||
}
|
||||
|
||||
void ArCameraController::Init()
|
||||
void ArCameraController::CommonInit()
|
||||
{
|
||||
//m_registration = Math::Utils::translate(Math::Vector3f_SIMD(0.0f, 0.0f, -2.5f)) * Math::Utils::rotate(Math::Matrix4f(1), M_PI_2f, {0,1,0});
|
||||
if (m_arSession)
|
||||
@@ -70,7 +70,7 @@ namespace OpenVulkano
|
||||
CameraController::Init(camera);
|
||||
m_arSession = session;
|
||||
m_registration = registration;
|
||||
Init();
|
||||
CommonInit();
|
||||
}
|
||||
|
||||
void ArCameraController::Tick()
|
||||
|
||||
@@ -34,7 +34,10 @@ namespace OpenVulkano
|
||||
|
||||
~ArCameraController() override;
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Woverloaded-virtual"
|
||||
void Init(Scene::Camera* camera, const std::shared_ptr<AR::ArSession>& session = nullptr, const Math::Matrix4f& registration = Math::Matrix4f (1));
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
void Tick() override;
|
||||
|
||||
@@ -45,7 +48,7 @@ namespace OpenVulkano
|
||||
[[nodiscard]] std::shared_ptr<AR::ArSession> GetArSession() const { return m_arSession; }
|
||||
|
||||
private:
|
||||
void Init();
|
||||
void CommonInit();
|
||||
|
||||
void UpdateCameraViewMatrix(const Math::Matrix4f& transform);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user