BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

Browse Source
This commit is contained in:
PlatinumSkink
2015-09-11 10:51:52 +02:00
parent c829315598 6932a22d7a
commit ead7c6c754
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+1 -1
View File
@@ -170,7 +170,7 @@ public:
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(0.f, -3.f, -9.f);
transform->Scale = glm::vec3(2.f, 0.5f, 1.f);
//transform->Orientation = glm::rotate(transform->Orientation, glm::radians(35.f), glm::vec3(0, 0, -1));
transform->Orientation = glm::rotate(transform->Orientation, glm::radians(25.f), glm::vec3(0, 0, -1));
std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
include/Physics/PhysicsSystem.h
+2
View File
@@ -78,6 +78,8 @@ private:
e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];
std::cout << e.Entity1 << " " << e.Entity2 << std::endl;
m_PhysicsSystem->EventBroker->Publish(e);
}
void EndContact(b2Contact* contact)