diff --git a/.gitignore b/.gitignore index 8aac928..69c7d72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ # Created by .ignore support plugin (hsz.mobi) web/js/generated +*.iml +*.ipr +*.iws +.gradle +build diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f992d56 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + kotlin("js") version "1.7.10" +} + +group = "nl.astraeus" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +kotlin { + js(IR) { + binaries.executable() + browser() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8af57df --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +kotlin.code.style=official +kotlin.js.generate.executable.default=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/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. +# + +############################################################################## +# +# 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/master/subprojects/plugins/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 + +@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=. +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%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +: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..9af3710 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ + +rootProject.name = "kotlin-mandelbrot" + diff --git a/src/Julia.kt b/src/main/kotlin/Julia.kt similarity index 57% rename from src/Julia.kt rename to src/main/kotlin/Julia.kt index c1ee4de..9e99a4a 100644 --- a/src/Julia.kt +++ b/src/main/kotlin/Julia.kt @@ -1,9 +1,10 @@ -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 +import kotlinx.browser.window +import kotlin.js.Date +import kotlin.math.cos +import kotlin.math.sin /** * User: rnentjes @@ -15,11 +16,12 @@ private val vertexShader = """ attribute vec2 a_position; uniform vec4 u_viewWindow; + uniform float u_aspect; varying vec2 v_coord; void main(void) { - v_coord = a_position * u_viewWindow.zw + u_viewWindow.xy; + v_coord = vec2(a_position.x / u_aspect, a_position.y * u_aspect) * u_viewWindow.zw + u_viewWindow.xy; gl_Position = vec4(a_position, 0.0, 1.0); } @@ -29,30 +31,45 @@ private val fragmentShader = """ precision mediump float; uniform vec2 u_julia; + uniform int u_max_iterations; uniform float u_iteratorOffset; varying vec2 v_coord; + vec3 hsv2rgb(vec3 c) { + vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0); + vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www); + return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y); + } + void main(void) { float xx = v_coord.x; float yy = v_coord.y; float xt = 0.0; + float sc = xx*xx + yy*yy; gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0); - if (xx*xx + yy*yy < 4.0) { + if (sc < 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); + sc = xx*xx + yy*yy; + if (sc > 4.0) { + float mu = float(iteration) + 1.0 - log(log(sc)) / log(2.0); //mu = sqrt(mu); - float it = mod(mu * 23.0, 768.0); + float ci = sc / float(u_max_iterations); + + vec3 hsl = vec3(mod(u_iteratorOffset + mu * 13.0, float(u_max_iterations)) / float(u_max_iterations), 1.0, 0.75); + vec3 rgb = hsv2rgb(hsl); + + //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; + //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); + //gl_FragColor = vec4( blue, green, red, 1.0); + gl_FragColor = vec4( rgb, 1.0); break; } xt = xx*xx - yy*yy + u_julia.x; @@ -72,6 +89,9 @@ class JuliaData { var scaleX: Float = 1f var scaleY: Float = 1f + var aspect: Float = 1f + + var max_iterations: Int = 25 var iteratorOffset: Float = 0f } @@ -100,15 +120,16 @@ class Julia(val html: HTMLElements) { 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) + program.setUniform1f("u_aspect", data.aspect) + program.setUniform1i("u_max_iterations", data.max_iterations) } val vainfo = arrayOf( - VertextAttributeInfo("a_position", 2) + 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); } @@ -116,10 +137,10 @@ class Julia(val html: HTMLElements) { fun render() { html.resize() - webgl.clearColor(1f, 1f, 1f, 1f) - webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT) + //webgl.clearColor(1f, 1f, 1f, 1f) + //webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT) - var time = (start - (Date().getTime())) / 500.0 + val 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() @@ -127,13 +148,19 @@ class Julia(val html: HTMLElements) { // 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.juliaX = 0f + (sin(time * 1 / 11) / 1f).toFloat() + data.juliaY = 0f + (cos(time * 1 / 13) / 1f).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.scaleX = 1.3f - sin(time / 10.0).toFloat() * 0.5f + //data.scaleY = 1.3f - sin(time / 10.0).toFloat() * 0.5f - data.iteratorOffset = 0f //time.toFloat() * 10f + data.scaleX = 1f + data.scaleY = 1f / (html.windowWidth.toFloat() / html.windowHeight.toFloat()) + + data.iteratorOffset = time.toFloat() * 10f + + data.aspect = 1f //html.windowHeight.toFloat() / html.windowWidth.toFloat() * 2f + data.max_iterations = 360 shaderProgram.begin(attribBuffer, data) diff --git a/src/Main.kt b/src/main/kotlin/Main.kt similarity index 92% rename from src/Main.kt rename to src/main/kotlin/Main.kt index 2b2907d..5d945ef 100644 --- a/src/Main.kt +++ b/src/main/kotlin/Main.kt @@ -1,8 +1,10 @@ import org.khronos.webgl.WebGLRenderingContext import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.HTMLElement -import kotlin.browser.document -import kotlin.browser.window +import kotlinx.browser.document +import kotlinx.browser.window +import kotlin.math.max +import kotlin.math.min /** * User: rnentjes @@ -120,9 +122,9 @@ class HTMLElements { } 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) + red = min(iteration, 255) + green = max(0, min(iteration, 511) - 256) + blue = max(0, min(iteration, 767) - 512) fillStyle = "rgb($red, $green, $blue)" } @@ -161,9 +163,9 @@ class HTMLElements { } 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) + red = min(iteration, 255) + green = max(0, min(iteration, 511) - 256) + blue = max(0, min(iteration, 767) - 512) fillStyle = "rgb($red, $green, $blue)" } diff --git a/src/MandelBrot.kt b/src/main/kotlin/MandelBrot.kt similarity index 97% rename from src/MandelBrot.kt rename to src/main/kotlin/MandelBrot.kt index 7199cf3..c836c74 100644 --- a/src/MandelBrot.kt +++ b/src/main/kotlin/MandelBrot.kt @@ -1,9 +1,10 @@ -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 +import kotlinx.browser.window +import kotlin.js.Date +import kotlin.math.cos +import kotlin.math.sin /** * User: rnentjes @@ -228,8 +229,8 @@ class MandelBrot(val html: HTMLElements) { var time = (start - (Date().getTime())) / 1000.0 - data.offsetX = Math.sin(time).toFloat() - data.offsetY = Math.cos(time).toFloat() + data.offsetX = sin(time).toFloat() + data.offsetY = cos(time).toFloat() shaderProgram.begin(attribBuffer, data) diff --git a/src/ShaderProgram.kt b/src/main/kotlin/ShaderProgram.kt similarity index 99% rename from src/ShaderProgram.kt rename to src/main/kotlin/ShaderProgram.kt index dcdb8c8..1db78f2 100644 --- a/src/ShaderProgram.kt +++ b/src/main/kotlin/ShaderProgram.kt @@ -1,5 +1,3 @@ -package com.persesgames.shader - import org.khronos.webgl.* /** diff --git a/web/index.html b/src/main/resources/index.html similarity index 81% rename from web/index.html rename to src/main/resources/index.html index f2b66c5..3f08116 100644 --- a/web/index.html +++ b/src/main/resources/index.html @@ -17,9 +17,7 @@ - - - +