Commit 47f3baf5 authored by AL's avatar AL

added sand throw hit indicator

parent 2c4fecb5
......@@ -259,28 +259,8 @@ void EffectHandler::AddEffect3D(Effect3DSequence data, std::wstring spriteName,
void EffectHandler::AddEffect3D(PositionData posData, Effect e)
{
switch (e)
{
case EffectHandler::Effect::Shine:
break;
case EffectHandler::Effect::ShineOrange:
break;
case EffectHandler::Effect::Sparks:
break;
case EffectHandler::Effect::GhoulIntentShine_Attack:
break;
case EffectHandler::Effect::GhoulIntentShine_Buff:
break;
case EffectHandler::Effect::GhoulIntentShine_Defence:
break;
case EffectHandler::Effect::GhoulAttack:
break;
case EffectHandler::Effect::PlayerSwordAttack:
break;
case EffectHandler::Effect::PlayerSwordAttackUpgraded:
break;
case EffectHandler::Effect::PlayerSandThrowDamage:
break;
case EffectHandler::Effect::PlayerSandThrow:
{
case EffectHandler::Effect::PlayerSandThrow: //is called by EffectHandler::AddEffect3D(Effect e)
{
ParticleBurstData pbd{ 2u, posData, 1.0f, 5.0f, 1.5f, 0.95f };
ParticleSpreadData psd{
......@@ -317,7 +297,8 @@ void EffectHandler::AddEffect3D(Effect e)
Effect3DSequence e3ds2;
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 1.0f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.2f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
EffectHandler::AddEffect3D(e3ds2, L"Media\\Models\\Enemy_hit.obj",true);
Effect3DSequence e3ds1;
......@@ -332,8 +313,9 @@ void EffectHandler::AddEffect3D(Effect e)
PositionData posData = { 3.9f, 1.0f, 1.0f, 0.0f, 3.0f * PI / 2.0f,nextAngle+PI/2.0f };
Effect3DSequence e2ds2;
e2ds2.AddStage({ posData.pos.x-0.05f,posData.pos.y,posData.pos.z, 1.5f,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 1.0f);
e2ds2.AddStage({ posData.pos.x-0.05f,posData.pos.y,posData.pos.z, 1.5f,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
e2ds2.AddStage({ posData.pos.x - 0.05f,posData.pos.y,posData.pos.z, 1.5f,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 1.0f);
e2ds2.AddStage({ posData.pos.x - 0.05f,posData.pos.y,posData.pos.z, 1.5f,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.2f);
e2ds2.AddStage({ posData.pos.x - 0.05f,posData.pos.y,posData.pos.z, 1.5f,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
Effect3DSequence e2ds1;
e2ds1.AddStage({ posData.pos.x-0.1f, posData.pos.y,posData.pos.z, 1.5f,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.45f);
......@@ -357,16 +339,29 @@ void EffectHandler::AddEffect3D(Effect e)
Effect3DSequence e3ds2;
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 1.0f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.2f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
EffectHandler::AddEffect3D(e3ds2, L"Media\\Models\\Player_SandThrow_damage.obj", true);
Effect3DSequence e3ds1;
e3ds1.AddStage({ posData.pos.x,posData.pos.y,posData.pos.z , 1.0f ,0.8f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.65f);
e3ds1.AddStage({ posData.pos.x - 1.0f,posData.pos.y,posData.pos.z,1.0f ,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
EffectHandler::AddEffect3D(e3ds1, L"Media\\Models\\Player_SandThrow_damage.obj", true);
}
} //v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v
case Effect::PlayerSandThrow: //is called by Class sandThrow : public Skill (method void Activate())
{
{
PositionData posData = { 3.9f, 1.0f, 1.0f, 0.0f, 3.0f * PI / 2.0f, RU.GetFloat(-0.4f, 0.4f) + PI / 2.0f };
Effect3DSequence e3ds2;
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 1.0f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,1.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.2f);
e3ds2.AddStage({ posData.pos.x + 0.01f,posData.pos.y,posData.pos.z, 1.0f ,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
EffectHandler::AddEffect3D(e3ds2, L"Media\\Models\\Player_SandThrowIndicator.obj", true);
Effect3DSequence e3ds1;
e3ds1.AddStage({ posData.pos.x,posData.pos.y,posData.pos.z , 1.0f ,0.8f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.65f);
e3ds1.AddStage({ posData.pos.x - 1.0f,posData.pos.y,posData.pos.z,1.0f ,0.0f,posData.rot.x,posData.rot.y,posData.rot.z }, 0.0f);
EffectHandler::AddEffect3D(e3ds1, L"Media\\Models\\Player_SandThrowIndicator.obj", true);
EH::AddScenario(EffectScenario::EffectStep::PlayerSandThrow, 7u, 0.035f);
break;
}
......
# Blender MTL File: 'None'
# Material Count: 1
newmtl Player_SandThrowIndicator
Ns 49.300000
Ka 1.000000 1.000000 1.000000
Kd 0.900000 2.200000 6.300000
Ks 1.300000 0.700000 0.200000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd Player_SandThrowIndicator.png
\ No newline at end of file
# Blender v2.81 (sub 16) OBJ File: ''
# www.blender.org
mtllib Player_SandThrowIndicator.mtl
o Plane
v -0.60000 0.000000 0.600000
v 0.60000 0.000000 0.600000
v -0.60000 0.000000 -0.60000
v 0.60000 0.000000 -0.600000
vt 0.999900 0.999900
vt 0.000100 0.000100
vt 0.999900 0.000100
vt 0.000100 0.999900
vn 0.0000 1.0000 0.0000
usemtl Player_SandThrowIndicator
s off
f 2/1/1 3/2/1 1/3/1
f 2/1/1 4/4/1 3/2/1
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