Merge remote-tracking branch 'origin/LevelSystemAndSuch' into water

2015-10-22 16:27:42 +02:00
parent 7c2782fe2c f54af2a240
commit 33e5ab9a22
46 changed files with 25342 additions and 2084 deletions
@@ -37,6 +37,7 @@ void dd::Systems::PhysicsSystem::InitializeWater()
    m_ParticleSystemDef.radius = radius;
    m_ParticleSystemDef.gravityScale = gravityScale;
 	m_ParticleSystemDef.density = 4.f;
+	m_ParticleSystemDef.surfaceTensionNormalStrength = 0.07;

    m_WaterParticleSystem = m_PhysicsWorld->CreateParticleSystem(&m_ParticleSystemDef);
 }