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

MSVC12 compiler compability fixes

Browse Source
This commit is contained in:
sippeangelo
2015-10-06 15:27:11 +02:00
parent 6feb587380
commit 7173fdf396
12 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Physics/CParticle.h
+38 -38
View File
@@ -7,24 +7,24 @@ namespace dd {
namespace ParticleFlags {
enum Type {
waterParticle = 0,
zombieParticle = 1 << 1,
wallParticle = 1 << 2,
springParticle = 1 << 3,
elasticParticle = 1 << 4,
viscousParticle = 1 << 5,
powderParticle = 1 << 6,
tensileParticle = 1 << 7,
colorMixingParticle = 1 << 8,
destructionListenerParticle = 1 << 9,
barrierParticle = 1 << 10,
staticPressureParticle = 1 << 11,
reactiveParticle = 1 << 12,
repulsiveParticle = 1 << 13,
fixtureContactListenerParticle = 1 << 14,
particleContactListenerParticle = 1 << 15,
fixtureContactFilterParticle = 1 << 16,
particleContactFilterParticle = 1 << 17
Water = 0,
Zombie = 1 << 1,
Wall = 1 << 2,
Spring = 1 << 3,
Elastic = 1 << 4,
Viscous = 1 << 5,
Powder = 1 << 6,
Tensile = 1 << 7,
ColorMixing = 1 << 8,
DestructionListener = 1 << 9,
Barrier = 1 << 10,
StaticPressure = 1 << 11,
Reactive = 1 << 12,
Repulsive = 1 << 13,
FixtureContactListener = 1 << 14,
ParticleContactListener = 1 << 15,
FixtureContactFilter = 1 << 16,
ParticleContactFilter = 1 << 17
};
}
@@ -36,26 +36,26 @@ struct Particle : public Component
float Radius = 0.5f;
float LifeTime = 5.0f;
ParticleFlags::Type Flags =
ParticleFlags::Type::waterParticle |
ParticleFlags::Type::zombieParticle |
ParticleFlags::Type::wallParticle |
ParticleFlags::Type::springParticle |
ParticleFlags::Type::elasticParticle |
ParticleFlags::Type::viscousParticle |
ParticleFlags::Type::powderParticle |
ParticleFlags::Type::tensileParticle |
ParticleFlags::Type::colorMixingParticle |
ParticleFlags::Type::destructionListenerParticle |
ParticleFlags::Type::barrierParticle |
ParticleFlags::Type::staticPressureParticle |
ParticleFlags::Type::reactiveParticle |
ParticleFlags::Type::repulsiveParticle |
ParticleFlags::Type::fixtureContactListenerParticle |
ParticleFlags::Type::particleContactListenerParticle |
ParticleFlags::Type::fixtureContactFilterParticle |
ParticleFlags::Type::particleContactFilterParticle;
ParticleFlags::Type Flags = static_cast<ParticleFlags::Type>(
ParticleFlags::Water
| ParticleFlags::Zombie
| ParticleFlags::Wall
| ParticleFlags::Spring
| ParticleFlags::Elastic
| ParticleFlags::Viscous
| ParticleFlags::Powder
| ParticleFlags::Tensile
| ParticleFlags::ColorMixing
| ParticleFlags::DestructionListener
| ParticleFlags::Barrier
| ParticleFlags::StaticPressure
| ParticleFlags::Reactive
| ParticleFlags::Repulsive
| ParticleFlags::FixtureContactListener
| ParticleFlags::ParticleContactListener
| ParticleFlags::FixtureContactFilter
| ParticleFlags::ParticleContactFilter
);
};
}
include/Physics/CPhysics.h
+9 -8
View File
@@ -27,14 +27,15 @@ struct Physics: public Component
bool Calculate = false;
float GravityScale = 0.f;
CollisionLayer::Type Category = CollisionLayer::Type::Other;
CollisionLayer::Type Mask =
CollisionLayer::Type::Pad |
CollisionLayer::Type::Ball |
CollisionLayer::Type::Brick |
CollisionLayer::Type::Water |
CollisionLayer::Type::PowerUp |
CollisionLayer::Type::Wall |
CollisionLayer::Type::Other;
CollisionLayer::Type Mask = static_cast<CollisionLayer::Type>(
CollisionLayer::Pad
| CollisionLayer::Ball
| CollisionLayer::Brick
| CollisionLayer::Water
| CollisionLayer::PowerUp
| CollisionLayer::Wall
| CollisionLayer::Other
);
};
}
include/Physics/PhysicsSystem.h
+2 -2
View File
@@ -86,7 +86,7 @@ private:
struct ParticleEmitter
{
std::vector<b2ParticleSystem*> ParticleSystem;
std::vector<EntityID> ParticleEmitter;
std::vector<EntityID> Emitter;
std::vector<EntityID> ParticleTemplate;
};
ParticleEmitter m_ParticleEmitters;
@@ -95,7 +95,7 @@ private:
struct Impulse
{
b2Body* Body;
b2Vec2 Impulse;
b2Vec2 Vector;
b2Vec2 Point;
};
std::list<Impulse> m_Impulses;