mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-22 20:11:24 +01:00
Use color from svg
This commit is contained in:
parent
ca77e1008c
commit
52383267a7
1 changed files with 5 additions and 4 deletions
|
|
@ -185,7 +185,7 @@ async function newMesh(canvas) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createTextMesh(text, font, size) {
|
function createTextMesh(text, font, size, color) {
|
||||||
drawCtx.clearRect(0, 0, drawCtx.canvas.width, drawCtx.canvas.height);
|
drawCtx.clearRect(0, 0, drawCtx.canvas.width, drawCtx.canvas.height);
|
||||||
drawCtx.font = "50px " + font;
|
drawCtx.font = "50px " + font;
|
||||||
|
|
||||||
|
|
@ -193,7 +193,7 @@ function createTextMesh(text, font, size) {
|
||||||
drawCtx.canvas.height = 50 + 5;
|
drawCtx.canvas.height = 50 + 5;
|
||||||
drawCtx.font = "50px " + font;
|
drawCtx.font = "50px " + font;
|
||||||
|
|
||||||
drawCtx.fillStyle = "rgba(0,0,0,1)";
|
drawCtx.fillStyle = color;
|
||||||
drawCtx.fillText(text, 0, 50);
|
drawCtx.fillText(text, 0, 50);
|
||||||
|
|
||||||
// canvas contents will be used for a texture
|
// canvas contents will be used for a texture
|
||||||
|
|
@ -264,12 +264,13 @@ async function createMesh(width, height, segmentsX, segmentsY) {
|
||||||
iconMeshs = []
|
iconMeshs = []
|
||||||
|
|
||||||
const svg = $('svg#map')[0];
|
const svg = $('svg#map')[0];
|
||||||
|
console.log(svg)
|
||||||
// Labels
|
// Labels
|
||||||
if(layerIsOn("toggleLabels")) {
|
if(layerIsOn("toggleLabels")) {
|
||||||
// Cities labels
|
// Cities labels
|
||||||
const cities = $('#viewbox #labels #burgLabels #cities', svg)
|
const cities = $('#viewbox #labels #burgLabels #cities', svg)
|
||||||
for (const label of cities[0].childNodes) {
|
for (const label of cities[0].childNodes) {
|
||||||
const text_mesh = createTextMesh(label.innerHTML, cities.css('font-family'), 25) // cities.data('size')
|
const text_mesh = createTextMesh(label.innerHTML, cities.css('font-family'), 25, cities.css('fill')) // cities.data('size')
|
||||||
|
|
||||||
const [x, y, z] = get3dCoords(label.x.baseVal[0].value, label.y.baseVal[0].value)
|
const [x, y, z] = get3dCoords(label.x.baseVal[0].value, label.y.baseVal[0].value)
|
||||||
text_mesh.position.set(x, y + 15, z);
|
text_mesh.position.set(x, y + 15, z);
|
||||||
|
|
@ -284,7 +285,7 @@ async function createMesh(width, height, segmentsX, segmentsY) {
|
||||||
// Town labels
|
// Town labels
|
||||||
const towns = $('#viewbox #labels #burgLabels #towns', svg)
|
const towns = $('#viewbox #labels #burgLabels #towns', svg)
|
||||||
for (const label of towns[0].childNodes) {
|
for (const label of towns[0].childNodes) {
|
||||||
const text_mesh = createTextMesh(label.innerHTML, towns.css('font-family'), 7) // towns.data('size')
|
const text_mesh = createTextMesh(label.innerHTML, towns.css('font-family'), 7, towns.css('fill')) // towns.data('size')
|
||||||
|
|
||||||
const [x, y, z] = get3dCoords(label.x.baseVal[0].value, label.y.baseVal[0].value)
|
const [x, y, z] = get3dCoords(label.x.baseVal[0].value, label.y.baseVal[0].value)
|
||||||
text_mesh.position.set(x, y + 5, z);
|
text_mesh.position.set(x, y + 5, z);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue