Compare commits

..

No commits in common. "0d97b3a56f3de524dfd98f71dc602555da8e046d" and "578afce3c4c515750ed458c44b2dca08150e8334" have entirely different histories.

6 changed files with 39 additions and 181 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View file

@ -174,64 +174,6 @@ namespace lib_svg
}
/**
* @author kcf <vidofnir@folksprak.org>
*/
export function isogon
(
sides : int,
radius : float,
{
"tilt": tilt = 0,
"position": position = lib_vector.cartesian(0, 0),
"transformations": transformations = [],
"classes": classes = [],
}
:
{
tilt ?: float;
position ?: lib_vector.type_vector;
transformations ?: Array<string>;
classes ?: Array<string>;
}
=
{
}
)
: lib_xml.type_node
{
const factor : float = (1 / sides);
return (
path
(
(
lib_list.sequence(sides)
.map
(
i => (
lib_vector.add
(
lib_vector.polar
(
(((i * factor) + tilt) * (2 * Math.PI)),
radius
)
,
position
)
)
)
),
true,
{
"class": classes.join(" "),
"transform": transformations.join(" "),
}
)
);
}
/**
* @author kcf <vidofnir@folksprak.org>
*/

View file

@ -82,15 +82,15 @@ namespace mod_vtm
let children_token : Array<lib_xml.type_node> = [];
// Stein
{
const node_stone : lib_xml.type_node = (
lib_svg.isogon
let node_stone : lib_xml.type_node = (
lib_xml.create_normal
(
6,
0.1,
"circle",
{
"position": lib_vector.cartesian(0, 0),
"tilt": (1/4 + 1/12),
"classes": ["stone"],
"cx": (0.0).toFixed(lib_svg.float_precision),
"cy": (0.0).toFixed(lib_svg.float_precision),
"r": (0.125).toFixed(lib_svg.float_precision),
"class": "stone",
}
)
);
@ -104,38 +104,31 @@ namespace mod_vtm
(
(symbol, index) =>
{
const r : float = 0.0800;
const x : float = (+0.1+(2*r*1.25)*index);
const y : float = (-0.1);
const node_entry : lib_xml.type_node = (
lib_svg.group
let r : float = 0.06125;
let x : float = (+0.1+(2*r*1.25)*index);
let y : float = (-0.1);
let node_entry : lib_xml.type_node = (
lib_xml.create_normal
(
"circle",
{
"transform": (
[
lib_svg.translation(x, y),
lib_svg.rotation(index * (1/12)),
].join(" ")
)
},
[
lib_svg.isogon
(
3,
r,
{
"position": lib_vector.cartesian(0, 0),
"tilt": (1/4),
"classes":
"cx": x.toFixed(lib_svg.float_precision),
"cy": y.toFixed(lib_svg.float_precision),
"r": r.toFixed(lib_svg.float_precision),
/*
"x": (x-r).toFixed(lib_svg.float_precision),
"y": (y-r).toFixed(lib_svg.float_precision),
"width": (2*r).toFixed(lib_svg.float_precision),
"height": (2*r).toFixed(lib_svg.float_precision),
*/
"class": (
[
"entry",
"symbol_" + symbol.toFixed(0),
]
,
].join(" ")
),
}
)
]
)
);
children_tape.push(node_entry);
}

View file

@ -30,18 +30,6 @@ $hue_symbol_3: (((($sigma*3)+$offset)%1)*360);
$saturation_symbol: 75%;
$lightness_symbol: 50%;
@keyframes spin
{
from
{
transform: rotate(0deg);
}
to
{
transform: rotate(360deg);
}
}
.frame
{
stroke: none;
@ -56,12 +44,8 @@ $lightness_symbol: 50%;
*/
}
.stone
.token
{
/*
stroke-width: 0.05;
stroke: hsl( 0, 0%, 0%);
*/
stroke: none;
fill: hsl( 0, 0%, 0%);
}
@ -125,15 +109,10 @@ $lightness_symbol: 50%;
.entry
{
/*
stroke: black;
stroke-width: 0.01;
/*
stroke: none;
*/
animation-name: spin;
animation-duration: 4s;
animation-timing-function: linear;
animation-iteration-count: infinite;
stroke: none;
}

View file

@ -1,60 +1,10 @@
#!/usr/bin/env python3
#!/usr/bin/env sh
import sys as _sys
import os as _os
import argparse as _argparse
rsync \
--verbose \
--recursive \
--delete \
--rsh=ssh \
build/* \
mehl:~/websites/folksprak.org/htdocs/vtm/
def main():
## args
argument_parser = _argparse.ArgumentParser()
argument_parser.add_argument(
type = str,
dest = "target_system",
metavar = "<target-system>",
help = "either 'localhost' or SSH handle of the target system",
)
argument_parser.add_argument(
"-t",
"--target-directory",
type = str,
dest = "target_directory",
default = "/opt/zeitbild",
metavar = "<target-directory>",
help = "directory on the target system, where the files shall be put; default: /opt/zeitbild",
)
argument_parser.add_argument(
"-b",
"--build-directory",
type = str,
dest = "build_directory",
default = "/tmp/zeitbild",
metavar = "<build-directory>",
help = "directory to where the build was put",
)
args = argument_parser.parse_args()
## exec
if (not _os.path.exists(args.build_directory)):
_sys.stderr.write("-- build directory not found; probably you need to run /tools/build\n")
_sys.exit(1)
else:
_os.system(
" ".join([
"rsync",
"--recursive",
"--links",
"--update",
"--delete",
"--verbose",
("%s/" % args.build_directory),
(
("%s" % args.target_directory)
if (args.target_system == "localhost") else
("%s:%s" % (args.target_system, args.target_directory, ))
),
])
)
main()

View file

@ -3,7 +3,6 @@ cmd_rm := rm -rf
cmd_echo := echo # -e
cmd_cp := cp -r -u -v
cmd_cat := cat
cmd_ln := ln --symbolic
cmd_tsc := tsc --target ES5 --allowUnreachableCode
cmd_sass := sassc
@ -15,8 +14,7 @@ all: \
${dir_build}/vtm.css \
${dir_build}/vtm.dat.js \
${dir_build}/vtm.js \
music \
${dir_build}/index.html
music
.PHONY: all
clear:
@ -103,7 +101,3 @@ music:
@ ${cmd_md} ${dir_build}/music
@ ${cmd_cp} ${dir_source}/music/* ${dir_build}/music/
.PHONY: music
${dir_build}/index.html:
@ ${cmd_ln} vtm.html ${dir_build}/index.html