public/traque
1
0
Fork 0
mirror of https://git.rezel.net/LudoTech/traque.git synced 2026-02-09 10:20:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

MVP systeme de zone quadrillage

Browse Source
This commit is contained in:
Quentin Roussel
2024-06-06 23:55:36 +02:00
parent 538b4b3bf6
commit ba846acc0c
13 changed files with 242 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
traque-front/hook/mapDrawing.jsx
View File

@@ -38,7 +38,7 @@ export function useMapCircleDraw(area, setArea) {
}
}
export function useMapGrid(coloredTiles, tileSize) {
export function useMapGrid(tilesColor, tileSize) {
const { layerContainer, map } = useLeafletContext();
const [grid, setGrid] = useState(null);
@@ -79,15 +79,12 @@ export function useMapGrid(coloredTiles, tileSize) {
const yMinPixel = Math.round(size.y * (y - minTileY) / (maxTileY - minTileY));
const yMaxPixel = Math.round(size.y * (y + 1 - minTileY) / (maxTileY - minTileY));
// fill the rectangle with a color
// if(coloredTiles.some(t => t.equals(tile))) {
// console.log(coloredTiles, "filling tile " + tile.x + " " + tile.y)
// } else {
// console.log(coloredTiles, "not filling tile " + tile.x + " " + tile.y)
// }
ctx.fillStyle = this.coloredTiles && this.coloredTiles.some(t => t.equals(tile))
? 'rgba(0, 0, 255, 0.3)'
: 'rgba(255, 255, 255, 0)';
if (this.tilesColor?.some(t => t.x == tile.x && t.y == tile.y)) {
ctx.fillStyle = this.tilesColor.find(t => t.x == tile.x && t.y == tile.y).color;
}
else {
ctx.fillStyle = 'rgba(255, 255, 255, 0)';
}
ctx.fillRect(xMinPixel, yMinPixel, xMaxPixel - xMinPixel, yMaxPixel - yMinPixel);
}
}
@@ -105,8 +102,25 @@ export function useMapGrid(coloredTiles, tileSize) {
useEffect(() => {
if (grid) {
grid.coloredTiles = coloredTiles;
grid.tilesColor = tilesColor;
grid.redraw();
}
}, [coloredTiles]);
}, [tilesColor,grid]);
}
export function useTilesColor(zone) {
const [tilesColor, setTilesColor] = useState([]);
useEffect(() => {
if (zone) {
setTilesColor(zone.map(t => {
if(t.removeDate == null) {
return { x: t.x, y: t.y, color: 'rgba(0, 0, 255, 0.3'}
}else {
return { x: t.x, y: t.y, color: 'rgba(255, 255, 0, 0.3'}
}
}));
}
}, [zone]);
return tilesColor;
}

10
traque-front/hook/useAdmin.jsx
View File

@@ -39,8 +39,12 @@ export default function useAdmin(){
adminSocket.emit("change_state", state);
}
function changeZoneSettings(zone) {
adminSocket.emit("set_zone_settings", zone);
function initZone(zone) {
adminSocket.emit("set_zone", zone);
}
function removeZone(zone, time) {
adminSocket.emit("remove_zone", zone, time);
}
function changePenaltySettings(penalties) {
@@ -50,6 +54,6 @@ export default function useAdmin(){
function changeGameSettings(settings) {
adminSocket.emit("set_game_settings", settings);
}
return {...adminContext,changeGameSettings, changeZoneSettings, changePenaltySettings, pollTeams, getTeam, getTeamName, reorderTeams, addTeam, removeTeam, changeState, updateTeam };
return {...adminContext,changeGameSettings, removeZone, initZone, changePenaltySettings, pollTeams, getTeam, getTeamName, reorderTeams, addTeam, removeTeam, changeState, updateTeam };
}