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-10-07 17:13:05 +02:00
parent 3814c25931 bfa8545483
commit 9bb50067fc
7 changed files with 32 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+1 -1
View File
@@ -200,7 +200,7 @@ public:
// {
// auto Pe = m_World->CreateEntity();
// auto transform = m_World->AddComponent<Components::Transform>(Pe);
// auto particleEmitter= m_World->AddComponent<Components::ParticleEmitter>(Pe);
// auto particleEmitter= m_World->AddComponent<Components::Emitter>(Pe);
//
// transform->Position = glm::vec3(0.f, -5.f, -10.f);
// particleEmitter->GravityScale = 0.0f;
include/Physics/CParticleEmitter.h
+1 -1
View File
@@ -14,7 +14,7 @@ struct ParticleEmitter : public Component
double SpawnRate = 1.f;
double TimeSinceLastSpawn = 0;
//ParticleSystem variables
//System variables
float GravityScale = 1.0f;
};
include/Physics/PhysicsSystem.h
+4 -4
View File
@@ -58,7 +58,7 @@ namespace dd
struct Impulse
{
b2Body* Body;
b2Vec2 Impulse;
b2Vec2 Vector;
b2Vec2 Point;
};
bool m_Pause = false;
@@ -99,9 +99,9 @@ namespace dd
//TODO: Fill struct with info needed.
struct ParticleEmitter
{
std::vector<b2ParticleSystem*> ParticleSystem;
std::vector<EntityID> ParticleEmitter;
std::vector<EntityID> ParticleTemplate;
std::vector<b2ParticleSystem*> System;
std::vector<EntityID> Emitter;
std::vector<EntityID> Template;
};
ParticleEmitter m_ParticleEmitters;