freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rework client drawing code

Browse source
This commit is contained in:
Nils Schneider 2015-06-27 01:37:36 +02:00
parent d170204b31
commit 4d69677ede
2 changed files with 25 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/forcegraph.js
View file

@ -288,27 +288,24 @@ define(["d3"], function (d3) {
if (clients === 0) if (clients === 0)
return return
var distance = 16 var startDistance = 16
var radius = 3 var radius = 3
var a = 1.2 var a = 1.2
var startAngle = Math.PI var startAngle = Math.PI
var angle = startAngle
for (var i = 0; i < clients; i++) {
if ((angle - startAngle) > 2 * Math.PI) {
angle = startAngle
distance += 2 * radius * a
}
var x = d.x + distance * Math.cos(angle)
var y = d.y + distance * Math.sin(angle)
ctx.moveTo(x, y)
ctx.arc(x, y, radius, 0, 2 * Math.PI)
for (var orbit = 0, i = 0; i < clients; orbit++) {
var distance = startDistance + orbit * 2 * radius * a
var n = Math.floor((Math.PI * distance) / (a * radius)) var n = Math.floor((Math.PI * distance) / (a * radius))
var angleDelta = 2 * Math.PI / n var delta = clients - i
angle += angleDelta
for (var j = 0; j < Math.min(delta, n); i++, j++) {
var angle = 2 * Math.PI / n * j
var x = d.x + distance * Math.cos(angle + startAngle)
var y = d.y + distance * Math.sin(angle + startAngle)
ctx.moveTo(x, y)
ctx.arc(x, y, radius, 0, 2 * Math.PI)
}
} }
}) })

30
lib/map/clientlayer.js
View file

@ -53,25 +53,19 @@ define(["leaflet", "jshashes"],
p.x -= s.x p.x -= s.x
p.y -= s.y p.y -= s.y
var distance = startDistance for (var orbit = 0, i = 0; i < clients; orbit++) {
var startAngle = d.startAngle var distance = startDistance + orbit * 2 * radius * a
var angle = startAngle
for (var i = 0; i < clients; i++) {
if ((angle - startAngle) > 2 * Math.PI) {
angle = startAngle
distance += 2 * radius * a
}
var x = p.x + distance * Math.cos(angle)
var y = p.y + distance * Math.sin(angle)
ctx.moveTo(x, y)
ctx.arc(x, y, radius, 0, 2 * Math.PI)
var n = Math.floor((Math.PI * distance) / (a * radius)) var n = Math.floor((Math.PI * distance) / (a * radius))
var angleDelta = 2 * Math.PI / n var delta = clients - i
angle += angleDelta
for (var j = 0; j < Math.min(delta, n); i++, j++) {
var angle = 2 * Math.PI / n * j
var x = p.x + distance * Math.cos(angle + d.startAngle)
var y = p.y + distance * Math.sin(angle + d.startAngle)
ctx.moveTo(x, y)
ctx.arc(x, y, radius, 0, 2 * Math.PI)
}
} }
}) })