Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: elect86

.travis.yml

@@ -1 +1,2 @@
 language: java
+jdk: openjdk11

README.md

@@ -108,82 +108,27 @@ Dear ImGui allows you create elaborate tools as well as very short-lived ones. O
 
 ### Demo
 
-You should be able to try the examples from `test` (tested on Windows/Mac/Linux) within seconds: clone, sync and run. If you don't, let me know!
+You should be able to try the examples from `test` (tested on Windows/Mac/Linux) within minutes. If you don't, let me know!
 
-Kotlin:
+OpenGL Kotlin:
 
-- [OpenGL3](src/test/kotlin/imgui/opengl3.kt) 
-- [OpenGL2](src/test/kotlin/imgui/opengl2.kt) 
-- [Vulkan](src/test/kotlin/imgui/vulkan.kt) (broken, to fix, but still valuable for the moment)
+- [lwjgl](src/test/kotlin/imgui/gl/test%20lwjgl.kt) 
+- [jogl](src/test/kotlin/imgui/gl/test%20jogl.kt)
 
-- [jogl-GL3](src/test/kotlin/imgui/gl/test%20jogl.kt) (not mantained anymore ufficially but keeping dormant in case something comes up)
+OpenGL Java:
 
-Java:
+- [lwjgl](src/test/java/imgui/gl/Test_lwjgl.java) 
 
-- [OpenGL3](src/test/java/imgui/OpenGL3.java) 
+Vulkan Kotlin:
 
-Note:
-- we tend to avoid nullability, whenever Omar uses `NULL` with the string endings, we passes `-1` instead.
-- `DEBUG = false` (`import static imgui.ImguiKt.setDEBUG;` for Java users)  to turn off `println()` debugs
+- [lwjgl](src/test/kotlin/imgui/vk/test%20lwjgl%20vk.kt) (broken, to fix)
 
-You should refer to those also to learn how to use the imgui library.
-
-The demo applications are unfortunately not yet DPI aware so expect some blurriness on a 4K screen. For DPI awareness you can load/reload your font at different scale, and scale your Style with `style.scaleAllSizes()`.
-
-### Functional Programming / Domain Specific Language
-
-All the functions are ported exactly as the original. Moreover in order to take advantage of Functional Programming 
-this port offers some comfortable constructs, giving the luxury to forget about some annoying and very error prone
-burden code such as the ending `*Pop()`, `*end()` and so on.
 
-These constucts shine especially in Kotlin, where they are also inlined.
- 
-Let's take an original cpp sample and let's see how we can make it nicer:
-```cpp
-    if (ImGui::TreeNode("Querying Status (Active/Focused/Hovered etc.)")) {            
-        ImGui::Checkbox("Hovered/Active tests after Begin() for title bar testing", &test_window);
-        if (test_window) {            
-            ImGui::Begin("Title bar Hovered/Active tests", &test_window);
-            if (ImGui::BeginPopupContextItem()) // <-- This is using IsItemHovered() {                
-                if (ImGui::MenuItem("Close")) { test_window = false; }
-                ImGui::EndPopup();
-            }
-            ImGui::Text("whatever\n");
-            ImGui::End();
-        }
-        ImGui::TreePop();
-    }
-```
-This may become in Kotlin:
-```kotlin
-    treeNode("Querying Status (Active/Focused/Hovered etc.)") {            
-        checkbox("Hovered/Active tests after Begin() for title bar testing", ::test_window)
-        if (test_window)
-            window ("Title bar Hovered/Active tests", ::test_window) {
-                popupContextItem { // <-- This is using IsItemHovered() {                    
-                    menuItem("Close") { test_window = false }
-                }
-                text("whatever\n")
-            }
-    }
-```
-Or in Java:
-```java
-    treeNode("Querying Status (Active/Focused/Hovered etc.)", () -> {            
-        checkbox("Hovered/Active tests after Begin() for title bar testing", test_window)
-        if (test_window[0])
-            window ("Title bar Hovered/Active tests", test_window, () -> {
-                popupContextItem(() -> { // <-- This is using IsItemHovered() {                    
-                    menuItem("Close", () -> test_window = false);
-                });
-                text("whatever\n");
-            });
-    });
-```
+You should refer to those also to learn how to use the imgui library.
 
-The demo mixes some traditional imgui-calls with these DSL calls.
+The demo applications are unfortunately not yet DPI aware so expect some blurriness on a 4K screen. For DPI awareness you can load/reload your font at different scale, and scale your Style with `style.ScaleAllSizes()`.
 
-Refer to the corresponding [`dsl`](src/main/kotlin/imgui/dsl.kt) object for Kotlin or [`dsl_`](src/main/java/imgui/dsl_.java) class for Java.
+Ps: `DEBUG = false` to turn off debugs `println()`
 
 ### Native Roadmap
 
@@ -217,7 +162,21 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.kotlin-graphics:imgui:-SNAPSHOT'
+    /*
+    Each renderer will need different dependencies.
+    Each one needs core.
+    OpenGL needs "gl", "glfw"
+    Vulkan needs "vk", "glfw"
+    JOGL needs "jogl"
+    OpenJFX needs "openjfx"
+    
+    To get all the dependencies in one sweep, create an array of the strings needed and loop through them like below.
+    Any number of renderers can be added to the project like this however, you could all all of them with the array ["gl", "glfw", "core", "vk", "jogl", "openjfx"] 
+    This example gets the OpenGL needed modules.
+     */
+    ["gl", "glfw", "core"].each {
+        implementation "com.github.kotlin-graphics.imgui:imgui-$it:-SNAPSHOT"
+    }
 	
     switch ( OperatingSystem.current() ) {
         case OperatingSystem.WINDOWS:

build.gradle

@@ -19,69 +19,27 @@ ext{
     lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
 }
 
-dependencies {
-
-    implementation "$kotlin-stdlib"
+sourceCompatibility = 1.8
 
-    implementation 'com.github.kotlin-graphics:uno-sdk:ae2f5a51953f78c71f0a6a052037f6e399e80937'
+dependencies {
+    implementation "$kotlin-stdlib-jdk8"
 
     testImplementation "io.kotlintest:kotlintest-runner-junit5:$kotlintest_version".toString()
 
-    def joglVersion = '2.3.2'
-    implementation "org.jogamp.gluegen:gluegen-rt-main:$joglVersion"
-    implementation "org.jogamp.jogl:jogl-all-main:$joglVersion"
-
-    ["", "-glfw", "-jemalloc", "-opengl", "-stb", "-remotery", "-bgfx"].each {
-        String base = "org.lwjgl:lwjgl$it:$lwjgl_version"
-        implementation base
-        testRuntime "$base:natives-$lwjgl_natives"
-        shadow "$base:natives-$lwjgl_natives"
-    }
-
     compile files("${System.properties['java.home']}/../lib/tools.jar") // for debug, classes instances
 }
 
-repositories {
-    mavenCentral()
-    maven { setUrl("https://oss.sonatype.org/content/repositories/snapshots/") }
-    maven { url 'https://jitpack.io' }
-}
-
-task lightJar(type: Jar) {
-    classifier = 'light'
-    from sourceSets.main.output
-    exclude 'extraFonts'
-    inputs.property("moduleName", moduleName)
-    manifest {
-        attributes('Automatic-Module-Name': moduleName)
+allprojects {
+    repositories {
+        mavenCentral()
+        maven { setUrl("https://oss.sonatype.org/content/repositories/snapshots/") }
+        maven { url 'https://jitpack.io' }
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
 }
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives lightJar
-    archives sourcesJar
-    archives javadocJar
-}
-
-shadowJar {
-    exclude 'module-info.class'
-    inputs.property("moduleName", moduleName)
-    manifest.attributes('Automatic-Module-Name': moduleName)
-}
-
-jar {
-    inputs.property("moduleName", moduleName)
-    manifest.attributes('Automatic-Module-Name': moduleName)
-}
-
-shadowJar.archiveClassifier = 'all'
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri Oct 27 11:31:55 CEST 2017
+#Tue Apr 16 10:43:51 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,32 @@
+plugins {
+    id 'maven'
+    id 'java'
+    id "org.jetbrains.kotlin.jvm"
+    id "com.github.johnrengelman.shadow"
+}
+
+group 'com.github.kotlin-graphics'
+
+sourceCompatibility = 1.8
+
+ext.moduleName = 'com.github.kotlin_graphics.imgui_core'
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    implementation 'com.github.kotlin-graphics:uno-sdk:ae2f5a51953f78c71f0a6a052037f6e399e80937'
+
+    ["", "-jemalloc", "-stb"].each {
+        String base = "org.lwjgl:lwjgl$it:$lwjgl_version"
+        implementation base
+        testRuntime "$base:natives-$lwjgl_natives"
+        shadow "$base:natives-$lwjgl_natives"
+    }
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}