Skip to content
Snippets Groups Projects
Commit d67fe65e authored by Giovanni Caruso's avatar Giovanni Caruso
Browse files

Add link to palette

parent 30275c18
No related branches found
No related tags found
1 merge request!38Colouredlines
Pipeline #102711 passed
Stage: fetch
Stage: deps
Stage: check
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
public/index.html
+ 72
− 68
View file @ d67fe65e
...@@ -72,7 +72,9 @@ ...@@ -72,7 +72,9 @@
<h3>Brush colour</h3> <h3>Brush colour</h3>
</div> </div>
&nbsp; &nbsp;
<div id="rectangle"></div> <a href="#">
<div id="rectangle"></div>
</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -94,73 +96,75 @@ ...@@ -94,73 +96,75 @@
d="M 42.2,78.9 46.1,64.4 Q 50,65 53.88,64.48 L 57.7,78.9 Q 50,80 42.2,78.9Z" d="M 42.2,78.9 46.1,64.4 Q 50,65 53.88,64.48 L 57.7,78.9 Q 50,80 42.2,78.9Z"
/> />
</defs> </defs>
<use class="wheelPiece" xlink:href="#piePiece" fill="#329739" /> <a href="#">
<use <use class="wheelPiece" xlink:href="#piePiece" fill="#329739" />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(30,50,50)" xlink:href="#piePiece"
fill="#639b47" transform="rotate(30,50,50)"
/> fill="#639b47"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(60,50,50)" xlink:href="#piePiece"
fill="#9ac147" transform="rotate(60,50,50)"
/> fill="#9ac147"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(90,50,50)" xlink:href="#piePiece"
fill="#A9AA39" transform="rotate(90,50,50)"
/> fill="#A9AA39"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(120,50,50)" xlink:href="#piePiece"
fill="#e1e23b" transform="rotate(120,50,50)"
/> fill="#e1e23b"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(150,50,50)" xlink:href="#piePiece"
fill="#f7941e" transform="rotate(150,50,50)"
/> fill="#f7941e"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(180,50,50)" xlink:href="#piePiece"
fill="#ba3e2e" transform="rotate(180,50,50)"
/> fill="#ba3e2e"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(210,50,50)" xlink:href="#piePiece"
fill="#9a1d34" transform="rotate(210,50,50)"
/> fill="#9a1d34"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(240,50,50)" xlink:href="#piePiece"
fill="#662a6c" transform="rotate(240,50,50)"
/> fill="#662a6c"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(270,50,50)" xlink:href="#piePiece"
fill="#272b66" transform="rotate(270,50,50)"
/> fill="#272b66"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(300,50,50)" xlink:href="#piePiece"
fill="#2d559f" transform="rotate(300,50,50)"
/> fill="#2d559f"
<use />
class="wheelPiece" <use
xlink:href="#piePiece" class="wheelPiece"
transform="rotate(330,50,50)" xlink:href="#piePiece"
fill="#43a1cd" transform="rotate(330,50,50)"
/> fill="#43a1cd"
/>
</a>
</svg> </svg>
</div> </div>
</div> </div>
......
src/app.js
+ 8
− 2
View file @ d67fe65e
...@@ -160,7 +160,10 @@ canvas.input.addEventListener("strokestart", ({ detail: e }) => { ...@@ -160,7 +160,10 @@ canvas.input.addEventListener("strokestart", ({ detail: e }) => {
const mousePos = [e.offsetX, e.offsetY] const mousePos = [e.offsetX, e.offsetY]
if (currentTool == tools.PEN) { if (currentTool == tools.PEN) {
pathIDsByPointerID.set(e.pointerId, room.addPath(mousePos)) pathIDsByPointerID.set(
e.pointerId,
room.addPath(mousePos, canvas.stroke_colour),
)
} else if (currentTool == tools.ERASER) { } else if (currentTool == tools.ERASER) {
erasePoint(mousePos) erasePoint(mousePos)
} }
...@@ -178,7 +181,10 @@ canvas.input.addEventListener("strokemove", ({ detail: e }) => { ...@@ -178,7 +181,10 @@ canvas.input.addEventListener("strokemove", ({ detail: e }) => {
const mousePos = [e.offsetX, e.offsetY] const mousePos = [e.offsetX, e.offsetY]
if (currentTool == tools.PEN) { if (currentTool == tools.PEN) {
room.extendPath(pathIDsByPointerID.get(e.pointerId), mousePos) room.extendPath(pathIDsByPointerID.get(e.pointerId), [
mousePos,
canvas.stroke_colour,
])
} else if (currentTool == tools.ERASER) { } else if (currentTool == tools.ERASER) {
erasePoint(mousePos) erasePoint(mousePos)
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment