Skip to content

Fix des positions des secteurs #60

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

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

Fix des positions des secteurs #60

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
12 changes: 10 additions & 2 deletions assets/js/main.desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,9 +1047,17 @@ jQuery(document).ready(function($) {
e.preventDefault();

var id = $(this).data('id');
const allGroupsSectors = document.querySelectorAll('.tactical-map svg g')
let countGroupsSectors = 0

allGroupsSectors.forEach(el => {
el.classList.remove('active')
countGroupsSectors++
if (allGroupsSectors.length === countGroupsSectors) {
e.target.closest("g").classList.add('active')
}
})
Copy link
Collaborator Author

@TefDesign TefDesign Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pour info @Kern046 j'ai fais en JS vanilla et pas JQuery car l'ajout ou de suppressions de classes ne fonctionne pas en jquery sur l'intérieur des SVG.

Copy link
Collaborator

@Kern046 Kern046 Jun 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

T'as raison on va dégager Jquery dès qu'on peut !


$('.tactical-map .number span').removeClass('active');
$('#sector' + id).addClass('active');
$('#input-sector-id').val(id);
});

Expand Down
37 changes: 3 additions & 34 deletions assets/less/component/map.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,40 +470,9 @@
&.ally12 { fill: @medium-12; }
}

.number {
position: absolute;
z-index: 800;
top: 0; left: 0;

span {
position: absolute;
color: rgba(255, 255, 255, .8);
font-size: 12px;
line-height: 22px; width: 22px;
text-align: center;
border-radius: 100%;
box-shadow: 0 0 1px white;

&.ally0 { background: #0A0A0A; }
&.ally1 { background: @dark-1; }
&.ally2 { background: @dark-2; }
&.ally3 { background: @dark-3; }
&.ally4 { background: @dark-4; }
&.ally5 { background: @dark-5; }
&.ally6 { background: @dark-6; }
&.ally7 { background: @dark-7; }
&.ally8 { background: @dark-8; }
&.ally9 { background: @dark-9; }
&.ally10 { background: @dark-10; }
&.ally11 { background: @dark-11; }
&.ally12 { background: @dark-12; }

&.active {
background: white;
color: black;
box-shadow: 0 0 10px black;
}
}
g.active polygon, g.active polygon:hover {
fill: #1b9448 !important;
stroke: #34bf68 !important;
Copy link
Collaborator Author

@TefDesign TefDesign Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Les !important étaient malheureusement inévitable. Quand je simplifierais le code, je pense qu'il y aura un clean à faire.

Copy link
Collaborator

@Kern046 Kern046 Jun 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ça marche pas de soucis

}
}

Expand Down
29 changes: 29 additions & 0 deletions src/Modules/Gaia/Galaxy/GalaxyConfigurationV6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,4 +652,33 @@ public function fillSectorsData()

// display params
public $scale = 20;

public function getPolygonCentroidFromString($vertices_string): array
{
// Convert string to array of integers
$vertices = array_map('intval', explode(',', $vertices_string));

$num_points = count($vertices) / 2;
$cx = 0;
$cy = 0;
$area = 0;

for ($i = 0; $i < $num_points; ++$i) {
$x1 = $vertices[2 * $i];
$y1 = $vertices[2 * $i + 1];
$x2 = $vertices[2 * (($i + 1) % $num_points)];
$y2 = $vertices[2 * (($i + 1) % $num_points) + 1];

$factor = ($x1 * $y2 - $x2 * $y1);
$cx += ($x1 + $x2) * $factor;
$cy += ($y1 + $y2) * $factor;
$area += $factor;
}

$area *= 0.5;
$cx /= (6 * $area);
$cy /= (6 * $area);

return ['left' => $cx, 'top' => $cy];
}
}
28 changes: 11 additions & 17 deletions templates/pages/zeus/registration/place_choice.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,23 @@
<svg class="sectors" viewBox="0, 0, 750, 750" xmlns="http://www.w3.org/2000/svg" style="width: 580px; height: 580px;">
{% for sector in sectors %}
{% set faction_identifier = sector.faction|default({identifier: 0}).identifier %}
<polygon data-id="{{ sector.id }}"
class="ally{{ faction_identifier }} {{ faction_identifier == app.session.get('inscription').get('ally') ? 'enabled' : 'disabled' }}"
points="{{ galaxy_configuration.getSectorCoord(sector.identifier, rate, 0) }}"
/>
{% set sectorCoord = galaxy_configuration.getSectorCoord(sector.identifier, rate, 0) %}
{% set centroid = galaxy_configuration.getPolygonCentroidFromString(sectorCoord) %}
<g class="ally{{ faction_identifier }}" data-sector="{{ sector.identifier }}">
<polygon data-id="{{ sector.id }}"
class="ally{{ faction_identifier }} {{ faction_identifier == app.session.get('inscription').get('ally') ? 'enabled' : 'disabled' }}"
points="{{ galaxy_configuration.getSectorCoord(sector.identifier, rate, 0) }}"
>
</polygon>
<text x="{{ centroid.left }}" y="{{ centroid.top }}" text-anchor="middle" fill="white" font-size="14">{{ sector.identifier }}</text>
</g>
{% endfor %}

</svg>
<div class="number">
{% for sector in sectors %}
{% set positionX = galaxy_configuration.sectors[loop.index - 1]['display'][0] * rate / 1.35 %}
{% set positionY = galaxy_configuration.sectors[loop.index - 1]['display'][1] * rate / 1.35 %}

<span id="sector{{ sector.identifier }}"
class="ally{{ sector.faction and sector.faction.identifier == app.session.get('inscription').get('ally') ? sector.faction.identifier : 0 }}"
style="top: {{ positionY }}px; left: {{ positionX }}px;">
{{- sector.identifier -}}
</span>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
</div>

<div class="component inscription color{{ app.session.get('inscription').get('ally') }}">
<div class="head">
Expand Down