diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..501631d
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,43 @@
+@file:OptIn(ExperimentalDistributionDsl::class)
+
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
+
+plugins {
+ kotlin("multiplatform") version "2.2.20"
+}
+
+group = "nl.astraeus"
+version = "0.1.0"
+
+repositories {
+ mavenCentral()
+}
+
+kotlin {
+ js {
+ browser {
+ commonWebpackConfig {
+ outputFileName = "fractal.js"
+ sourceMaps = true
+ devtool = "inline-source-map"
+ }
+
+ binaries.executable()
+
+ distribution {
+ outputDirectory.set(File("$projectDir/web/"))
+ }
+ }
+ }
+
+ sourceSets {
+ val commonMain by getting {
+ dependencies {
+ api("org.jetbrains.kotlinx:kotlinx-html:0.12.0")
+ }
+ }
+ val jsMain by getting {
+
+ }
+ }
+}
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..23d15a9
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..db3a6ac
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/mandelbrot.iml b/mandelbrot.iml
deleted file mode 100644
index 3c71942..0000000
--- a/mandelbrot.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mandelbrot.ipr b/mandelbrot.ipr
deleted file mode 100644
index be8209a..0000000
--- a/mandelbrot.ipr
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.7
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..38dad05
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,17 @@
+
+pluginManagement {
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+
+dependencyResolutionManagement {
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+rootProject.name = "kotlin-webgl-fractal"
diff --git a/src/Julia.kt b/src/Julia.kt
deleted file mode 100644
index c1ee4de..0000000
--- a/src/Julia.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-import com.persesgames.shader.ShaderProgram
-import com.persesgames.shader.VertextAttributeInfo
-import org.khronos.webgl.Float32Array
-import org.khronos.webgl.WebGLBuffer
-import org.khronos.webgl.WebGLRenderingContext
-import kotlin.browser.window
-
-/**
- * User: rnentjes
- * Date: 21-5-16
- * Time: 17:06
- */
-
-private val vertexShader = """
- attribute vec2 a_position;
-
- uniform vec4 u_viewWindow;
-
- varying vec2 v_coord;
-
- void main(void) {
- v_coord = a_position * u_viewWindow.zw + u_viewWindow.xy;
-
- gl_Position = vec4(a_position, 0.0, 1.0);
- }
-"""
-
-private val fragmentShader = """
- precision mediump float;
-
- uniform vec2 u_julia;
- uniform float u_iteratorOffset;
-
- varying vec2 v_coord;
-
- void main(void) {
- float xx = v_coord.x;
- float yy = v_coord.y;
- float xt = 0.0;
-
- gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0);
-
- if (xx*xx + yy*yy < 4.0) {
- for (int iteration = 0; iteration < 1000; iteration++) {
- if (xx*xx + yy*yy > 4.0) {
- float mu = u_iteratorOffset + float(iteration) + 1.0 - log(log(xx*xx + yy*yy)) / log(2.0);
- //mu = sqrt(mu);
-
- float it = mod(mu * 23.0, 768.0);
-
- float red = min(it, 255.0) / 255.0;
- float green = max(0.0, min(it, 511.0) - 256.0) / 255.0;
- float blue = max(0.0, min(it, 767.0) - 512.0) / 255.0;
-
- gl_FragColor = vec4( blue, green, red, 1.0);
- break;
- }
- xt = xx*xx - yy*yy + u_julia.x;
- yy = 2.0*xx*yy + u_julia.y;
- xx = xt;
- }
- }
- }
-"""
-
-class JuliaData {
- var juliaX: Float = 0f
- var juliaY: Float = 0f
-
- var offsetX: Float = 0f
- var offsetY: Float = 0f
- var scaleX: Float = 1f
- var scaleY: Float = 1f
-
- var iteratorOffset: Float = 0f
-}
-
-class Julia(val html: HTMLElements) {
- val webgl = html.webgl
- val shaderProgram: ShaderProgram
- val data: JuliaData = JuliaData()
- val attribBuffer: WebGLBuffer
- val vertices: Float32Array
- val start = Date().getTime()
-
- init {
- val array: Array = arrayOf(
- -1f,-1f,
- 1f,-1f,
- 1f, 1f,
- 1f, 1f,
- -1f, 1f,
- -1f,-1f
- )
-
- vertices = Float32Array(array.size)
- vertices.set(array, 0)
-
- val setter = { program: ShaderProgram, data: JuliaData ->
- program.setUniform2f("u_julia", data.juliaX, data.juliaY)
- program.setUniform4f("u_viewWindow", data.offsetX, data.offsetY, data.scaleX, data.scaleY)
- program.setUniform1f("u_iteratorOffset", data.iteratorOffset)
- }
-
- val vainfo = arrayOf(
- VertextAttributeInfo("a_position", 2)
- )
-
- shaderProgram = ShaderProgram(webgl, WebGLRenderingContext.TRIANGLES, vertexShader, fragmentShader, vainfo, setter)
-
-
- attribBuffer = webgl.createBuffer() ?: throw IllegalStateException("Unable to create webgl buffer!")
- webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, attribBuffer);
- }
-
- fun render() {
- html.resize()
-
- webgl.clearColor(1f, 1f, 1f, 1f)
- webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
-
- var time = (start - (Date().getTime())) / 500.0
-
-// data.juliaX = -0.391f + (Math.sin(time / 31) / 10f).toFloat()
-// data.juliaY = -0.587f + (Math.cos(time / 23.07) / 10f).toFloat()
-
-// data.juliaX = -0.79f + (Math.sin(time / 31) / 100f).toFloat()
-// data.juliaY = 0.15f + (Math.cos(time / 23.07) / 100f).toFloat()
-
- data.juliaX = 0.28f + (Math.sin(time / 31) / 100f).toFloat()
- data.juliaY = 0.008f + (Math.cos(time / 23.07) / 100f).toFloat()
-
- data.scaleX = 1.3f - Math.sin(time / 10.0).toFloat() * 0.5f
- data.scaleY = 1.3f - Math.sin(time / 10.0).toFloat() * 0.5f
-
- data.iteratorOffset = 0f //time.toFloat() * 10f
-
- shaderProgram.begin(attribBuffer, data)
-
- webgl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, vertices, WebGLRenderingContext.DYNAMIC_DRAW);
- webgl.drawArrays(shaderProgram.drawType, 0, 6)
-
- shaderProgram.end()
-
- window.requestAnimationFrame {
- render()
- }
- }
-}
diff --git a/src/Main.kt b/src/Main.kt
deleted file mode 100644
index 2b2907d..0000000
--- a/src/Main.kt
+++ /dev/null
@@ -1,197 +0,0 @@
-import org.khronos.webgl.WebGLRenderingContext
-import org.w3c.dom.HTMLCanvasElement
-import org.w3c.dom.HTMLElement
-import kotlin.browser.document
-import kotlin.browser.window
-
-/**
- * User: rnentjes
- * Date: 21-5-16
- * Time: 17:06
- */
-
-class HTMLElements {
- val container: HTMLElement
- val canvas: HTMLCanvasElement
- var webgl: WebGLRenderingContext
-
- var windowWidth = 0
- var windowHeight = 0
-
- init {
- container = document.createElement("div") as HTMLElement
-
- canvas = document.createElement("canvas") as HTMLCanvasElement
-
- container.setAttribute("style", "position: relative;")
- canvas.setAttribute("style", "position: absolute; left: 0px; top: 0px; z-index: 10; width: 2000px; height: 1000px;" )
-
- document.body!!.appendChild(container)
- container.appendChild(canvas)
-
- webgl = canvas.getContext("webgl") as WebGLRenderingContext
- }
-
- fun resize() {
- val windowWidth = window.innerWidth.toInt()
- val windowHeight = window.innerHeight.toInt()
-
- if (this.windowWidth != windowWidth ||
- this.windowHeight != windowHeight) {
-
- this.windowWidth = windowWidth
- this.windowHeight = windowHeight
- canvas.setAttribute("width", "${windowWidth}px")
- canvas.setAttribute("height", "${windowHeight}px")
- canvas.setAttribute("style", "position: absolute; left: 0px; top: 0px; z-index: 5; width: ${windowWidth}px; height: ${windowHeight}px;")
- webgl.viewport(0, 0, windowWidth, windowHeight)
- }
- }
-
- fun getColor(mu: Double) {
- var clr1 = mu.toInt()
- var t2 = mu - clr1
- var t1 = 1 - t2
- clr1 = clr1 % 768
-
-// int clr1 = (int)mu;
-// double t2 = mu - clr1;
-// double t1 = 1 - t2;
-// clr1 = clr1 % Colors.Count;
-// int clr2 = (clr1 + 1) % Colors.Count;
-//
-// byte r = (byte)(Colors[clr1].R * t1 + Colors[clr2].R * t2);
-// byte g = (byte)(Colors[clr1].G * t1 + Colors[clr2].G * t2);
-// byte b = (byte)(Colors[clr1].B * t1 + Colors[clr2].B * t2);
-//
-// return Color.FromArgb(255, r, g, b);
- }
-
- fun drawMandel() {
- /*
- For each pixel (Px, Py) on the screen, do:
- {
- x0 = scaled x coordinate of pixel (scaled to lie in the Mandelbrot X scale (-2.5, 1))
- y0 = scaled y coordinate of pixel (scaled to lie in the Mandelbrot Y scale (-1, 1))
- x = 0.0
- y = 0.0
- iteration = 0
- max_iteration = 1000
- while (x*x + y*y < 2*2 AND iteration < max_iteration) {
- xtemp = x*x - y*y + x0
- y = 2*x*y + y0
- x = xtemp
- iteration = iteration + 1
- }
- color = palette[iteration]
- plot(Px, Py, color)
- }*/
-
- var xs: Double
- var ys: Double
- var xx: Double
- var yy: Double
- var xt: Double
- var iteration: Int
- val max_iteration: Int = 767
- val halfWindowHeight = windowHeight / 2
- var red: Int
- var green: Int
- var blue: Int
- var fillStyle: String
- var mu: Double
-
- for (x in 0..windowWidth) {
- for (y in 0..windowHeight) {
- xs = (4.0 / windowWidth.toFloat()) * x - 2.0
- ys = 4.0 - ((4.0 / windowHeight) * y) - 2.0
-
- xx = 0.0
- yy = 0.0
- iteration = 0
- while(xx*xx + yy*yy < 4 && iteration < max_iteration) {
- xt = xx*xx - yy*yy + xs
- yy = 2*xx*yy + ys
- xx = xt
- iteration++
- }
- if (iteration == max_iteration) {
- fillStyle = "rgb(0, 0, 0)"
- } else {
- //mu = iteration + 1 - Math.log(Math.log(xx*xx + yy*yy)) / Math.log(2.0);
- iteration = (iteration * 13) % 768
- red = Math.min(iteration, 255)
- green = Math.max(0, Math.min(iteration, 511) - 256)
- blue = Math.max(0, Math.min(iteration, 767) - 512)
- fillStyle = "rgb($red, $green, $blue)"
- }
-
- //canvas2d.fillStyle = fillStyle
- //canvas2d.fillRect(x.toDouble(), y.toDouble(), 1.0, 1.0)
- }
- }
-
- }
-
- fun drawJulia(xc: Double, yc: Double) {
- var xx: Double
- var yy: Double
- var xt: Double
- var iteration: Int
- val max_iteration: Int = 511
- var red: Int
- var green: Int
- var blue: Int
- var fillStyle: String
-
- for (x in 0..windowWidth) {
- for (y in 0..windowHeight) {
- xx = (4.0 / windowWidth.toFloat()) * x - 2.0
- yy = 4.0 - ((4.0 / windowHeight) * y) - 2.0
-
- iteration = 0
- while(xx*xx + yy*yy < 4 && iteration < max_iteration) {
- xt = xx*xx - yy*yy + xc
- yy = 2*xx*yy + yc
- xx = xt
- iteration++
- }
- if (iteration == max_iteration) {
- fillStyle = "rgb(0, 0, 0)"
- } else {
- //mu = iteration + 1 - Math.log(Math.log(xx*xx + yy*yy)) / Math.log(2.0);
- iteration = (iteration * 31) % 512
- red = Math.min(iteration, 255)
- green = Math.max(0, Math.min(iteration, 511) - 256)
- blue = Math.max(0, Math.min(iteration, 767) - 512)
- fillStyle = "rgb($red, $green, $blue)"
- }
-
- //canvas2d.fillStyle = fillStyle
- //canvas2d.fillRect(x.toDouble(), y.toDouble(), 1.0, 1.0)
- }
- }
-
- }
-
- fun render() {
- webgl.clearColor(1f, 1f, 1f, 1f)
- webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
-
-
-
-// window.requestAnimationFrame {
-// render()
-// }
- }
-}
-
-fun main(args: Array) {
- val html = HTMLElements()
-
- val mandelBrot = MandelBrot(html)
- val julia = Julia(html)
-
- julia.render()
- //html.drawJulia(-0.493, -0.587)
-}
\ No newline at end of file
diff --git a/src/MandelBrot.kt b/src/MandelBrot.kt
deleted file mode 100644
index 7199cf3..0000000
--- a/src/MandelBrot.kt
+++ /dev/null
@@ -1,245 +0,0 @@
-import com.persesgames.shader.ShaderProgram
-import com.persesgames.shader.VertextAttributeInfo
-import org.khronos.webgl.Float32Array
-import org.khronos.webgl.WebGLBuffer
-import org.khronos.webgl.WebGLRenderingContext
-import kotlin.browser.window
-
-/**
- * User: rnentjes
- * Date: 21-5-16
- * Time: 17:06
- */
-
-private val vertexShader = """
- attribute vec2 a_position;
-
- uniform vec4 u_viewWindow;
-
- varying vec2 v_coord;
-
- void main(void) {
- v_coord = a_position + u_viewWindow.xy;
-
- gl_Position = vec4(a_position, 0.0, 1.0);
- }
-"""
-
-private val fragmentShader = """
- precision mediump float;
-
- varying vec2 v_coord;
-
- void main(void) {
- float xx = 0.0;
- float yy = 0.0;
- float xt = 0.0;
-
- gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0);
-
- for (int iteration = 0; iteration < 1000; iteration++) {
- if (xx*xx + yy*yy > 4.0) {
- float it = mod(float(iteration) * 13.0, 768.0);
- float red = min(it, 255.0) / 255.0;
- float green = max(0.0, min(it, 511.0) - 256.0);
- float blue = max(0.0, min(it, 767.0) - 512.0);
- gl_FragColor = vec4( red, green, blue, 1.0);
- break;
- }
- xt = xx*xx - yy*yy + v_coord.x;
- yy = 2.0*xx*yy + v_coord.y;
- xx = xt;
- }
- }
-"""
-
-class ShaderData {
- var offsetX: Float = 0f
- var offsetY: Float = 0f
-}
-
-class MandelBrot(val html: HTMLElements) {
- val webgl = html.webgl
- val shaderProgram: ShaderProgram
- val data: ShaderData = ShaderData()
- val attribBuffer: WebGLBuffer
- val vertices: Float32Array
- val start = Date().getTime()
-
- init {
- val array: Array = arrayOf(
- -1f,-1f,
- 1f,-1f,
- 1f, 1f,
- 1f, 1f,
- -1f, 1f,
- -1f,-1f
- )
-
- vertices = Float32Array(array.size)
- vertices.set(array, 0)
-
- val setter = { program: ShaderProgram, data: ShaderData ->
- program.setUniform4f("u_viewWindow", data.offsetX, data.offsetY, 0f, 0f)
- }
-
- val vainfo = arrayOf(
- VertextAttributeInfo("a_position", 2)
- )
-
- shaderProgram = ShaderProgram(webgl, WebGLRenderingContext.TRIANGLES, vertexShader, fragmentShader, vainfo, setter)
-
-
- attribBuffer = webgl.createBuffer() ?: throw IllegalStateException("Unable to create webgl buffer!")
- webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, attribBuffer);
- }
-
- fun getColor(mu: Double) {
- var clr1 = mu.toInt()
- var t2 = mu - clr1
- var t1 = 1 - t2
- clr1 = clr1 % 768
-
-// int clr1 = (int)mu;
-// double t2 = mu - clr1;
-// double t1 = 1 - t2;
-// clr1 = clr1 % Colors.Count;
-// int clr2 = (clr1 + 1) % Colors.Count;
-//
-// byte r = (byte)(Colors[clr1].R * t1 + Colors[clr2].R * t2);
-// byte g = (byte)(Colors[clr1].G * t1 + Colors[clr2].G * t2);
-// byte b = (byte)(Colors[clr1].B * t1 + Colors[clr2].B * t2);
-//
-// return Color.FromArgb(255, r, g, b);
- }
-
-/* fun drawMandel() {
- *//*
- For each pixel (Px, Py) on the screen, do:
- {
- x0 = scaled x coordinate of pixel (scaled to lie in the Mandelbrot X scale (-2.5, 1))
- y0 = scaled y coordinate of pixel (scaled to lie in the Mandelbrot Y scale (-1, 1))
- x = 0.0
- y = 0.0
- iteration = 0
- max_iteration = 1000
- while (x*x + y*y < 2*2 AND iteration < max_iteration) {
- xtemp = x*x - y*y + x0
- y = 2*x*y + y0
- x = xtemp
- iteration = iteration + 1
- }
- color = palette[iteration]
- plot(Px, Py, color)
- }*//*
-
- var xs: Double
- var ys: Double
- var xx: Double
- var yy: Double
- var xt: Double
- var iteration: Int
- val max_iteration: Int = 767
- val halfWindowHeight = windowHeight / 2
- var red: Int
- var green: Int
- var blue: Int
- var fillStyle: String
- var mu: Double
-
- for (x in 0..windowWidth) {
- for (y in 0..windowHeight) {
- xs = (4.0 / windowWidth.toFloat()) * x - 2.0
- ys = 4.0 - ((4.0 / windowHeight) * y) - 2.0
-
- xx = 0.0
- yy = 0.0
- iteration = 0
- while(xx*xx + yy*yy < 4 && iteration < max_iteration) {
- xt = xx*xx - yy*yy + xs
- yy = 2*xx*yy + ys
- xx = xt
- iteration++
- }
- if (iteration == max_iteration) {
- fillStyle = "rgb(0, 0, 0)"
- } else {
- //mu = iteration + 1 - Math.log(Math.log(xx*xx + yy*yy)) / Math.log(2.0);
- iteration = (iteration * 13) % 768
- red = Math.min(iteration, 255)
- green = Math.max(0, Math.min(iteration, 511) - 256)
- blue = Math.max(0, Math.min(iteration, 767) - 512)
- fillStyle = "rgb($red, $green, $blue)"
- }
-
- //canvas2d.fillStyle = fillStyle
- //canvas2d.fillRect(x.toDouble(), y.toDouble(), 1.0, 1.0)
- }
- }
-
- }*/
-
-/* fun drawJulia(xc: Double, yc: Double) {
- var xx: Double
- var yy: Double
- var xt: Double
- var iteration: Int
- val max_iteration: Int = 511
- var red: Int
- var green: Int
- var blue: Int
- var fillStyle: String
-
- for (x in 0..windowWidth) {
- for (y in 0..windowHeight) {
- xx = (4.0 / windowWidth.toFloat()) * x - 2.0
- yy = 4.0 - ((4.0 / windowHeight) * y) - 2.0
-
- iteration = 0
- while(xx*xx + yy*yy < 4 && iteration < max_iteration) {
- xt = xx*xx - yy*yy + xc
- yy = 2*xx*yy + yc
- xx = xt
- iteration++
- }
- if (iteration == max_iteration) {
- fillStyle = "rgb(0, 0, 0)"
- } else {
- //mu = iteration + 1 - Math.log(Math.log(xx*xx + yy*yy)) / Math.log(2.0);
- iteration = (iteration * 31) % 512
- red = Math.min(iteration, 255)
- green = Math.max(0, Math.min(iteration, 511) - 256)
- blue = Math.max(0, Math.min(iteration, 767) - 512)
- fillStyle = "rgb($red, $green, $blue)"
- }
-
- //canvas2d.fillStyle = fillStyle
- //canvas2d.fillRect(x.toDouble(), y.toDouble(), 1.0, 1.0)
- }
- }
-
- }*/
-
- fun render() {
- html.resize()
-
- webgl.clearColor(1f, 1f, 1f, 1f)
- webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
-
- var time = (start - (Date().getTime())) / 1000.0
-
- data.offsetX = Math.sin(time).toFloat()
- data.offsetY = Math.cos(time).toFloat()
-
- shaderProgram.begin(attribBuffer, data)
-
- webgl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, vertices, WebGLRenderingContext.DYNAMIC_DRAW);
- webgl.drawArrays(shaderProgram.drawType, 0, 6)
-
- shaderProgram.end()
-
- window.requestAnimationFrame {
- render()
- }
- }
-}
diff --git a/src/jsMain/kotlin/Julia.kt b/src/jsMain/kotlin/Julia.kt
new file mode 100644
index 0000000..90b0100
--- /dev/null
+++ b/src/jsMain/kotlin/Julia.kt
@@ -0,0 +1,162 @@
+import com.persesgames.shader.ShaderProgram
+import com.persesgames.shader.VertextAttributeInfo
+import kotlinx.browser.window
+import kotlinx.html.InputType
+import org.khronos.webgl.Float32Array
+import org.khronos.webgl.WebGLBuffer
+import org.khronos.webgl.WebGLRenderingContext
+import kotlin.browser.window
+import kotlin.js.Date
+import kotlin.math.cos
+import kotlin.math.sin
+
+/**
+ * User: rnentjes
+ * Date: 21-5-16
+ * Time: 17:06
+ */
+
+private val vertexShader = """
+ attribute vec2 a_position;
+
+ uniform vec4 u_viewWindow;
+
+ varying vec2 v_coord;
+
+ void main(void) {
+ v_coord = a_position * u_viewWindow.zw + u_viewWindow.xy;
+
+ gl_Position = vec4(a_position, 0.0, 1.0);
+ }
+"""
+
+private val fragmentShader = """
+ precision mediump float;
+
+ uniform vec2 u_julia;
+ uniform float u_iteratorOffset;
+
+ varying vec2 v_coord;
+
+ void main(void) {
+ float xx = v_coord.x;
+ float yy = v_coord.y;
+ float xt = 0.0;
+
+ gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0);
+
+ if (xx*xx + yy*yy < 4.0) {
+ for (int iteration = 0; iteration < 1000; iteration++) {
+ if (xx*xx + yy*yy > 4.0) {
+ float mu = u_iteratorOffset + float(iteration) + 1.0 - log(log(xx*xx + yy*yy)) / log(2.0);
+ //mu = sqrt(mu);
+
+ float it = mod(mu * 23.0, 768.0);
+
+ float red = min(it, 255.0) / 255.0;
+ float green = max(0.0, min(it, 511.0) - 256.0) / 255.0;
+ float blue = max(0.0, min(it, 767.0) - 512.0) / 255.0;
+
+ gl_FragColor = vec4( blue, green, red, 1.0);
+ break;
+ }
+ xt = xx*xx - yy*yy + u_julia.x;
+ yy = 2.0*xx*yy + u_julia.y;
+ xx = xt;
+ }
+ }
+ }
+"""
+
+class JuliaData {
+ var juliaX: Float = 0f
+ var juliaY: Float = 0f
+
+ var offsetX: Float = 0f
+ var offsetY: Float = 0f
+ var scaleX: Float = 1f
+ var scaleY: Float = 1f
+
+ var iteratorOffset: Float = 0f
+}
+
+class Julia(val html: HTMLElements) {
+ val webgl = html.webgl
+ val shaderProgram: ShaderProgram
+ val data: JuliaData = JuliaData()
+ val attribBuffer: WebGLBuffer
+ val vertices: Float32Array
+ val start = Date().getTime()
+
+ init {
+ val array: Array = arrayOf(
+ -1f, -1f,
+ 1f, -1f,
+ 1f, 1f,
+ 1f, 1f,
+ -1f, 1f,
+ -1f, -1f
+ )
+
+ vertices = Float32Array(array.size)
+ vertices.set(array, 0)
+
+ val setter = { program: ShaderProgram, data: JuliaData ->
+ program.setUniform2f("u_julia", data.juliaX, data.juliaY)
+ program.setUniform4f("u_viewWindow", data.offsetX, data.offsetY, data.scaleX, data.scaleY)
+ program.setUniform1f("u_iteratorOffset", data.iteratorOffset)
+ }
+
+ val vainfo = arrayOf(
+ VertextAttributeInfo("a_position", 2)
+ )
+
+ shaderProgram = ShaderProgram(
+ webgl,
+ WebGLRenderingContext.TRIANGLES,
+ vertexShader,
+ fragmentShader,
+ vainfo,
+ setter
+ )
+
+ attribBuffer = webgl.createBuffer() ?: throw IllegalStateException(
+ "Unable to create webgl buffer!"
+ )
+ webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, attribBuffer);
+ }
+
+ fun render() {
+ html.resize()
+
+ webgl.clearColor(1f, 1f, 1f, 1f)
+ webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+
+ val time = ((Date().getTime()) - start) / 500.0
+
+ data.juliaX = 0.28f + (sin(time / 31) / 100f).toFloat()
+ data.juliaY = 0.008f + (cos(time / 23.07) / 100f).toFloat()
+
+ val aspect = html.windowWidth / html.windowHeight.toFloat()
+
+ data.scaleX = (1.3f - sin(time / 10.0).toFloat() * 0.5f) * aspect
+ data.scaleY = 1.3f - sin(time / 10.0).toFloat() * 0.5f
+
+ data.iteratorOffset = 0f //time.toFloat() * 10f
+
+ shaderProgram.begin(attribBuffer, data)
+
+ webgl.bufferData(
+ WebGLRenderingContext.ARRAY_BUFFER,
+ vertices,
+ WebGLRenderingContext.DYNAMIC_DRAW
+ );
+ webgl.drawArrays(shaderProgram.drawType, 0, 6)
+
+ shaderProgram.end()
+
+ window.requestAnimationFrame {
+ render()
+ }
+ }
+}
diff --git a/src/jsMain/kotlin/Main.kt b/src/jsMain/kotlin/Main.kt
new file mode 100644
index 0000000..d59c2c2
--- /dev/null
+++ b/src/jsMain/kotlin/Main.kt
@@ -0,0 +1,70 @@
+import kotlinx.browser.document
+import kotlinx.browser.window
+import org.khronos.webgl.WebGLRenderingContext
+import org.w3c.dom.HTMLCanvasElement
+import org.w3c.dom.HTMLElement
+
+/**
+ * User: rnentjes
+ * Date: 21-5-16
+ * Time: 17:06
+ */
+
+class HTMLElements {
+ val container: HTMLElement = document.createElement("div") as HTMLElement
+ val canvas: HTMLCanvasElement = document.createElement("canvas") as HTMLCanvasElement
+ var webgl: WebGLRenderingContext
+
+ var windowWidth = 0
+ var windowHeight = 0
+
+ init {
+ container.setAttribute("style", "position: relative;")
+ canvas.setAttribute(
+ "style",
+ "position: absolute; left: 0px; top: 0px; z-index: 10; width: 100%; height: 100%;"
+ )
+
+ document.body!!.appendChild(container)
+ container.appendChild(canvas)
+
+ webgl = canvas.getContext("webgl") as WebGLRenderingContext
+ }
+
+ fun resize() {
+ val windowWidth = window.innerWidth.toInt()
+ val windowHeight = window.innerHeight.toInt()
+
+ if (this.windowWidth != windowWidth ||
+ this.windowHeight != windowHeight
+ ) {
+
+ this.windowWidth = windowWidth
+ this.windowHeight = windowHeight
+ canvas.setAttribute("width", "${windowWidth}px")
+ canvas.setAttribute("height", "${windowHeight}px")
+ canvas.setAttribute(
+ "style",
+ "position: absolute; left: 0px; top: 0px; z-index: 5; width: ${windowWidth}px; height: ${windowHeight}px;"
+ )
+ webgl.viewport(0, 0, windowWidth, windowHeight)
+ }
+ }
+
+ fun render() {
+ webgl.clearColor(1f, 1f, 1f, 1f)
+ webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT)
+
+// window.requestAnimationFrame {
+// render()
+// }
+ }
+}
+
+fun main() {
+ val html = HTMLElements()
+
+ val julia = Julia(html)
+
+ julia.render()
+}
\ No newline at end of file
diff --git a/src/ShaderProgram.kt b/src/jsMain/kotlin/ShaderProgram.kt
similarity index 100%
rename from src/ShaderProgram.kt
rename to src/jsMain/kotlin/ShaderProgram.kt
diff --git a/web/index.html b/src/jsMain/resources/index.html
similarity index 70%
rename from web/index.html
rename to src/jsMain/resources/index.html
index 6977fee..89e21c7 100644
--- a/web/index.html
+++ b/src/jsMain/resources/index.html
@@ -17,8 +17,6 @@
-
-
-
+