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

Merge branch 'master' into water

Browse Source
This commit is contained in:
Stiffly
2015-10-08 13:36:01 +02:00
parent b5785da5d5 bb314898ba
commit 51cc45fbf0
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+2 -2
View File
@@ -214,7 +214,7 @@ public:
//ParticleTest //ParticleTest
{ /*{
auto Pe = m_World->CreateEntity(); auto Pe = m_World->CreateEntity();
auto transform = m_World->AddComponent<Components::Transform>(Pe); auto transform = m_World->AddComponent<Components::Transform>(Pe);
auto particleEmitter= m_World->AddComponent<Components::ParticleEmitter>(Pe); auto particleEmitter= m_World->AddComponent<Components::ParticleEmitter>(Pe);
@@ -245,7 +245,7 @@ public:
PtParticle->Flags = static_cast<ParticleFlags::Type>(ParticleFlags::Type::Powder | ParticleFlags::Type::ParticleContactFilter | ParticleFlags::Type::FixtureContactFilter); PtParticle->Flags = static_cast<ParticleFlags::Type>(ParticleFlags::Type::Powder | ParticleFlags::Type::ParticleContactFilter | ParticleFlags::Type::FixtureContactFilter);
} }
m_World->CommitEntity(Pe); m_World->CommitEntity(Pe);
} }*/
//TODO: Why does the ball not collide with these bricks? //TODO: Why does the ball not collide with these bricks?
//BottomBox //BottomBox
include/Physics/ECreateParticleSequence.h
+2 -2
View File
@@ -19,8 +19,8 @@ struct CreateParticleSequence : public Event
int NumberOfTicks = 100; int NumberOfTicks = 100;
float Speed = 1.f; float Speed = 1.f;
int ParticlesPerTick = 1.f; int ParticlesPerTick = 1.f;
float Spread = glm::pi<float>(); float Spread = 1.f;
float EmittingAngle = glm::two_pi<float>(); float EmittingAngle = 0.f;
float MaxCount = 0; float MaxCount = 0;
//Particle //Particle
include/Physics/PhysicsSystem.h
+4 -3
View File
@@ -2,6 +2,7 @@
#define DAYDREAM_PHYSICSSYSTEM_H #define DAYDREAM_PHYSICSSYSTEM_H
#include <unordered_map> #include <unordered_map>
#include <random>
#include <Box2D/Box2D.h> #include <Box2D/Box2D.h>
@@ -116,13 +117,13 @@ namespace dd
float m_Timer = 0; float m_Timer = 0;
//TODO: Fill struct with info needed. //TODO: Fill struct with info needed.
struct ParticleEmitter //TODO CHANGE NAMES struct EmitterHandler //TODO CHANGE NAMES
{ {
std::vector<b2ParticleSystem*> ParticleSystem; std::vector<b2ParticleSystem*> ParticleSystem;
std::vector<EntityID> ParticleEmitter; std::vector<EntityID> ParticleEmitter;
std::vector<EntityID> ParticleTemplate; std::vector<EntityID> ParticleTemplate;
}; };
ParticleEmitter m_ParticleEmitters; EmitterHandler m_ParticleEmitters;
std::list<Impulse> m_Impulses; std::list<Impulse> m_Impulses;
@@ -134,7 +135,7 @@ namespace dd
: m_PhysicsSystem(physicsSystem) { } : m_PhysicsSystem(physicsSystem) { }
void SayGoodbye(b2Joint*) {LOG_INFO("joint körs");}; void SayGoodbye(b2Joint*) {LOG_INFO("joint körs");};
void SayGoodbye(b2Fixture*) {LOG_INFO("Fixture körs");}; void SayGoodbye(b2Fixture*) {/*LOG_INFO("Fixture körs");*/};
void SayGoodbye(b2ParticleSystem* particleSystem, int32 index) override void SayGoodbye(b2ParticleSystem* particleSystem, int32 index) override
{ {