diff --git a/.vscode/settings.json b/.vscode/settings.json index 595047f..e2a550f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,9 +8,9 @@ "**/Thumbs.db": true, "**/gradle": true, "**/.gradle": true, - // "**/build": true, + "**/build": true, "**/bin": true, - // "platform-*": true + "platform-*": true } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9ff9933..1be94dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.configuration-cache=false org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -teaVmVersion=0.12.3 +teaVmVersion=0.13.0-nge # NGE versions -ngePlatformVersion=0.2.1 -ngeVersion=0.2-rc3 \ No newline at end of file +ngePlatformVersion=0.2.2 +ngeVersion=0.2-rc4 \ No newline at end of file diff --git a/gradle/libs/class-finder.gradle b/gradle/libs/class-finder.gradle index dfd4f7a..f3fe6b4 100644 --- a/gradle/libs/class-finder.gradle +++ b/gradle/libs/class-finder.gradle @@ -62,7 +62,8 @@ project.ext { 'org\\.threeten\\..*', 'org\\.apache\\..*', 'com\\.simsilica\\.lemur\\.ColorChooser.*', - 'org\\.slf4j\\..*' + 'org\\.slf4j\\..*', + 'com\\.jme3\\.scene\\.plugins\\.ogre\\..*' diff --git a/platform-web/src/main/java/org/ngengine/platform/TeaReflectionSupplier.java b/platform-web/src/main/java/org/ngengine/platform/TeaReflectionSupplier.java index d3f1c0d..50a8d9a 100644 --- a/platform-web/src/main/java/org/ngengine/platform/TeaReflectionSupplier.java +++ b/platform-web/src/main/java/org/ngengine/platform/TeaReflectionSupplier.java @@ -340,13 +340,6 @@ public class TeaReflectionSupplier implements ReflectionSupplier { TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.gltf.GlbLoader"); TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.gltf.GltfLoader"); TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.gltf.GltfModelKey"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.MaterialLoader"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.MeshLoader"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.OgreMeshKey"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.SceneLoader"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.SceneMeshLoader"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.SkeletonLoader"); - TeaReflectionSupplier.addReflectionClass("com.jme3.scene.plugins.ogre.matext.OgreMaterialKey"); TeaReflectionSupplier.addReflectionClass("com.jme3.scene.shape.AbstractBox"); TeaReflectionSupplier.addReflectionClass("com.jme3.scene.shape.Box"); TeaReflectionSupplier.addReflectionClass("com.jme3.scene.shape.CenterQuad"); diff --git a/settings.gradle b/settings.gradle index 15ac6df..815e925 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,6 +6,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven { url = uri("https://teavm.org/maven/repository") } + maven { url = uri("https://maven.ngengine.org/riccardobl/teavm") } mavenLocal() } plugins { @@ -41,6 +42,7 @@ dependencyResolutionManagement { url = uri("https://central.sonatype.com/repository/maven-snapshots") } maven { url = uri("https://teavm.org/maven/repository") } + maven { url = uri("https://maven.ngengine.org/riccardobl/teavm") } ivy { name = "Node.js" setUrl("https://nodejs.org/dist/")