Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Astyle styling applied to the code #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Astyle styling applied to the code #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
306 changes: 153 additions & 153 deletions include/ant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,157 +11,157 @@

struct Ant
{
Ant() = default;

Ant(float x, float y, float angle, uint32_t id_)
: position(x, y)
, direction(angle)
, last_direction_update(getRandUnder(100.0f) * 0.01f * direction_update_period)
, last_marker(getRandUnder(100.0f) * 0.01f * marker_period)
, phase(Marker::Type::ToFood)
, reserve(0.0f)
, id(id_)
{
reserve = max_reserve;
}

void update(const float dt, World& world)
{
updatePosition(dt);
if (phase == Marker::ToFood) {
checkFood(world);
}

last_direction_update += dt;
if (last_direction_update > direction_update_period) {
findMarker(world);
direction += getRandRange(direction_noise_range);
last_direction_update = 0.0f;
}

last_marker += dt;
if (last_marker >= marker_period) {
addMarker(world);
}

direction.update(dt);
}

void updatePosition(const float dt)
{
position += (dt * move_speed) * direction.getVec();

position.x = position.x < 0.0f ? Conf::WIN_WIDTH : position.x;
position.y = position.y < 0.0f ? Conf::WIN_HEIGHT : position.y;

position.x = position.x > Conf::WIN_WIDTH ? 0.0f : position.x;
position.y = position.y > Conf::WIN_HEIGHT ? 0.0f : position.y;
}

void checkFood(World& world)
{
const std::list<Food*> food_spots = world.grid_food.getAllAt(position);
for (Food* fp : food_spots) {
if (getLength(position - fp->position) < fp->radius) {
phase = Marker::ToHome;
direction.addNow(PI);
reserve = max_reserve;
fp->pick();
return;
}
}
}

void checkColony(const sf::Vector2f colony_position)
{
if (getLength(position - colony_position) < colony_size) {
if (phase == Marker::ToHome) {
phase = Marker::ToFood;
direction.addNow(PI);
}
reserve = max_reserve;
}
}

void findMarker(World& world)
{
std::list<Marker*> markers = world.getGrid(phase).getAllAt(position);

float total_intensity = 0.0f;
sf::Vector2f point(0.0f, 0.0f);

const sf::Vector2f dir_vec = direction.getVec();

for (Marker* mp : markers) {
const Marker& m = *mp;
const sf::Vector2f to_marker = m.position - position;
const float length = getLength(to_marker);

if (length < marker_detection_max_dist) {
if (dot(to_marker, dir_vec) > 0.0f) {
total_intensity += m.intensity;
point += m.intensity * m.position;
}
}
}

if (total_intensity) {
direction = getAngle(point / total_intensity - position);
}
}

void addMarker(World& world)
{
if (reserve > 1.0f) {
world.addMarker(Marker(position, phase == Marker::ToFood ? Marker::ToHome : Marker::ToFood, reserve * marker_reserve_consumption));
reserve *= 1.0f - marker_reserve_consumption;
}

last_marker = 0.0f;
}

void render_food(sf::RenderTarget& target, const sf::RenderStates& states) const
{
if (phase == Marker::ToHome) {
const float radius = 2.0f;
sf::CircleShape circle(radius);
circle.setOrigin(radius, radius);
circle.setPosition(position + length * 0.5f * direction.getVec());
circle.setFillColor(Conf::FOOD_COLOR);
target.draw(circle, states);
}
}

void render_in(sf::VertexArray& va, const uint32_t index) const
{
const sf::Vector2f dir_vec(direction.getVec());
const sf::Vector2f nrm_vec(-dir_vec.y, dir_vec.x);

va[index + 0].position = position - width * nrm_vec + length * dir_vec;
va[index + 1].position = position + width * nrm_vec + length * dir_vec;
va[index + 2].position = position + width * nrm_vec - length * dir_vec;
va[index + 3].position = position - width * nrm_vec - length * dir_vec;
}

sf::Vector2f position;
Direction direction;

float last_direction_update;
float last_marker;
Marker::Type phase;
float reserve;
const uint32_t id;

// Parameters
const float width = 2.0f;
const float length = 3.5f;
const float move_speed = 50.0f;
const float marker_detection_max_dist = 40.0f;
const float direction_update_period = 0.125f;
const float marker_period = 0.25f;
const float max_reserve = 2000.0f;
const float direction_noise_range = PI * 0.1f;
const float marker_reserve_consumption = 0.02f;
const float colony_size = 20.0f;
Ant() = default;

Ant(float x, float y, float angle, uint32_t id_)
: position(x, y)
, direction(angle)
, last_direction_update(getRandUnder(100.0f) * 0.01f * direction_update_period)
, last_marker(getRandUnder(100.0f) * 0.01f * marker_period)
, phase(Marker::Type::ToFood)
, reserve(0.0f)
, id(id_)
{
reserve = max_reserve;
}

void update(const float dt, World& world)
{
updatePosition(dt);
if (phase == Marker::ToFood) {
checkFood(world);
}

last_direction_update += dt;
if (last_direction_update > direction_update_period) {
findMarker(world);
direction += getRandRange(direction_noise_range);
last_direction_update = 0.0f;
}

last_marker += dt;
if (last_marker >= marker_period) {
addMarker(world);
}

direction.update(dt);
}

void updatePosition(const float dt)
{
position += (dt * move_speed) * direction.getVec();

position.x = position.x < 0.0f ? Conf::WIN_WIDTH : position.x;
position.y = position.y < 0.0f ? Conf::WIN_HEIGHT : position.y;

position.x = position.x > Conf::WIN_WIDTH ? 0.0f : position.x;
position.y = position.y > Conf::WIN_HEIGHT ? 0.0f : position.y;
}

void checkFood(World& world)
{
const std::list<Food*> food_spots = world.grid_food.getAllAt(position);
for (Food* fp : food_spots) {
if (getLength(position - fp->position) < fp->radius) {
phase = Marker::ToHome;
direction.addNow(PI);
reserve = max_reserve;
fp->pick();
return;
}
}
}

void checkColony(const sf::Vector2f colony_position)
{
if (getLength(position - colony_position) < colony_size) {
if (phase == Marker::ToHome) {
phase = Marker::ToFood;
direction.addNow(PI);
}
reserve = max_reserve;
}
}

void findMarker(World& world)
{
std::list<Marker*> markers = world.getGrid(phase).getAllAt(position);

float total_intensity = 0.0f;
sf::Vector2f point(0.0f, 0.0f);

const sf::Vector2f dir_vec = direction.getVec();

for (Marker* mp : markers) {
const Marker& m = *mp;
const sf::Vector2f to_marker = m.position - position;
const float length = getLength(to_marker);

if (length < marker_detection_max_dist) {
if (dot(to_marker, dir_vec) > 0.0f) {
total_intensity += m.intensity;
point += m.intensity * m.position;
}
}
}

if (total_intensity) {
direction = getAngle(point / total_intensity - position);
}
}

void addMarker(World& world)
{
if (reserve > 1.0f) {
world.addMarker(Marker(position, phase == Marker::ToFood ? Marker::ToHome : Marker::ToFood, reserve * marker_reserve_consumption));
reserve *= 1.0f - marker_reserve_consumption;
}

last_marker = 0.0f;
}

void render_food(sf::RenderTarget& target, const sf::RenderStates& states) const
{
if (phase == Marker::ToHome) {
const float radius = 2.0f;
sf::CircleShape circle(radius);
circle.setOrigin(radius, radius);
circle.setPosition(position + length * 0.5f * direction.getVec());
circle.setFillColor(Conf::FOOD_COLOR);
target.draw(circle, states);
}
}

void render_in(sf::VertexArray& va, const uint32_t index) const
{
const sf::Vector2f dir_vec(direction.getVec());
const sf::Vector2f nrm_vec(-dir_vec.y, dir_vec.x);

va[index + 0].position = position - width * nrm_vec + length * dir_vec;
va[index + 1].position = position + width * nrm_vec + length * dir_vec;
va[index + 2].position = position + width * nrm_vec - length * dir_vec;
va[index + 3].position = position - width * nrm_vec - length * dir_vec;
}

sf::Vector2f position;

Direction direction;

float last_direction_update;
float last_marker;
Marker::Type phase;
float reserve;
const uint32_t id;

// Parameters
const float width = 2.0f;
const float length = 3.5f;
const float move_speed = 50.0f;
const float marker_detection_max_dist = 40.0f;
const float direction_update_period = 0.125f;
const float marker_period = 0.25f;
const float max_reserve = 2000.0f;
const float direction_noise_range = PI * 0.1f;
const float marker_reserve_consumption = 0.02f;
const float colony_size = 20.0f;
};
Loading