rnentjes/kotlin-mandelbrot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
rnentjes
2016-06-15 10:24:10 +02:00
parent 2ae3a9ad8f
commit ed120d66a0
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ShaderProgram.kt
View File

@@ -38,7 +38,7 @@ class ShaderProgram<T>(
webgl.linkProgram(shaderProgram) webgl.linkProgram(shaderProgram)
if (webgl.getProgramParameter(shaderProgram, WebGLRenderingContext.LINK_STATUS) == false) { if (webgl.getProgramParameter(shaderProgram, WebGLRenderingContext.LINK_STATUS) == false) {
println(webgl.getProgramInfoLog(shaderProgram)) //println(webgl.getProgramInfoLog(shaderProgram))
throw IllegalStateException("Unable to compile shader program!") throw IllegalStateException("Unable to compile shader program!")
} }
@@ -52,7 +52,7 @@ class ShaderProgram<T>(
info.offset = verticesBlockSize; info.offset = verticesBlockSize;
verticesBlockSize += info.numElements; verticesBlockSize += info.numElements;
println("attrib: ${info.locationName}, info.location: ${info.location}, info.offset: ${info.offset}"); //println("attrib: ${info.locationName}, info.location: ${info.location}, info.offset: ${info.offset}");
} }
when(drawType) { when(drawType) {
@@ -64,9 +64,9 @@ class ShaderProgram<T>(
} }
} }
println("verticesBlockSize $verticesBlockSize"); //println("verticesBlockSize $verticesBlockSize");
println("ShaderProgram constructor done"); //println("ShaderProgram constructor done");
} }
private fun compileShader(source: String, type: Int): WebGLShader { private fun compileShader(source: String, type: Int): WebGLShader {

8
web/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Mandelbrot</title> <title>Julia</title>
<style type="text/css"> <style type="text/css">
body, html { body, html {
width: 100%; width: 100%;
@@ -20,5 +20,11 @@
<script type="application/javascript" src="js/kotlin/kotlin.js"></script> <script type="application/javascript" src="js/kotlin/kotlin.js"></script>
<script type="application/javascript" src="js/generated/mandelbrot.js"></script> <script type="application/javascript" src="js/generated/mandelbrot.js"></script>
<script type="text/javascript">
document.open();
document.write("<img style='border: 0; display: none;' alt='' src='https://stats.astraeus.nl/stats?");
document.write("id=3&referrer="+document.referrer+"&url="+window.location.href+"'&agent="+navigator.userAgent+"' />");
document.close();
</script>
</body> </body>
</html> </html>

4
web/js/generated/mandelbrot.js
View File

@@ -33,7 +33,6 @@
this.webgl.attachShader(this.shaderProgram, this.fragment); this.webgl.attachShader(this.shaderProgram, this.fragment);
this.webgl.linkProgram(this.shaderProgram); this.webgl.linkProgram(this.shaderProgram);
if (Kotlin.equals(this.webgl.getProgramParameter(this.shaderProgram, WebGLRenderingContext.LINK_STATUS), false)) { if (Kotlin.equals(this.webgl.getProgramParameter(this.shaderProgram, WebGLRenderingContext.LINK_STATUS), false)) {
Kotlin.println(this.webgl.getProgramInfoLog(this.shaderProgram));
throw new Kotlin.IllegalStateException('Unable to compile shader program!'); throw new Kotlin.IllegalStateException('Unable to compile shader program!');
} }
this.webgl.useProgram(this.shaderProgram); this.webgl.useProgram(this.shaderProgram);
@@ -44,7 +43,6 @@
info.location = this.webgl.getAttribLocation(this.shaderProgram, info.locationName); info.location = this.webgl.getAttribLocation(this.shaderProgram, info.locationName);
info.offset = this.verticesBlockSize; info.offset = this.verticesBlockSize;
this.verticesBlockSize += info.numElements; this.verticesBlockSize += info.numElements;
Kotlin.println('attrib: ' + info.locationName + ', info.location: ' + info.location + ', info.offset: ' + info.offset);
} }
tmp$2 = this.drawType; tmp$2 = this.drawType;
if (tmp$2 === WebGLRenderingContext.TRIANGLES) if (tmp$2 === WebGLRenderingContext.TRIANGLES)
@@ -52,8 +50,6 @@
else { else {
this.drawLength = this.verticesBlockSize; this.drawLength = this.verticesBlockSize;
} }
Kotlin.println('verticesBlockSize ' + this.verticesBlockSize);
Kotlin.println('ShaderProgram constructor done');
}, /** @lends _.com.persesgames.shader.ShaderProgram.prototype */ { }, /** @lends _.com.persesgames.shader.ShaderProgram.prototype */ {
compileShader: function (source, type) { compileShader: function (source, type) {
var tmp$0; var tmp$0;