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

Fixed a bug where you could not have more than one particle group

Browse Source
This commit is contained in:
tleety
2015-09-29 10:27:57 +02:00
parent 7d9e3e00a4
commit 38d3a8c990
5 changed files with 69 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
Regular → Executable
+11
View File
@@ -203,6 +203,16 @@ public:
m_World->CommitEntity(background);
}
//Water test
{
auto t_waterBody = m_World->CreateEntity();
auto transform = m_World->AddComponent<Components::Transform>(t_waterBody);
transform->Position = glm::vec3(0.f, -0.5f, -10.f);
transform->Scale = glm::vec3(1.f, 1.f, 1.f);
auto water = m_World->AddComponent<Components::WaterVolume>(t_waterBody);
auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
m_World->CommitEntity(t_waterBody);
}
//Water test
{
auto t_waterBody = m_World->CreateEntity();
@@ -213,6 +223,7 @@ public:
auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
m_World->CommitEntity(t_waterBody);
}
//TODO: Why does the ball not collide with these bricks?
//BottomBox
{