fixing merge conflicts

This commit is contained in:
Kbz-8
2024-02-21 16:43:44 +01:00
12 changed files with 457 additions and 17 deletions

View File

@ -1,6 +1,7 @@
import { Game } from "./Game.js";
import { Point } from "./Point.js";
import { Segment } from "./Segment.js";
import { renderCube } from "../../3D/cube.js"
class Player
{
@ -67,8 +68,11 @@ class Player
{
if (this.is_connected === false)
{
ctx.moveTo(this.rail.start.x, this.rail.start.y);
ctx.lineTo(this.rail.stop.x, this.rail.stop.y);
if(ctx instanceof CanvasRenderingContext2D)
{
ctx.moveTo(this.rail.start.x, this.rail.start.y);
ctx.lineTo(this.rail.stop.x, this.rail.stop.y);
}
return;
}
@ -107,4 +111,4 @@ class Player
}
}
export { Player };
export { Player };