Skip to content

Commit

Permalink
mouse control added, front and back textures added
Browse files Browse the repository at this point in the history
  • Loading branch information
@ISPlatonov
ISPlatonov committed Jan 29, 2024
1 parent 0e1925a commit f65de27
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 80 deletions.
6 changes: 4 additions & 2 deletions include/Actor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ namespace Actor
{
enum class Direction {
left,
right
right,
up,
down
};


Expand All @@ -41,7 +43,7 @@ namespace Actor
protected:
sf::Sprite sprite;
static inline std::unordered_map<Direction, sf::Texture> textures{};
Direction direction_x;
Direction direction;
Multiplayer::Inventory inventory;

virtual void draw(sf::RenderTarget& target, sf::RenderStates states=sf::RenderStates()) const;
Expand Down
8 changes: 5 additions & 3 deletions include/Controls.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class Controls
public:
static void applyWindowSettings();
static void drawInterfaces();
static void setLastActionTimepoint(const Time::Time& t = Time::getTimeNow());
static sf::Uint32 getDeltaTime();
static inline void setLastActionTimepoint(const Time::Time& t = Time::getTimeNow()) { last_action_timepoint = t; }
static inline sf::Uint32 getDeltaTime() { return Time::getTimeNow() - last_action_timepoint; }
static void handleEvents();
static sf::Vector2f getDirection();
static void handleFrameStep();
Expand All @@ -33,10 +33,12 @@ class Controls
private:
Controls();
static void addEvent(const sf::Event&);
static void handleLeftClick();
static void handleMouseDirection();

static Multiplayer::UdpManager udp_manager;
static sf::Vector2f direction;
static bool left, right, up, down;
static bool left, right, up, down, mouse_direction_control;
static inline sf::Uint32 last_action_timepoint;
static bool draw_menu, draw_inventory;
static sf::RectangleShape menu;
Expand Down
43 changes: 30 additions & 13 deletions src/common/Actor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ namespace Actor
Actor::Actor(const sf::Vector2f& position, const std::unordered_map<Object::ObjectName, size_t>& new_inventory)
{
if (!Actor::textures.size())
load_textures("textures/actors/Guy_16x32");
direction_x = Direction::right;
load_textures("textures/actors/Ted_16x32");
direction = Direction::right;
sprite.setPosition(position);
sprite.setTexture(Actor::textures.at(direction_x));
sprite.setTexture(Actor::textures[direction]);
sprite.setScale(Constants::getPIXEL_SIZE(), Constants::getPIXEL_SIZE());
setInventory(new_inventory);
}
Expand All @@ -18,24 +18,35 @@ namespace Actor
Actor::Actor(sf::Vector2f&& position, std::unordered_map<Object::ObjectName, size_t>&& new_inventory)
{
if (!Actor::textures.size())
load_textures("textures/actors/Guy_16x32");
direction_x = Direction::right;
load_textures("textures/actors/Ted_16x32");
direction = Direction::right;
sprite.setPosition(position);
sprite.setTexture(Actor::textures.at(direction_x));
sprite.setTexture(Actor::textures[direction]);
sprite.setScale(Constants::getPIXEL_SIZE(), Constants::getPIXEL_SIZE());
inventory = new_inventory;
}


void Actor::check_direction(const sf::Vector2f& direction)
void Actor::check_direction(const sf::Vector2f& direction_vector)
{
if (direction.x > 0 && direction_x != Direction::right)
direction_x = Direction::right;
else if (direction.x < 0 && direction_x != Direction::left)
direction_x = Direction::left;
else
auto direction_vector_normalized = linalg::normalize(direction_vector);
if (direction_vector_normalized == sf::Vector2f(0.f, 0.f))
return;
sprite.setTexture(Actor::textures.at(direction_x));
if (abs(direction_vector_normalized.x) > .7071f)
{
if (direction_vector_normalized.x > 0)
direction = Direction::right;
else
direction = Direction::left;
}
else
{
if (direction_vector_normalized.y > 0)
direction = Direction::up;
else
direction = Direction::down;
}
sprite.setTexture(Actor::textures[direction]);
}


Expand Down Expand Up @@ -147,8 +158,14 @@ namespace Actor
left_texture.loadFromFile(texture_dir_path + "/left.png");
auto right_texture = sf::Texture();
right_texture.loadFromFile(texture_dir_path + "/right.png");
auto up_texture = sf::Texture();
up_texture.loadFromFile(texture_dir_path + "/front.png");
auto down_texture = sf::Texture();
down_texture.loadFromFile(texture_dir_path + "/back.png");
Actor::textures[Direction::left] = std::move(left_texture);
Actor::textures[Direction::right] = std::move(right_texture);
Actor::textures[Direction::up] = std::move(up_texture);
Actor::textures[Direction::down] = std::move(down_texture);
}


Expand Down
166 changes: 107 additions & 59 deletions src/common/Controls.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bool Controls::left = 0,
Controls::right = 0,
Controls::up = 0,
Controls::down = 0,
Controls::mouse_direction_control = 0,
Controls::draw_menu = 0,
Controls::draw_inventory = 0;
sf::RenderWindow Controls::window(sf::VideoMode().getFullscreenModes().at(0), "SFML window", sf::Style::Fullscreen);
Expand Down Expand Up @@ -34,6 +35,52 @@ void Controls::handleEvents()
}


void Controls::handleLeftClick()
{
if (draw_menu && menu.getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
window.close();
else if (draw_inventory && inventory_rect.getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
{
// select object
sf::Vector2f mouse_pos = window.mapPixelToCoords(sf::Mouse::getPosition());
for (auto& [rect, object_name] : inventory)
{
if (rect.contains(mouse_pos))
{
selected_object = Object::Object(object_name, rect.getPosition() - user.getPosition(), Object::Passability::foreground);
break;
}
}
}
else
{
// handle object selection
for (const auto& iter : object_map.getObjectMap(Object::Passability::foreground))
{
if (iter.second.getSprite().getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
{
sf::Packet data;
data << Multiplayer::DataType::Event;
data << Multiplayer::EventType::takeObjectToInventory;
sf::Vector2f object_position(iter.second.getPosition().x / Constants::getPIXEL_SIZE(), iter.second.getPosition().y / Constants::getPIXEL_SIZE());
auto object_data = Multiplayer::ObjectData(object_position, Time::getTimeNow(), SocketInfo(0, 0) /* ??? */, iter.second.getName(), iter.second.getPassability());
data << object_data;
data << user;
udp_manager.send(data);
break;
}
}
}
}


void Controls::handleMouseDirection()
{
const auto& mouse_pos = window.mapPixelToCoords(sf::Mouse::getPosition());
direction = mouse_pos - user.getPosition() - user.getSprite().getGlobalBounds().getSize() / 2.f;
}


void Controls::addEvent(const sf::Event& event)
{
switch (event.type)
Expand Down Expand Up @@ -64,6 +111,12 @@ void Controls::addEvent(const sf::Event& event)
draw_inventory = !draw_inventory;
selected_object = Object::Object();
break;
case (sf::Keyboard::F):
handleLeftClick();
break;
case (sf::Keyboard::LShift):
mouse_direction_control = 1;
break;
default:
break;
}
Expand All @@ -83,73 +136,42 @@ void Controls::addEvent(const sf::Event& event)
case (sf::Keyboard::S):
down = 0;
break;
case (sf::Keyboard::LShift):
mouse_direction_control = 0;
break;
default:
break;
}
break;
case sf::Event::MouseButtonPressed:
switch (event.mouseButton.button)
{
case sf::Mouse::Left:
handleLeftClick();
break;
case sf::Mouse::Right:
mouse_direction_control = 1;
break;
default:
break;
}
break;
case sf::Event::MouseButtonReleased:
switch (event.mouseButton.button)
{
case sf::Mouse::Left:
if (draw_menu && menu.getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
window.close();
else if (draw_inventory && inventory_rect.getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
{
// select object
sf::Vector2f mouse_pos = window.mapPixelToCoords(sf::Mouse::getPosition());
for (auto& [rect, object_name] : inventory)
{
if (rect.contains(mouse_pos))
{
selected_object = Object::Object(object_name, rect.getPosition() - user.getPosition(), Object::Passability::foreground);
break;
}
}
}
else
{
// handle object selection
for (const auto& iter : object_map.getObjectMap(Object::Passability::foreground))
{
if (iter.second.getSprite().getGlobalBounds().contains(window.mapPixelToCoords(sf::Mouse::getPosition())))
{
sf::Packet data;
data << Multiplayer::DataType::Event;
data << Multiplayer::EventType::takeObjectToInventory;
sf::Vector2f object_position(iter.second.getPosition().x / Constants::getPIXEL_SIZE(), iter.second.getPosition().y / Constants::getPIXEL_SIZE());
auto object_data = Multiplayer::ObjectData(object_position, Time::getTimeNow(), SocketInfo(0, 0) /* ??? */, iter.second.getName(), iter.second.getPassability());
data << object_data;
data << user;
udp_manager.send(data);
break;
}
}
}
break;
case sf::Mouse::Right:
mouse_direction_control = 0;
break;
default:
break;
}
break;
default:
break;
}
}


sf::Vector2f Controls::getDirection()
{
return linalg::normalize(sf::Vector2f((right ? 1.f : 0.f) - (left ? 1.f : 0.f), (down ? 1.f : 0.f) - (up ? 1.f : 0.f)));
}


void Controls::setLastActionTimepoint(const sf::Uint32& t)
{
last_action_timepoint = t;
}


sf::Uint32 Controls::getDeltaTime()
{
return Time::getTimeNow() - last_action_timepoint;
}


void Controls::drawInterfaces()
{
if (draw_inventory)
Expand All @@ -169,15 +191,15 @@ void Controls::drawInterfaces()
sf::Vector2f shift(5, 5);
shift *= static_cast<float>(Constants::getPIXEL_SIZE());
shift.y += text.getGlobalBounds().getSize().y;
for (auto iter : user.getInventory())
for (const auto& iter : user.getInventory())
{
if (!Object::Object::NameToTextureMap.count(iter.first))
{
auto new_texture = sf::Texture();
new_texture.loadFromFile(Object::Object::NameToTextureAddressMap.at(iter.first));
Object::Object::NameToTextureMap[iter.first] = std::move(new_texture);
}
auto sprite = sf::Sprite(Object::Object::NameToTextureMap.at(iter.first));
auto sprite = sf::Sprite(Object::Object::NameToTextureMap[iter.first]);
sprite.setScale(Constants::getPIXEL_SIZE(), Constants::getPIXEL_SIZE());
sprite.setPosition(inventory_rect.getGlobalBounds().getPosition() + shift);
inventory[sprite.getGlobalBounds()] = iter.first;
Expand Down Expand Up @@ -219,6 +241,13 @@ void Controls::drawInterfaces()
}


sf::Vector2f Controls::getDirection()
{
handleMouseDirection();
return linalg::normalize(!mouse_direction_control ? sf::Vector2f((right ? 1.f : 0.f) - (left ? 1.f : 0.f), (down ? 1.f : 0.f) - (up ? 1.f : 0.f)) : direction);
}


void Controls::handleFrameStep()
{
// needs another thread
Expand Down Expand Up @@ -263,11 +292,11 @@ void Controls::handleFrameStep()
data << Multiplayer::DataType::Player << Controls::user;
udp_manager.send(data);
handleEvents();
auto direction = Controls::getDirection();
auto norm_direction = Controls::getDirection();
auto dt = Controls::getDeltaTime();
Controls::user.move_dt(direction, dt, Controls::object_map);
Controls::user.move_dt(norm_direction, dt, Controls::object_map);
Controls::setLastActionTimepoint();
// Clear screen
// Clear screen
window.clear();
// Draw the sprite
//window.draw(WorldMap::WorldMap::map);
Expand Down Expand Up @@ -326,6 +355,25 @@ void Controls::handleFrameStep()
window.draw(iter->second);
++iter;
}
{
// draw border around object that curson is on
auto& mouse_pos = window.mapPixelToCoords(sf::Mouse::getPosition());
for (const auto& iter : object_map.getObjectMap(Object::Passability::foreground))
{
if (iter.second.getSprite().getGlobalBounds().contains(mouse_pos))
{
auto rect = sf::RectangleShape(iter.second.getSprite().getGlobalBounds().getSize() + sf::Vector2f(2, 2) * static_cast<float>(Constants::getPIXEL_SIZE()));
rect.setFillColor(sf::Color(0, 0, 0, 0));
auto color = sf::Color::Green;
color.a /= 2;
rect.setOutlineColor(color);
rect.setOutlineThickness(static_cast<float>(Constants::getPIXEL_SIZE()) / 2.f);
rect.setPosition(iter.second.getSprite().getGlobalBounds().getPosition() - sf::Vector2f(1, 1) * static_cast<float>(Constants::getPIXEL_SIZE()));
window.draw(rect);
break;
}
}
}
{
const auto& bm = object_map.getObjectMap(Object::Passability::background);
const auto& im = object_map.getObjectMap(Object::Passability::impassible);
Expand Down
Loading

0 comments on commit f65de27

Please sign in to comment.