change iterations from /64 to /128

.drone.yml

@@ -1,21 +1,23 @@
+kind: pipeline
+name: default
+
 workspace:
   base: /go
-  path: src/deadbeef.codes/steven/mandelmapper
+  path: src/code.stevenpolley.net/steven/mandelmapper
 
-pipeline:
+steps:
-  build:
+- name: build
-    image: golang:latest
+  image: golang
-    environment:
+  pull: always
-      - GOOS=linux
+  environment:
-      - GOARCH=arm
+    GOOS: linux
-      - GOARM=7
+    GOARCH: amd64
-    commands:
+    CGO_ENABLED: 0
-      - go version
+  commands:
-      - go get
+  - go version
-      - go build
+  - go get
-  publish:
+  - go build -a -ldflags '-w'
-    image: plugins/docker
+- name: publish
-    repo: deadbeef.codes:5000/mandelmapper
+  image: plugins/docker
-    registry: deadbeef.codes:5000
+  settings:
-    auto_tag: true
+    repo: registry.stevenpolley.net/mandelmapper
-    auto_tag_suffix: ${DRONE_COMMIT}

Dockerfile

@@ -1,4 +1,5 @@
-FROM deadbeef.codes:5000/raspberrypi3-alpine:3.7
+FROM scratch
-COPY mandelmapper /usr/bin
+LABEL maintainer="himself@stevenpolley.net"
+COPY mandelmapper /
 EXPOSE 6161:6161
-CMD mandelmapper
+ENTRYPOINT ["/mandelmapper"]

README.md

@@ -1,3 +1,6 @@
-testing drone ?
+[![Build Status](https://drone.deadbeef.codes/api/badges/steven/mandelmapper/status.svg)](https://drone.deadbeef.codes/steven/mandelmapper)
-release
+
-another drone test plz
+
+This is currently deployed to a ARMv8 cluster, viewable at https://mandelmap.deadbeef.codes
+
+ 

docker-compose.yml

@@ -0,0 +1,8 @@
+version: '3.6'
+
+services:
+  mandel-mapper:
+    image: registry.deadbeef.codes/mandelmapper:latest
+    ports:
+      - 6161:6161
+    restart: always

go.mod

@@ -0,0 +1,5 @@
+module deadbeef.codes/steven/mandelmapper
+
+go 1.22
+
+require golang.org/x/image v0.22.0

go.sum

@@ -0,0 +1,4 @@
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g=
+golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4=

palette/palette.go

@@ -361,4 +361,13 @@ var ColorPalettes = []ColorMap{
 		Color{Color: color.RGBA{0x2a, 0xa1, 0x98, 0xff}},
 		Color{Color: color.RGBA{0x85, 0x99, 0x00, 0xff}},
 	}},
+	{"Pride", []Color{
+		Color{Step: 0.0, Color: color.RGBA{0xff, 0x00, 0x00, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0xff, 0x7f, 0x00, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0xff, 0xff, 0x00, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0x00, 0xff, 0x00, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0x00, 0x00, 0xff, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0x2e, 0x2b, 0x5f, 0xff}},
+		Color{Step: 0.0, Color: color.RGBA{0x8b, 0x00, 0xff, 0xff}},
+	}},
 }

render.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"image"
 	"image/color"
 	"image/png"
@@ -8,17 +9,22 @@ import (
 	"math"
 	"math/cmplx"
 	"net/http"
+	"os"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
 
 	"deadbeef.codes/steven/mandelmapper/palette"
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/basicfont"
+	"golang.org/x/image/math/fixed"
 )
 
 const (
-	Size       = 128
+	Size = 128
-	Iterations = 1<<16 - 1
+	//Iterations = (1<<16 - 1) / 256
+	Iterations = (1<<16 - 1) / 128
 )
 
 var (
@@ -46,8 +52,8 @@ func main() {
 	}
 
 	colorStep := float64(Iterations)
-	//	colors = interpolateColors("Plan9", colorStep)
+
-	colors = interpolateColors("Solarized", colorStep)
+	colors = interpolateColors("Hippi", colorStep)
 
 	log.Fatal(http.ListenAndServe(":6161", nil))
 }
@@ -65,7 +71,7 @@ func computeThread() {
 	}
 }
 
-//interpolateColors accepts a color palette and number of desired colors and builds a slice of colors by interpolating the gaps
+// interpolateColors accepts a color palette and number of desired colors and builds a slice of colors by interpolating the gaps
 func interpolateColors(paletteCode string, numberOfColors float64) []color.RGBA {
 	var factor float64
 	steps := []float64{}
@@ -132,6 +138,7 @@ func linearInterpolation(c1, c2, mu uint32) uint32 {
 }
 
 func renderTile(w http.ResponseWriter, r *http.Request) {
+	r.ParseForm()
 	components := strings.Split(r.URL.Path, "/")[1:]
 
 	if len(components) != 4 || components[0] != "mandelbrot" || components[3][len(components[3])-4:] != ".png" {
@@ -167,6 +174,16 @@ func renderTile(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	wg.Wait()
+
+	if r.FormValue("label") == "1" {
+		addLabel(img, 1, 10, fmt.Sprintf("%d/%d/%d", tileZoom, tileX, tileY))
+
+		hostname, err := os.Hostname()
+		if err != nil {
+			hostname = fmt.Sprintf("failed to get hostname: %v", err)
+		}
+		addLabel(img, 1, 22, hostname)
+	}
 	w.Header().Set("Content-Type", "image/png")
 	png.Encode(w, img)
 }
@@ -181,3 +198,16 @@ func mandelbrot(c complex128) uint16 {
 	}
 	return Iterations
 }
+
+func addLabel(img *image.RGBA, x, y int, label string) {
+	col := color.RGBA{200, 100, 0, 255}
+	point := fixed.Point26_6{fixed.Int26_6(x * 64), fixed.Int26_6(y * 64)}
+
+	d := &font.Drawer{
+		Dst:  img,
+		Src:  image.NewUniform(col),
+		Face: basicfont.Face7x13,
+		Dot:  point,
+	}
+	d.DrawString(label)
+}

web.go

@@ -13,23 +13,25 @@ func init() {
 			return
 		}
 
+		r.ParseForm()
+
 		fmt.Fprintf(w, `<!DOCTYPE html>
 <html>
 <head>
 <title>MandelMapper</title>
 
-<meta property="og:url" content="http://mc.deadbeef.codes/" />
+<meta property="og:url" content="https://mandelmap.deadbeef.codes/" />
 <meta property="og:type" content="website" />
 <meta property="og:title" content="Mandelbrot Mapper">
 <meta property="og:description" content="A Google maps front end to a distributed real-time fractal renderer">
 <meta property="og:image" content="https://deadbeef.codes/img/mandelbrot.png" />
 <meta property="og:site_name" content="deadbeef.codes">
 
-<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAZItO5CjoqDfPLwH_FZ4KcvQFt_L5dQBw"></script>
+<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDJJV_-Q2wIBlzYVzfIbZTapl-8tMoYxw8"></script>
 <script>
 var mandelbrotTypeOptions = {
 	getTileUrl: function(coord, zoom) {
-		return '/mandelbrot/' + zoom + '/' + coord.x + '/' + coord.y + '.png';
+		return '/mandelbrot/' + zoom + '/' + coord.x + '/' + coord.y + '.png?label=%s';
 	},
 	tileSize: new google.maps.Size(128, 128),
 	maxZoom: (1<<16),
@@ -67,6 +69,6 @@ function initialize() {
 <body onload="initialize()">
 <div id="map_canvas"></div>
 </body>
-</html>`)
+</html>`, r.FormValue("label"))
 	})
 }