diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_main.iml b/.idea/modules/kudens_main.iml index 2f6088e..49b3374 100644 --- a/.idea/modules/kudens_main.iml +++ b/.idea/modules/kudens_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_main.iml b/.idea/modules/kudens_main.iml index 2f6088e..49b3374 100644 --- a/.idea/modules/kudens_main.iml +++ b/.idea/modules/kudens_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_test.iml b/.idea/modules/kudens_test.iml index d6982e7..442a102 100644 --- a/.idea/modules/kudens_test.iml +++ b/.idea/modules/kudens_test.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_main.iml b/.idea/modules/kudens_main.iml index 2f6088e..49b3374 100644 --- a/.idea/modules/kudens_main.iml +++ b/.idea/modules/kudens_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_test.iml b/.idea/modules/kudens_test.iml index d6982e7..442a102 100644 --- a/.idea/modules/kudens_test.iml +++ b/.idea/modules/kudens_test.iml @@ -1,5 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index ad81d7f..02f1b92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'perses.games' -version '1.1.4-SNAPSHOT' +version '1.1.4' apply plugin: 'kotlin2js' apply plugin: 'idea' diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_main.iml b/.idea/modules/kudens_main.iml index 2f6088e..49b3374 100644 --- a/.idea/modules/kudens_main.iml +++ b/.idea/modules/kudens_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_test.iml b/.idea/modules/kudens_test.iml index d6982e7..442a102 100644 --- a/.idea/modules/kudens_test.iml +++ b/.idea/modules/kudens_test.iml @@ -1,5 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index ad81d7f..02f1b92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'perses.games' -version '1.1.4-SNAPSHOT' +version '1.1.4' apply plugin: 'kotlin2js' apply plugin: 'idea' diff --git a/src/main/kotlin/games/perses/game/Game.kt b/src/main/kotlin/games/perses/game/Game.kt index 3d80012..8376338 100644 --- a/src/main/kotlin/games/perses/game/Game.kt +++ b/src/main/kotlin/games/perses/game/Game.kt @@ -158,9 +158,9 @@ fun setScreen(screen: Screen) { currentScreen.unloadResources() - currentScreen = screen + screen.loadResources() - currentScreen.loadResources() + currentScreen = screen } fun setClearColor(r: Float, g: Float, b: Float, a: Float) { diff --git a/.idea/modules/kudens.iml b/.idea/modules/kudens.iml index a44bc58..da33134 100644 --- a/.idea/modules/kudens.iml +++ b/.idea/modules/kudens.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_main.iml b/.idea/modules/kudens_main.iml index 2f6088e..49b3374 100644 --- a/.idea/modules/kudens_main.iml +++ b/.idea/modules/kudens_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/kudens_test.iml b/.idea/modules/kudens_test.iml index d6982e7..442a102 100644 --- a/.idea/modules/kudens_test.iml +++ b/.idea/modules/kudens_test.iml @@ -1,5 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index ad81d7f..02f1b92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'perses.games' -version '1.1.4-SNAPSHOT' +version '1.1.4' apply plugin: 'kotlin2js' apply plugin: 'idea' diff --git a/src/main/kotlin/games/perses/game/Game.kt b/src/main/kotlin/games/perses/game/Game.kt index 3d80012..8376338 100644 --- a/src/main/kotlin/games/perses/game/Game.kt +++ b/src/main/kotlin/games/perses/game/Game.kt @@ -158,9 +158,9 @@ fun setScreen(screen: Screen) { currentScreen.unloadResources() - currentScreen = screen + screen.loadResources() - currentScreen.loadResources() + currentScreen = screen } fun setClearColor(r: Float, g: Float, b: Float, a: Float) { diff --git a/src/main/kotlin/games/perses/texture/Textures.kt b/src/main/kotlin/games/perses/texture/Textures.kt index f140f48..e27680a 100644 --- a/src/main/kotlin/games/perses/texture/Textures.kt +++ b/src/main/kotlin/games/perses/texture/Textures.kt @@ -322,6 +322,10 @@ for (texture in textures.values) { gl.deleteTexture(texture.glTexture) } + + startedLoading = 0 + loaded = 0 + textures.clear() } }