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

Merge, now you can see sprites.

Browse Source 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
This commit is contained in:
Stiffly
2014-05-31 00:00:00 +02:00
parent 28c3cf5e16 0bba9e40d4
commit 370dbb96ad
7 changed files with 92 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.cpp
+50 -46
View File
@@ -745,29 +745,31 @@ EntityID GameWorld::CreateTank(int playerID)
}
CommitEntity(wheel);
// auto entity = CreateEntity(tank);
// auto transformComponent = AddComponent<Components::Transform>(entity);
// transformComponent->Position = glm::vec3(2, -1.7, 2.0);
// transformComponent->Scale = glm::vec3(3, 3, 3);
// transformComponent->Orientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1, 0, 0));
// auto emitterComponent = AddComponent<Components::ParticleEmitter>(entity);
// emitterComponent->SpawnCount = 2;
// emitterComponent->SpawnFrequency = 0.005;
// emitterComponent->SpreadAngle = glm::pi<float>();
// emitterComponent->UseGoalVelocity = false;
// emitterComponent->LifeTime = 0.5;
// //emitterComponent->AngularVelocitySpectrum.push_back(glm::pi<float>() / 100);
// emitterComponent->ScaleSpectrum.push_back(glm::vec3(0.05));
// CommitEntity(entity);
//
// auto particleEntity = CreateEntity(entity);
// auto TEMP = AddComponent<Components::Transform>(particleEntity);
// TEMP->Scale = glm::vec3(0);
// auto spriteComponent = AddComponent<Components::Sprite>(particleEntity);
// spriteComponent->SpriteFile = "Models/Textures/Sprites/Dust.png";
// emitterComponent->ParticleTemplate = particleEntity;
//
// CommitEntity(particleEntity);
auto entity = CreateEntity(tank);
auto transformComponent = AddComponent<Components::Transform>(entity);
transformComponent->Position = glm::vec3(2, -1.7, 2.0);
transformComponent->Scale = glm::vec3(3, 3, 3);
transformComponent->Orientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1, 0, 0));
auto emitterComponent = AddComponent<Components::ParticleEmitter>(entity);
emitterComponent->SpawnCount = 2;
emitterComponent->SpawnFrequency = 0.005;
emitterComponent->SpreadAngle = glm::pi<float>();
emitterComponent->UseGoalVelocity = false;
emitterComponent->LifeTime = 0.5;
//emitterComponent->AngularVelocitySpectrum.push_back(glm::pi<float>() / 100);
emitterComponent->ScaleSpectrum.push_back(glm::vec3(0.05));
CommitEntity(entity);
{
auto particleEntity = CreateEntity(entity);
auto templateComponent = AddComponent<Components::Template>(particleEntity);
auto TEMP = AddComponent<Components::Transform>(particleEntity);
TEMP->Scale = glm::vec3(0);
auto spriteComponent = AddComponent<Components::Sprite>(particleEntity);
spriteComponent->SpriteFile = "Models/Textures/Sprites/Dust.png";
CommitEntity(particleEntity);
emitterComponent->ParticleTemplate = particleEntity;
}
}
{
@@ -830,29 +832,31 @@ EntityID GameWorld::CreateTank(int playerID)
CommitEntity(wheel);
#pragma endregion
// auto entity = CreateEntity(tank);
// auto transformComponent = AddComponent<Components::Transform>(entity);
// transformComponent->Position = glm::vec3(-2, -1.7, 2.0);
// transformComponent->Scale = glm::vec3(3, 3, 3);
// transformComponent->Orientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1, 0, 0));
// auto emitterComponent = AddComponent<Components::ParticleEmitter>(entity);
// emitterComponent->SpawnCount = 2;
// emitterComponent->SpawnFrequency = 0.005;
// emitterComponent->SpreadAngle = glm::pi<float>();
// emitterComponent->UseGoalVelocity = false;
// emitterComponent->LifeTime = 0.5;
// //emitterComponent->AngularVelocitySpectrum.push_back(glm::pi<float>() / 100);
// emitterComponent->ScaleSpectrum.push_back(glm::vec3(0.05));
// CommitEntity(entity);
//
// auto particleEntity = CreateEntity(entity);
// auto TEMP = AddComponent<Components::Transform>(particleEntity);
// TEMP->Scale = glm::vec3(0);
// auto spriteComponent = AddComponent<Components::Sprite>(particleEntity);
// spriteComponent->SpriteFile = "Models/Textures/Sprites/Dust.png";
// emitterComponent->ParticleTemplate = particleEntity;
//
// CommitEntity(particleEntity);
auto entity = CreateEntity(tank);
auto transformComponent = AddComponent<Components::Transform>(entity);
transformComponent->Position = glm::vec3(-2, -1.7, 2.0);
transformComponent->Scale = glm::vec3(3, 3, 3);
transformComponent->Orientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1, 0, 0));
auto emitterComponent = AddComponent<Components::ParticleEmitter>(entity);
emitterComponent->SpawnCount = 2;
emitterComponent->SpawnFrequency = 0.005;
emitterComponent->SpreadAngle = glm::pi<float>();
emitterComponent->UseGoalVelocity = false;
emitterComponent->LifeTime = 0.5;
//emitterComponent->AngularVelocitySpectrum.push_back(glm::pi<float>() / 100);
emitterComponent->ScaleSpectrum.push_back(glm::vec3(0.05));
CommitEntity(entity);
{
auto particleEntity = CreateEntity(entity);
auto templateComponent = AddComponent<Components::Template>(particleEntity);
auto TEMP = AddComponent<Components::Transform>(particleEntity);
TEMP->Scale = glm::vec3(0);
auto spriteComponent = AddComponent<Components::Sprite>(particleEntity);
spriteComponent->SpriteFile = "Models/Textures/Sprites/Dust.png";
CommitEntity(particleEntity);
emitterComponent->ParticleTemplate = particleEntity;
}
}
CommitEntity(tank);