Commit 8d20bcb6 authored by AL's avatar AL

ok sand

parent 387a0072
......@@ -281,8 +281,17 @@ void EffectHandler::AddEffect3D(PositionData posData, Effect e)
case EffectHandler::Effect::PlayerSandThrowDamage:
break;
case EffectHandler::Effect::PlayerSandThrow:
{
ParticleBurstData pbd{ 2u, posData, 1.0f, 5.0f, 1.5f, 0.95f };
ParticleSpreadData psd{
{ 0.0f,PI * 0.5,0.0f},
{ PI, PI, PI},
{ 3.9f, -1.0f, -1.0f},
{ 3.9f, 1.0f, 1.0f} };
e3df.push_back(std::make_unique<Effect3DPhysics>(pbd, psd, L"Media\\Models\\Player_SandThrow.obj", *gfx));
break;
case EffectHandler::Effect::PlayerSandStorm:
}
case EffectHandler::Effect::PlayerSandStorm: //is called by EffectHandler::AddEffect3D(Effect e)
{
ParticleSpreadData psd{
{ 0.0f, 3.0f * PI / 2.0f, PI * 1.9f},
......@@ -361,18 +370,11 @@ void EffectHandler::AddEffect3D(Effect e)
}
case Effect::PlayerSandThrow: //is called by Class sandThrow : public Skill (method void Activate())
{
ParticleBurstData pbd{ 10u, {1.5f, 1.0f, 1.0f}, 1.0f, 5.0f, 1.5f, 0.95f };
ParticleSpreadData psd{
{ 0.0f,PI * 0.5,0.0f},
{ PI, PI, PI},
{ 3.9f, -1.0f, -1.0f},
{ 3.9f, 1.0f, 1.0f} };
e3df.push_back(std::make_unique<Effect3DPhysics>(pbd,psd, L"Media\\Models\\Player_SandThrow.obj", *gfx));
EH::AddScenario(EffectScenario::EffectStep::PlayerSandThrow, 7u, 0.035f);
break;
}
case Effect::PlayerSandStorm: //is called by Class sandThrow : public Skill (method void Activate())
{ // 0.0f, 3.0f * PI / 2.0f, PI / 2.0f
{
EH::AddScenario(EffectScenario::EffectStep::PlayerSandStorm,3u,0.5f);
break;
}
......@@ -562,7 +564,7 @@ bool EffectScenario::Execute(float dt)
switch (effect)
{
case EffectStep::PlayerSandThrow:
EH::AddEffect3D(EH::Effect::PlayerSandThrow);
EH::AddEffect3D({ 1.5f, 1.0f, 1.0f }, EH::Effect::PlayerSandThrow);
break;
case EffectStep::PlayerSandStorm:
EH::AddEffect3D({ RU.GetFloat(2.5f,7.0f), -0.2f, RU.GetFloat(0.0f,2.0f) }, EH::Effect::PlayerSandStorm);
......
......@@ -4,8 +4,8 @@
newmtl Player_SandThrow
Ns 49.300000
Ka 1.000000 1.000000 1.000000
Kd 1.100000 2.900000 8.300000
Ks 1.300000 0.700000 0.200000
Kd 0.700000 0.700000 0.300000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment