Skip to content
Snippets Groups Projects
Commit f9b9baba authored by Bernd Hentschel's avatar Bernd Hentschel
Browse files

Fix minor linting issues

parent 5d3a4349
No related branches found
No related tags found
1 merge request!87Feature/#310 switching scenes
...@@ -323,31 +323,31 @@ void TestRuntimeEntityStructure(std::shared_ptr<phx::Scene> scene) { ...@@ -323,31 +323,31 @@ void TestRuntimeEntityStructure(std::shared_ptr<phx::Scene> scene) {
} }
} }
void InitMatrices(glm::mat4 &platform_trans_mat, glm::mat4 &hmd_trans_mat, void InitMatrices(glm::mat4 *platform_trans_mat, glm::mat4 *hmd_trans_mat,
glm::mat4 &left_eye_trans_mat, glm::mat4 *left_eye_trans_mat,
glm::mat4 &right_eye_trans_mat) { glm::mat4 *right_eye_trans_mat) {
platform_trans_mat = *platform_trans_mat =
glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
1.0f, 0.0f, 1.0f, -1.0f, 0.5f, 1.0f); 1.0f, 0.0f, 1.0f, -1.0f, 0.5f, 1.0f);
hmd_trans_mat = glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, *hmd_trans_mat = glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f, 0.5f, 1.8f, 0.2f, 1.0f); 0.0f, 0.0f, 1.0f, 0.0f, 0.5f, 1.8f, 0.2f, 1.0f);
left_eye_trans_mat = *left_eye_trans_mat =
glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
1.0f, 0.0f, -0.04f, 0.0f, 0.0f, 1.0f); 1.0f, 0.0f, -0.04f, 0.0f, 0.0f, 1.0f);
right_eye_trans_mat = *right_eye_trans_mat =
glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, glm::mat4(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
1.0f, 0.0f, 0.04f, 0.0f, 0.0f, 1.0f); 1.0f, 0.0f, 0.04f, 0.0f, 0.0f, 1.0f);
SetGlmToArrayMatrix_3_4(hmd_trans_mat, openvr_mock.head_transformation_); SetGlmToArrayMatrix_3_4(*hmd_trans_mat, openvr_mock.head_transformation_);
SetGlmToArrayMatrix_3_4(left_eye_trans_mat, openvr_mock.eye_to_head_left_); SetGlmToArrayMatrix_3_4(*left_eye_trans_mat, openvr_mock.eye_to_head_left_);
SetGlmToArrayMatrix_3_4(right_eye_trans_mat, openvr_mock.eye_to_head_right_); SetGlmToArrayMatrix_3_4(*right_eye_trans_mat, openvr_mock.eye_to_head_right_);
} }
void TestRuntimeEntityUpdate(std::shared_ptr<phx::Scene> scene, void TestRuntimeEntityUpdate(std::shared_ptr<phx::Scene> scene,
phx::TrackingSystem *tracking_system) { phx::TrackingSystem *tracking_system) {
glm::mat4 platform_trans_mat, hmd_trans_mat, left_eye_trans_mat, glm::mat4 platform_trans_mat, hmd_trans_mat, left_eye_trans_mat,
right_eye_trans_mat; right_eye_trans_mat;
InitMatrices(platform_trans_mat, hmd_trans_mat, left_eye_trans_mat, InitMatrices(&platform_trans_mat, &hmd_trans_mat, &left_eye_trans_mat,
right_eye_trans_mat); &right_eye_trans_mat);
WHEN("The tracking system is updated.") { WHEN("The tracking system is updated.") {
tracking_system->Update(phx::FrameTimer::TimeInfo()); tracking_system->Update(phx::FrameTimer::TimeInfo());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment