Skip to content
Snippets Groups Projects
Commit 58eae28d authored by Nils Petter Skålerud's avatar Nils Petter Skålerud
Browse files

Fixed bug in MeshRenderer::GetModel()

parent b34c9a1b
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,7 @@ namespace Engine ...@@ -51,7 +51,7 @@ namespace Engine
if (space == Space::Local) if (space == Space::Local)
return localModel; return localModel;
else else
Multiply(GetSceneObject().transform.GetModel_Reduced(Space::World), localModel); return Multiply(GetSceneObject().transform.GetModel_Reduced(Space::World), localModel);
} }
Math::Matrix4x4 MeshRenderer::GetModel(Space space) const Math::Matrix4x4 MeshRenderer::GetModel(Space space) const
......
...@@ -27,7 +27,7 @@ namespace Engine ...@@ -27,7 +27,7 @@ namespace Engine
if (space == Space::Local) if (space == Space::Local)
return localModel; return localModel;
else else
Multiply(GetSceneObject().transform.GetModel_Reduced(Space::World), localModel); return Multiply(GetSceneObject().transform.GetModel_Reduced(Space::World), localModel);
} }
} }
} }
\ No newline at end of file
...@@ -70,7 +70,6 @@ void Engine::Core::Run() ...@@ -70,7 +70,6 @@ void Engine::Core::Run()
auto& sceneObject1 = scene1.NewSceneObject(); auto& sceneObject1 = scene1.NewSceneObject();
auto& sprite1 = sceneObject1.AddComponent<Components::MeshRenderer>().first.get(); auto& sprite1 = sceneObject1.AddComponent<Components::MeshRenderer>().first.get();
sprite1.SetMesh(Asset::Mesh::Helmet); sprite1.SetMesh(Asset::Mesh::Helmet);
...@@ -112,6 +111,9 @@ void Engine::Core::Run() ...@@ -112,6 +111,9 @@ void Engine::Core::Run()
camera.position += Math::Vector3D::Down() * speed * scene1.GetTimeData().GetDeltaTime(); camera.position += Math::Vector3D::Down() * speed * scene1.GetTimeData().GetDeltaTime();
camera.LookAt({ 0, 0, 0 }); camera.LookAt({ 0, 0, 0 });
if (Input::Raw::GetValue(Input::Raw::Button::K))
mesh2.positionOffset.y += 1.f * scene1.GetTimeData().GetDeltaTime();
if (Input::Raw::GetEventType(Input::Raw::Button::C) == Input::EventType::Pressed) if (Input::Raw::GetEventType(Input::Raw::Button::C) == Input::EventType::Pressed)
{ {
scene1.Clear(); scene1.Clear();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment