diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml new file mode 100644 index 0000000..5ab55b9 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml new file mode 100644 index 0000000..5ab55b9 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/kotlin-webgl-test_main.iml b/.idea/modules/kotlin-webgl-test_main.iml index 3dcb90a..61e01d4 100644 --- a/.idea/modules/kotlin-webgl-test_main.iml +++ b/.idea/modules/kotlin-webgl-test_main.iml @@ -1,5 +1,82 @@ + + + + + + + + diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml new file mode 100644 index 0000000..5ab55b9 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/kotlin-webgl-test_main.iml b/.idea/modules/kotlin-webgl-test_main.iml index 3dcb90a..61e01d4 100644 --- a/.idea/modules/kotlin-webgl-test_main.iml +++ b/.idea/modules/kotlin-webgl-test_main.iml @@ -1,5 +1,82 @@ + + + + + + + + diff --git a/build.gradle b/build.gradle index eee03c5..77041ff 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ } buildscript { - ext.kotlin_version = '1.0.5-2' + ext.kotlin_version = '1.0.6' repositories { maven { url "http://nexus.astraeus.nl/nexus/content/groups/public" @@ -31,7 +31,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } task jarSources(type:Jar){ @@ -45,10 +44,6 @@ def outDir = "${buildDir}/kotlin2js/main/" compileKotlin2Js { - sourceSets { - main.kotlin.srcDirs += 'src' - } - kotlinOptions.metaInfo = true compileKotlin2Js.kotlinOptions.sourceMap = true diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml new file mode 100644 index 0000000..5ab55b9 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_js_library_1_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/kotlin-webgl-test_main.iml b/.idea/modules/kotlin-webgl-test_main.iml index 3dcb90a..61e01d4 100644 --- a/.idea/modules/kotlin-webgl-test_main.iml +++ b/.idea/modules/kotlin-webgl-test_main.iml @@ -1,5 +1,82 @@ + + + + + + + + diff --git a/build.gradle b/build.gradle index eee03c5..77041ff 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ } buildscript { - ext.kotlin_version = '1.0.5-2' + ext.kotlin_version = '1.0.6' repositories { maven { url "http://nexus.astraeus.nl/nexus/content/groups/public" @@ -31,7 +31,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } task jarSources(type:Jar){ @@ -45,10 +44,6 @@ def outDir = "${buildDir}/kotlin2js/main/" compileKotlin2Js { - sourceSets { - main.kotlin.srcDirs += 'src' - } - kotlinOptions.metaInfo = true compileKotlin2Js.kotlinOptions.sourceMap = true diff --git a/lib/kotludens/com/persesgames/shader/ShaderProgramMesh.kt b/lib/kotludens/com/persesgames/shader/ShaderProgramMesh.kt index 99d1dde..f4c4dd5 100644 --- a/lib/kotludens/com/persesgames/shader/ShaderProgramMesh.kt +++ b/lib/kotludens/com/persesgames/shader/ShaderProgramMesh.kt @@ -32,7 +32,7 @@ } fun queue(vararg vertices: Float) { - queue(vertices.toTypedArray()) + queue(vertices as Array) } fun queue(vertices: Array) {