Commit 3d69412f authored by AL's avatar AL

menu+models

parent 48b70580
......@@ -282,7 +282,7 @@ void EffectHandler::AddEffect3D(PositionData posData, Effect e)
e3df.push_back(std::make_unique<Effect3DPhysics>(pbd, psd, L"Media\\Models\\Player_SandStorm.obj", *gfx));
break;
}
case EffectHandler::Effect::AmbientPemanentBackgroundSmoke: //is called by EffectHandler::AddEffect3D(Effect e)
case EffectHandler::Effect::AmbientPermanentBackgroundSmoke: //is called by EffectHandler::AddEffect3D(Effect e) only once per launch
{
ParticleSpreadData psd{
{1.4f*PI, 3.0f * PI / 2.0f, PI},
......@@ -415,9 +415,9 @@ void EffectHandler::AddEffect3D(Effect e)
EH::AddScenario(EffectScenario::EffectStep::PlayerSandStorm,20u,0.04f);
break;
}
case Effect::AmbientPemanentBackgroundSmoke: //is called byLevelLayoutConstructor
case Effect::AmbientPermanentBackgroundSmoke: //is called byLevelLayoutConstructor
{
EH::AddScenario(EffectScenario::EffectStep::AmbientPemanentBackgroundSmoke, 99999999u, 99999999.0f);
EH::AddScenario(EffectScenario::EffectStep::AmbientPermanentBackgroundSmoke, 99999999u, 99999999.0f);
break;
}
default:
......@@ -642,8 +642,8 @@ bool EffectScenario::Execute(float dt)
case EffectStep::PlayerSandStorm:
EH::AddEffect3D({ RU.GetFloat(2.0f,7.0f), -0.2f, RU.GetFloat(0.0f,2.0f) }, EH::Effect::PlayerSandStorm);
break;
case EffectStep::AmbientPemanentBackgroundSmoke:
EH::AddEffect3D({ 8.2f, 1.0f, 1.0f }, EH::Effect::AmbientPemanentBackgroundSmoke);
case EffectStep::AmbientPermanentBackgroundSmoke:
EH::AddEffect3D({ 8.2f, 1.0f, 1.0f }, EH::Effect::AmbientPermanentBackgroundSmoke);
break;
}
}
......
......@@ -178,7 +178,7 @@ public:
{
PlayerSandThrow,
PlayerSandStorm,
AmbientPemanentBackgroundSmoke
AmbientPermanentBackgroundSmoke
};
EffectScenario(EffectStep e, size_t timesRepeat, float delay);
EffectScenario(EffectScenario&&) = default;
......@@ -212,7 +212,7 @@ public:
PlayerSandThrowDamage,
PlayerSandThrow,
PlayerSandStorm,
AmbientPemanentBackgroundSmoke
AmbientPermanentBackgroundSmoke
};
EffectHandler(DXGraphics& gfx);
static void AddEffect2D(Effect2DSequence data, std::wstring spriteName);
......
......@@ -161,7 +161,7 @@ LevelLayout::LevelLayout(DXGraphics& gfx, FrameCommander& fc, const CombatManage
AddEnemy(Enemy::Monster::Ghoul, { 4,1 });
EH::AddEffect3D(EH::Effect::AmbientPemanentBackgroundSmoke); //just adding permanent smoke
EH::AddEffect3D(EH::Effect::AmbientPermanentBackgroundSmoke); //just adding permanent smoke
}
void LevelLayout::AddWall(Wall::Model mod, Wall::Type type, DirectX::XMFLOAT2 pos, Wall::Direction dir)
......
......@@ -60,6 +60,14 @@ int Game::Go()
{
ll.Translate(DirectX::XMFLOAT3{ 0.3f,0.0f,0.0f });
}
if (wnd.kbd.KeyIsPressed(VK_NUMPAD1))
{
ll.Translate(DirectX::XMFLOAT3{ 0.0f,0.2f,-0.0f });
}
if (wnd.kbd.KeyIsPressed(VK_NUMPAD3))
{
ll.Translate(DirectX::XMFLOAT3{ 0.0f,-0.2f,0.0f });
}
if (wnd.kbd.KeyIsPressed(VK_NUMPAD7))
......
......@@ -3,7 +3,6 @@
#include "TutorialSlide.h"
#include "ActionBox.h"
#include "SkillStuff/Skill.h"
#include "SideButtons.h"
#include "StatusBar.h"
#include "IntentIcons.h"
#include "InitiativeBar.h"
......@@ -17,13 +16,11 @@ HUD::HUD(const Menu& menu, FrameCommander& fc, DXGraphics& gfx, const ActionBox&
elements.emplace(std::make_pair(Element::ActionBox, std::make_unique<ABox>(gfx, abox)));
elements.emplace(std::make_pair(Element::MainMenuHolder,std::make_unique<MainMenuHolder>(gfx,menu)));
elements.emplace(std::make_pair(Element::TutorialHolder,std::make_unique<TutorialHolder>(gfx,menu)));
elements.emplace(std::make_pair(Element::RightButton, std::make_unique<SideButton>(gfx, SideButton::Side::Right)));
elements.emplace(std::make_pair(Element::LeftButton, std::make_unique<SideButton>(gfx, SideButton::Side::Left)));
elements.emplace(std::make_pair(Element::TutorialSlide1,std::make_unique<TutorialSlide>(L"Media\\Sprites\\tut1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide2,std::make_unique<TutorialSlide>(L"Media\\Sprites\\tut1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide3,std::make_unique<TutorialSlide>(L"Media\\Sprites\\tut1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide4,std::make_unique<TutorialSlide>(L"Media\\Sprites\\tut1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide5,std::make_unique<TutorialSlide>(L"Media\\Sprites\\tut1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide1,std::make_unique<TutorialSlide>(L"Media\\Sprites\\Slide1.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide2,std::make_unique<TutorialSlide>(L"Media\\Sprites\\Slide2.png", gfx)));
elements.emplace(std::make_pair(Element::TutorialSlide3,std::make_unique<TutorialSlide>(L"Media\\Sprites\\Slide3.png", gfx)));
elements.emplace(std::make_pair(Element::SkillInfo, std::make_unique<TutorialSlide>(L"Media\\Sprites\\SkillInfo.png", gfx)));
elements.emplace(std::make_pair(Element::OtherInfo, std::make_unique<TutorialSlide>(L"Media\\Sprites\\OtherInfo.png", gfx)));
elements.emplace(std::make_pair(Element::PlayerStatusBar,std::make_unique<PlayerStatusBar>(cm.GetCombatDataReference(),gfx)));
elements.emplace(std::make_pair(Element::EnemyStatusBar,std::make_unique<EnemyStatusBar>(cm.GetCombatDataReference(), gfx)));
elements.emplace(std::make_pair(Element::IntentIcon, std::make_unique<IntentIconManager>(cm.GetCombatDataReference(), gfx)));
......@@ -47,44 +44,22 @@ void HUD::Submit() const
elements.at(Element::TutorialHolder)->SmartSubmit(fc);
break;
case Menu::MenuState::Achivements:
elements.at(Element::RightButton)->SmartSubmit(fc);
elements.at(Element::AchievementsScreen)->SmartSubmit(fc);
break;
case Menu::MenuState::SkillInfo:
elements.at(Element::RightButton)->SmartSubmit(fc);
elements.at(Element::SkillInfo)->SmartSubmit(fc);
break;
case Menu::MenuState::OtherInfo:
elements.at(Element::RightButton)->SmartSubmit(fc);
elements.at(Element::OtherInfo)->SmartSubmit(fc);
break;
case Menu::MenuState::Tutorial1:
elements.at(Element::TutorialSlide1)->SmartSubmit(fc);
elements.at(Element::LeftButton)->SmartSubmit(fc);
elements.at(Element::RightButton)->SmartSubmit(fc);
TD::DrawString(L"1",Vec2(0.01f, -0.016f), Colors::LightGray, 0.12f);
break;
case Menu::MenuState::Tutorial2:
elements.at(Element::TutorialSlide1)->SmartSubmit(fc);
elements.at(Element::LeftButton)->SmartSubmit(fc);
elements.at(Element::RightButton)->SmartSubmit(fc);
TD::DrawString(L"2", Vec2(0.01f, -0.016f), Colors::LightGray, 0.12f);
elements.at(Element::TutorialSlide2)->SmartSubmit(fc);
break;
case Menu::MenuState::Tutorial3:
elements.at(Element::TutorialSlide1)->SmartSubmit(fc);
elements.at(Element::LeftButton)->SmartSubmit(fc);
elements.at(Element::RightButton)->SmartSubmit(fc);
TD::DrawString(L"3", Vec2(0.01f, -0.016f), Colors::LightGray, 0.12f);
break;
case Menu::MenuState::Tutorial4:
elements.at(Element::TutorialSlide1)->SmartSubmit(fc);
elements.at(Element::LeftButton)->SmartSubmit(fc);
elements.at(Element::RightButton)->SmartSubmit(fc);
TD::DrawString(L"4", Vec2(0.01f, -0.016f), Colors::LightGray, 0.12f);
break;
case Menu::MenuState::Tutorial5:
elements.at(Element::TutorialSlide1)->SmartSubmit(fc);
elements.at(Element::LeftButton)->SmartSubmit(fc);
elements.at(Element::RightButton)->SmartSubmit(fc);
TD::DrawString(L"5", Vec2(0.01f, -0.016f), Colors::LightGray, 0.12f);
elements.at(Element::TutorialSlide3)->SmartSubmit(fc);
break;
case Menu::MenuState::Inactive:
case Menu::MenuState::ChoosingReward:
......
......@@ -12,19 +12,17 @@ class HUD //responsible for drawing hud
ActionBox,
MainMenuHolder,
TutorialHolder,
LeftButton,
RightButton,
TutorialSlide1,
TutorialSlide2,
TutorialSlide3,
TutorialSlide4,
TutorialSlide5,
PlayerStatusBar,
EnemyStatusBar,
IntentIcon,
RewardMenu,
InitiativeBar,
AchievementsScreen,
SkillInfo,
OtherInfo,
Overlay
};
public:
......
......@@ -2,10 +2,10 @@
# Material Count: 1
newmtl stone_ceiling
Ns 100.200000
Ns 400.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.150000 0.100000 0.100000
Ks 0.250000 0.145000 0.085000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
......
Engine/Media/Models/stone_ceiling.png

1.22 MB | W: | H:

Engine/Media/Models/stone_ceiling.png

3.99 MB | W: | H:

Engine/Media/Models/stone_ceiling.png
Engine/Media/Models/stone_ceiling.png
Engine/Media/Models/stone_ceiling.png
Engine/Media/Models/stone_ceiling.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -2,10 +2,10 @@
# Material Count: 1
newmtl stone_floor
Ns 200.200000
Ns 200.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.250000 0.250000 0.250000
Ks 0.510000 0.255000 0.255000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
......
Engine/Media/Models/stone_floor.png

1.37 MB | W: | H:

Engine/Media/Models/stone_floor.png

2.86 MB | W: | H:

Engine/Media/Models/stone_floor.png
Engine/Media/Models/stone_floor.png
Engine/Media/Models/stone_floor.png
Engine/Media/Models/stone_floor.png
  • 2-up
  • Swipe
  • Onion skin
Engine/Media/Models/stone_wall.png

1.05 MB | W: | H:

Engine/Media/Models/stone_wall.png

1.67 MB | W: | H:

Engine/Media/Models/stone_wall.png
Engine/Media/Models/stone_wall.png
Engine/Media/Models/stone_wall.png
Engine/Media/Models/stone_wall.png
  • 2-up
  • Swipe
  • Onion skin
Engine/Media/Sprites/RewardCrit.png

28.3 KB | W: | H:

Engine/Media/Sprites/RewardCrit.png

108 KB | W: | H:

Engine/Media/Sprites/RewardCrit.png
Engine/Media/Sprites/RewardCrit.png
Engine/Media/Sprites/RewardCrit.png
Engine/Media/Sprites/RewardCrit.png
  • 2-up
  • Swipe
  • Onion skin
Engine/Media/Sprites/RewardDodge.png

24.5 KB | W: | H:

Engine/Media/Sprites/RewardDodge.png

107 KB | W: | H:

Engine/Media/Sprites/RewardDodge.png
Engine/Media/Sprites/RewardDodge.png
Engine/Media/Sprites/RewardDodge.png
Engine/Media/Sprites/RewardDodge.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -104,26 +104,6 @@ bool Menu::Update(Keyboard::Event in_event)
mState = MenuState::Tutorial2;
}
if (code == 'D')
{
mState = MenuState::Tutorial4;
}
break;
case Menu::MenuState::Tutorial4:
if (code == 'A')
{
mState = MenuState::Tutorial3;
}
if (code == 'D')
{
mState = MenuState::Tutorial5;
}
break;
case Menu::MenuState::Tutorial5:
if (code == 'A')
{
mState = MenuState::Tutorial4;
}
if (code == 'D')
{
mState = MenuState::Tutorial_Selection;
}
......
......@@ -16,8 +16,6 @@ public:
Tutorial1,
Tutorial2,
Tutorial3,
Tutorial4,
Tutorial5,
ChoosingReward,
Inactive,
None
......
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