Upgrade to latest kotlin with gradle

Color fixes
This commit is contained in:
2022-07-25 18:02:40 +02:00
parent ed120d66a0
commit d23b7bffe3
19 changed files with 421 additions and 24453 deletions

5
.gitignore vendored
View File

@@ -1,2 +1,7 @@
# Created by .ignore support plugin (hsz.mobi)
web/js/generated
*.iml
*.ipr
*.iws
.gradle
build

17
build.gradle.kts Normal file
View File

@@ -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()
}
}

2
gradle.properties Normal file
View File

@@ -0,0 +1,2 @@
kotlin.code.style=official
kotlin.js.generate.executable.default=false

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@@ -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

234
gradlew vendored Executable file
View File

@@ -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" "$@"

89
gradlew.bat vendored Normal file
View File

@@ -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

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaScript" level="project" />
</component>
</module>

View File

@@ -1,185 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="GradleLocalSettings">
<option name="modificationStamps">
<map>
<entry key="$PROJECT_DIR$/../../DestinationSol" value="5718836739744" />
<entry key="$PROJECT_DIR$/../../simple/Simple-persistence" value="2890201693583" />
<entry key="$PROJECT_DIR$/../../simple/Simple-web" value="2890212261770" />
<entry key="$PROJECT_DIR$/../../simple/SimpleDatabase" value="2890191706466" />
<entry key="$PROJECT_DIR$/../../simple/Very-simple-templates" value="2890190703434" />
<entry key="$PROJECT_DIR$/../../simple/stats/simple-stats-server" value="2909544379158" />
<entry key="$PROJECT_DIR$/../../work/Kos/KosConvertBranchcode" value="2904315467504" />
</map>
</option>
<option name="externalProjectsViewState">
<projects_view />
</option>
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="Bundled (Maven 3)" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/mandelbrot.iml" filepath="$PROJECT_DIR$/mandelbrot.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="index.html" type="JavascriptDebugType" factoryName="JavaScript Debug" nameIsGenerated="true" uri="http://localhost:63342/mandelbrot/web/index.html">
<method />
</configuration>
<configuration default="false" name="Mandelbrot" type="K2JSConfigurationType" factoryName="Kotlin (JavaScript - experimental)">
<K2JSConfigurationSettings>
<option name="browserFamily" value="Chrome" />
<option name="generatedFilePath" value="$PROJECT_DIR$/web/js/generated" />
<option name="pageToOpenFilePath" value="" />
<option name="shouldOpenInBrowserAfterTranslation" value="false" />
</K2JSConfigurationSettings>
<method />
</configuration>
</component>
<component name="PropertiesComponent">
<property name="GoToClass.includeLibraries" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.copyJavadoc" value="false" />
</component>
<component name="RunManager">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<method />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<module />
<method />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
<method />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<method />
</configuration>
<configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
<component name="libraryTable">
<library name="KotlinJavaScript">
<CLASSES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-jslib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-jslib-sources.jar!/" />
</SOURCES>
</library>
</component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

3
settings.gradle.kts Normal file
View File

@@ -0,0 +1,3 @@
rootProject.name = "kotlin-mandelbrot"

View File

@@ -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)

View File

@@ -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)"
}

View File

@@ -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)

View File

@@ -1,5 +1,3 @@
package com.persesgames.shader
import org.khronos.webgl.*
/**

View File

@@ -17,9 +17,7 @@
</style>
</head>
<body>
<script type="application/javascript" src="js/kotlin/kotlin.js"></script>
<script type="application/javascript" src="js/generated/mandelbrot.js"></script>
<script src="kotlin-mandelbrot.js"></script>
<script type="text/javascript">
document.open();
document.write("<img style='border: 0; display: none;' alt='' src='https://stats.astraeus.nl/stats?");

View File

@@ -1,344 +0,0 @@
(function (Kotlin) {
'use strict';
var _ = Kotlin.defineRootPackage(function () {
this.vertexShader_rfnujb$ = '\n attribute vec2 a_position;\n\n uniform vec4 u_viewWindow;\n\n varying vec2 v_coord;\n\n void main(void) {\n v_coord = a_position + u_viewWindow.xy;\n\n gl_Position = vec4(a_position, 0.0, 1.0);\n }\n';
this.fragmentShader_jzx1nv$ = '\n precision mediump float;\n\n varying vec2 v_coord;\n\n void main(void) {\n float xx = 0.0;\n float yy = 0.0;\n float xt = 0.0;\n\n gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0);\n\n for (int iteration = 0; iteration < 1000; iteration++) {\n if (xx*xx + yy*yy > 4.0) {\n float it = mod(float(iteration) * 13.0, 768.0);\n float red = min(it, 255.0) / 255.0;\n float green = max(0.0, min(it, 511.0) - 256.0);\n float blue = max(0.0, min(it, 767.0) - 512.0);\n gl_FragColor = vec4( red, green, blue, 1.0);\n break;\n }\n xt = xx*xx - yy*yy + v_coord.x;\n yy = 2.0*xx*yy + v_coord.y;\n xx = xt;\n }\n }\n';
this.vertexShader_rfnujb$ = '\n attribute vec2 a_position;\n\n uniform vec4 u_viewWindow;\n\n varying vec2 v_coord;\n\n void main(void) {\n v_coord = a_position * u_viewWindow.zw + u_viewWindow.xy;\n\n gl_Position = vec4(a_position, 0.0, 1.0);\n }\n';
this.fragmentShader_jzx1nv$ = '\n precision mediump float;\n\n uniform vec2 u_julia;\n uniform float u_iteratorOffset;\n\n varying vec2 v_coord;\n\n void main(void) {\n float xx = v_coord.x;\n float yy = v_coord.y;\n float xt = 0.0;\n\n gl_FragColor = vec4( 0.0, 0.0, 0.0, 1.0);\n\n if (xx*xx + yy*yy < 4.0) {\n for (int iteration = 0; iteration < 1000; iteration++) {\n if (xx*xx + yy*yy > 4.0) {\n float mu = u_iteratorOffset + float(iteration) + 1.0 - log(log(xx*xx + yy*yy)) / log(2.0);\n //mu = sqrt(mu);\n\n float it = mod(mu * 23.0, 768.0);\n\n float red = min(it, 255.0) / 255.0;\n float green = max(0.0, min(it, 511.0) - 256.0) / 255.0;\n float blue = max(0.0, min(it, 767.0) - 512.0) / 255.0;\n\n gl_FragColor = vec4( blue, green, red, 1.0);\n break;\n }\n xt = xx*xx - yy*yy + u_julia.x;\n yy = 2.0*xx*yy + u_julia.y;\n xx = xt;\n }\n }\n }\n';
}, /** @lends _ */ {
com: Kotlin.definePackage(null, /** @lends _.com */ {
persesgames: Kotlin.definePackage(null, /** @lends _.com.persesgames */ {
shader: Kotlin.definePackage(null, /** @lends _.com.persesgames.shader */ {
VertextAttributeInfo: Kotlin.createClass(null, function (locationName, numElements) {
this.locationName = locationName;
this.numElements = numElements;
this.location = 0;
this.offset = 0;
}),
ShaderProgram: Kotlin.createClass(null, function (webgl, drawType, vertexShaderSource, fragmentShaderSource, vainfo, setter) {
var tmp$0, tmp$1, tmp$2;
this.webgl = webgl;
this.drawType = drawType;
this.vainfo = vainfo;
this.setter = setter;
this.verticesBlockSize = 0;
this.drawLength = 0;
this.vertex = this.compileShader(vertexShaderSource, WebGLRenderingContext.VERTEX_SHADER);
this.fragment = this.compileShader(fragmentShaderSource, WebGLRenderingContext.FRAGMENT_SHADER);
tmp$0 = this.webgl.createProgram();
if (tmp$0 == null)
throw new Kotlin.IllegalStateException('Unable to request shader program from webgl context!');
this.shaderProgram = tmp$0;
this.webgl.attachShader(this.shaderProgram, this.vertex);
this.webgl.attachShader(this.shaderProgram, this.fragment);
this.webgl.linkProgram(this.shaderProgram);
if (Kotlin.equals(this.webgl.getProgramParameter(this.shaderProgram, WebGLRenderingContext.LINK_STATUS), false)) {
throw new Kotlin.IllegalStateException('Unable to compile shader program!');
}
this.webgl.useProgram(this.shaderProgram);
this.verticesBlockSize = 0;
tmp$1 = Kotlin.modules['stdlib'].kotlin.collections.iterator_123wqf$(Kotlin.arrayIterator(this.vainfo));
while (tmp$1.hasNext()) {
var info = tmp$1.next();
info.location = this.webgl.getAttribLocation(this.shaderProgram, info.locationName);
info.offset = this.verticesBlockSize;
this.verticesBlockSize += info.numElements;
}
tmp$2 = this.drawType;
if (tmp$2 === WebGLRenderingContext.TRIANGLES)
this.drawLength = this.verticesBlockSize * 3;
else {
this.drawLength = this.verticesBlockSize;
}
}, /** @lends _.com.persesgames.shader.ShaderProgram.prototype */ {
compileShader: function (source, type) {
var tmp$0;
var result;
tmp$0 = this.webgl.createShader(type);
if (tmp$0 == null)
throw new Kotlin.IllegalStateException('Unable to request shader from webgl context!');
result = tmp$0;
this.webgl.shaderSource(result, source);
this.webgl.compileShader(result);
if (Kotlin.equals(this.webgl.getShaderParameter(result, WebGLRenderingContext.COMPILE_STATUS), false)) {
throw new Kotlin.IllegalStateException('Unable to compile shader!' + '\n' + source + '\n' + '\n' + Kotlin.toString(this.webgl.getShaderInfoLog(result)));
}
return result;
},
begin_t0l48p$: function (attribBuffer, userdata) {
var tmp$0;
this.webgl.useProgram(this.shaderProgram);
this.webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, attribBuffer);
tmp$0 = Kotlin.modules['stdlib'].kotlin.collections.iterator_123wqf$(Kotlin.arrayIterator(this.vainfo));
while (tmp$0.hasNext()) {
var info = tmp$0.next();
this.webgl.enableVertexAttribArray(info.location);
this.webgl.vertexAttribPointer(info.location, info.numElements, WebGLRenderingContext.FLOAT, false, this.verticesBlockSize * 4, info.offset * 4);
}
this.setter(this, userdata);
},
end: function () {
var tmp$0;
tmp$0 = Kotlin.modules['stdlib'].kotlin.collections.iterator_123wqf$(Kotlin.arrayIterator(this.vainfo));
while (tmp$0.hasNext()) {
var info = tmp$0.next();
this.webgl.disableVertexAttribArray(info.location);
}
this.webgl.useProgram(null);
},
getAttribLocation_61zpoe$: function (location) {
return this.webgl.getAttribLocation(this.shaderProgram, location);
},
getUniformLocation_61zpoe$: function (location) {
return this.webgl.getUniformLocation(this.shaderProgram, location);
},
setUniform1f_9sobi5$: function (location, value) {
this.webgl.uniform1f(this.getUniformLocation_61zpoe$(location), value);
},
setUniform2f_9xt0da$: function (location, v1, v2) {
this.webgl.uniform2f(this.getUniformLocation_61zpoe$(location), v1, v2);
},
setUniform4f_kjn4ou$: function (location, v1, v2, v3, v4) {
this.webgl.uniform4f(this.getUniformLocation_61zpoe$(location), v1, v2, v3, v4);
},
setUniform1i_bm4lxs$: function (location, value) {
this.webgl.uniform1i(this.getUniformLocation_61zpoe$(location), value);
},
setUniformMatrix4fv_pphpxd$: function (location, value) {
this.webgl.uniformMatrix4fv(this.getUniformLocation_61zpoe$(location), false, value);
}
})
})
})
}),
ShaderData: Kotlin.createClass(null, function () {
this.offsetX = 0.0;
this.offsetY = 0.0;
}),
MandelBrot: Kotlin.createClass(null, function (html) {
var tmp$0;
this.html = html;
this.webgl = this.html.webgl;
this.data = new _.ShaderData();
this.start = (new Date()).getTime();
var array = [-1.0, -1.0, 1.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0];
this.vertices = new Float32Array(array.length);
this.vertices.set(array, 0);
var setter = _.MandelBrot.MandelBrot$f;
var vainfo = [new _.com.persesgames.shader.VertextAttributeInfo('a_position', 2)];
this.shaderProgram = new _.com.persesgames.shader.ShaderProgram(this.webgl, WebGLRenderingContext.TRIANGLES, _.vertexShader_rfnujb$, _.fragmentShader_jzx1nv$, vainfo, setter);
tmp$0 = this.webgl.createBuffer();
if (tmp$0 == null)
throw new Kotlin.IllegalStateException('Unable to create webgl buffer!');
this.attribBuffer = tmp$0;
this.webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, this.attribBuffer);
}, /** @lends _.MandelBrot.prototype */ {
getColor_14dthe$: function (mu) {
var clr1 = mu | 0;
var t2 = mu - clr1;
var t1 = 1 - t2;
clr1 = clr1 % 768;
},
render: function () {
this.html.resize();
this.webgl.clearColor(1.0, 1.0, 1.0, 1.0);
this.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT);
var time = (this.start - (new Date()).getTime()) / 1000.0;
this.data.offsetX = Math.sin(time);
this.data.offsetY = Math.cos(time);
this.shaderProgram.begin_t0l48p$(this.attribBuffer, this.data);
this.webgl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, this.vertices, WebGLRenderingContext.DYNAMIC_DRAW);
this.webgl.drawArrays(this.shaderProgram.drawType, 0, 6);
this.shaderProgram.end();
window.requestAnimationFrame(_.MandelBrot.render$f(this));
}
}, /** @lends _.MandelBrot */ {
render$f: function (this$MandelBrot) {
return function (it) {
this$MandelBrot.render();
};
},
MandelBrot$f: function (program, data) {
program.setUniform4f_kjn4ou$('u_viewWindow', data.offsetX, data.offsetY, 0.0, 0.0);
}
}),
HTMLElements: Kotlin.createClass(null, function () {
var tmp$0, tmp$1, tmp$2, tmp$3;
this.windowWidth = 0;
this.windowHeight = 0;
this.container = Kotlin.isType(tmp$0 = document.createElement('div'), HTMLElement) ? tmp$0 : Kotlin.throwCCE();
this.canvas = Kotlin.isType(tmp$1 = document.createElement('canvas'), HTMLCanvasElement) ? tmp$1 : Kotlin.throwCCE();
this.container.setAttribute('style', 'position: relative;');
this.canvas.setAttribute('style', 'position: absolute; left: 0px; top: 0px; z-index: 10; width: 2000px; height: 1000px;');
((tmp$2 = document.body) != null ? tmp$2 : Kotlin.throwNPE()).appendChild(this.container);
this.container.appendChild(this.canvas);
this.webgl = Kotlin.isType(tmp$3 = this.canvas.getContext('webgl'), WebGLRenderingContext) ? tmp$3 : Kotlin.throwCCE();
}, /** @lends _.HTMLElements.prototype */ {
resize: function () {
var windowWidth = window.innerWidth | 0;
var windowHeight = window.innerHeight | 0;
if (this.windowWidth !== windowWidth || this.windowHeight !== windowHeight) {
this.windowWidth = windowWidth;
this.windowHeight = windowHeight;
this.canvas.setAttribute('width', windowWidth.toString() + 'px');
this.canvas.setAttribute('height', windowHeight.toString() + 'px');
this.canvas.setAttribute('style', 'position: absolute; left: 0px; top: 0px; z-index: 5; width: ' + windowWidth + 'px; height: ' + windowHeight + 'px;');
this.webgl.viewport(0, 0, windowWidth, windowHeight);
}
},
getColor_14dthe$: function (mu) {
var clr1 = mu | 0;
var t2 = mu - clr1;
var t1 = 1 - t2;
clr1 = clr1 % 768;
},
drawMandel: function () {
var tmp$0, tmp$1;
var xs;
var ys;
var xx;
var yy;
var xt;
var iteration;
var max_iteration = 767;
var halfWindowHeight = this.windowHeight / 2 | 0;
var red;
var green;
var blue;
var fillStyle;
var mu;
tmp$0 = this.windowWidth;
for (var x = 0; x <= tmp$0; x++) {
tmp$1 = this.windowHeight;
for (var y = 0; y <= tmp$1; y++) {
xs = 4.0 / this.windowWidth * x - 2.0;
ys = 4.0 - 4.0 / this.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 {
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 + ')';
}
}
}
},
drawJulia_lu1900$: function (xc, yc) {
var tmp$0, tmp$1;
var xx;
var yy;
var xt;
var iteration;
var max_iteration = 511;
var red;
var green;
var blue;
var fillStyle;
tmp$0 = this.windowWidth;
for (var x = 0; x <= tmp$0; x++) {
tmp$1 = this.windowHeight;
for (var y = 0; y <= tmp$1; y++) {
xx = 4.0 / this.windowWidth * x - 2.0;
yy = 4.0 - 4.0 / this.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 {
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 + ')';
}
}
}
},
render: function () {
this.webgl.clearColor(1.0, 1.0, 1.0, 1.0);
this.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT);
}
}),
main_kand9s$: function (args) {
var html = new _.HTMLElements();
var mandelBrot = new _.MandelBrot(html);
var julia = new _.Julia(html);
julia.render();
},
JuliaData: Kotlin.createClass(null, function () {
this.juliaX = 0.0;
this.juliaY = 0.0;
this.offsetX = 0.0;
this.offsetY = 0.0;
this.scaleX = 1.0;
this.scaleY = 1.0;
this.iteratorOffset = 0.0;
}),
Julia: Kotlin.createClass(null, function (html) {
var tmp$0;
this.html = html;
this.webgl = this.html.webgl;
this.data = new _.JuliaData();
this.start = (new Date()).getTime();
var array = [-1.0, -1.0, 1.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0];
this.vertices = new Float32Array(array.length);
this.vertices.set(array, 0);
var setter = _.Julia.Julia$f;
var vainfo = [new _.com.persesgames.shader.VertextAttributeInfo('a_position', 2)];
this.shaderProgram = new _.com.persesgames.shader.ShaderProgram(this.webgl, WebGLRenderingContext.TRIANGLES, _.vertexShader_rfnujb$, _.fragmentShader_jzx1nv$, vainfo, setter);
tmp$0 = this.webgl.createBuffer();
if (tmp$0 == null)
throw new Kotlin.IllegalStateException('Unable to create webgl buffer!');
this.attribBuffer = tmp$0;
this.webgl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, this.attribBuffer);
}, /** @lends _.Julia.prototype */ {
render: function () {
this.html.resize();
this.webgl.clearColor(1.0, 1.0, 1.0, 1.0);
this.webgl.clear(WebGLRenderingContext.COLOR_BUFFER_BIT);
var time = (this.start - (new Date()).getTime()) / 500.0;
this.data.juliaX = 0.2800000011920929 + Math.sin(time / 31) / 100.0;
this.data.juliaY = 0.00800000037997961 + Math.cos(time / 23.07) / 100.0;
this.data.scaleX = 1.2999999523162842 - Math.sin(time / 10.0) * 0.5;
this.data.scaleY = 1.2999999523162842 - Math.sin(time / 10.0) * 0.5;
this.data.iteratorOffset = 0.0;
this.shaderProgram.begin_t0l48p$(this.attribBuffer, this.data);
this.webgl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, this.vertices, WebGLRenderingContext.DYNAMIC_DRAW);
this.webgl.drawArrays(this.shaderProgram.drawType, 0, 6);
this.shaderProgram.end();
window.requestAnimationFrame(_.Julia.render$f(this));
}
}, /** @lends _.Julia */ {
render$f: function (this$Julia) {
return function (it) {
this$Julia.render();
};
},
Julia$f: function (program, data) {
program.setUniform2f_9xt0da$('u_julia', data.juliaX, data.juliaY);
program.setUniform4f_kjn4ou$('u_viewWindow', data.offsetX, data.offsetY, data.scaleX, data.scaleY);
program.setUniform1f_9sobi5$('u_iteratorOffset', data.iteratorOffset);
}
})
});
Kotlin.defineModule('mandelbrot', _);
_.main_kand9s$([]);
}(Kotlin));

View File

@@ -1 +0,0 @@
// Kotlin.kotlin_module_metadata(3, "mandelbrot", "H4sIAAAAAAAAAOPS4xKJd0lNSyzNKQlITM5OTE/Vy84qzhUSkxIRYJBiMmA04hFgluIQYhFiMmA2YOLK41JOgSjXLYCpzy/JycyLLy4pysxLjy9JTMpJFXLX5GLJTczM42KDyHKxhOZllnCxJBalF3OxOhYVJVZysQWDdchwMQkwcrFxMAgwSTCAaRYozSrBAAB2qhMjoAAAAA==");

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long