summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/skyboxes/menu/negx.pngbin0 -> 866346 bytes
-rw-r--r--assets/skyboxes/menu/negy.pngbin0 -> 796439 bytes
-rw-r--r--assets/skyboxes/menu/negz.pngbin0 -> 788798 bytes
-rw-r--r--assets/skyboxes/menu/posx.pngbin0 -> 858610 bytes
-rw-r--r--assets/skyboxes/menu/posy.pngbin0 -> 772167 bytes
-rw-r--r--assets/skyboxes/menu/posz.pngbin0 -> 875179 bytes
-rw-r--r--core/src/kz/ilotterytea/maxon/screens/MenuScreen.java19
7 files changed, 12 insertions, 7 deletions
diff --git a/assets/skyboxes/menu/negx.png b/assets/skyboxes/menu/negx.png
new file mode 100644
index 0000000..d08a2a5
--- /dev/null
+++ b/assets/skyboxes/menu/negx.png
Binary files differ
diff --git a/assets/skyboxes/menu/negy.png b/assets/skyboxes/menu/negy.png
new file mode 100644
index 0000000..0c8578c
--- /dev/null
+++ b/assets/skyboxes/menu/negy.png
Binary files differ
diff --git a/assets/skyboxes/menu/negz.png b/assets/skyboxes/menu/negz.png
new file mode 100644
index 0000000..60553ea
--- /dev/null
+++ b/assets/skyboxes/menu/negz.png
Binary files differ
diff --git a/assets/skyboxes/menu/posx.png b/assets/skyboxes/menu/posx.png
new file mode 100644
index 0000000..8af1ade
--- /dev/null
+++ b/assets/skyboxes/menu/posx.png
Binary files differ
diff --git a/assets/skyboxes/menu/posy.png b/assets/skyboxes/menu/posy.png
new file mode 100644
index 0000000..938de0b
--- /dev/null
+++ b/assets/skyboxes/menu/posy.png
Binary files differ
diff --git a/assets/skyboxes/menu/posz.png b/assets/skyboxes/menu/posz.png
new file mode 100644
index 0000000..ce3d717
--- /dev/null
+++ b/assets/skyboxes/menu/posz.png
Binary files differ
diff --git a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
index 1154b25..365dd5b 100644
--- a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
@@ -1,6 +1,7 @@
package kz.ilotterytea.maxon.screens;
import com.badlogic.gdx.*;
+import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.files.FileHandle;
@@ -30,9 +31,9 @@ import net.mgsx.gltf.scene3d.attributes.PBRCubemapAttribute;
import net.mgsx.gltf.scene3d.attributes.PBRTextureAttribute;
import net.mgsx.gltf.scene3d.lights.DirectionalShadowLight;
import net.mgsx.gltf.scene3d.lights.PointLightEx;
-import net.mgsx.gltf.scene3d.scene.Scene;
-import net.mgsx.gltf.scene3d.scene.SceneAsset;
import net.mgsx.gltf.scene3d.scene.SceneManager;
+import net.mgsx.gltf.scene3d.scene.SceneSkybox;
+import net.mgsx.gltf.scene3d.utils.EnvironmentUtil;
import net.mgsx.gltf.scene3d.utils.IBLBuilder;
import java.util.ArrayList;
@@ -404,11 +405,7 @@ public class MenuScreen implements Screen {
}
private void create3D() {
- SceneAsset sceneAsset = game.assetManager.get("models/scenes/living_room.glb", SceneAsset.class);
- Scene scene = new Scene(sceneAsset.scene);
-
sceneManager = new SceneManager();
- sceneManager.addScene(scene);
camera = new PerspectiveCamera(60f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
camera.near = 1f;
@@ -438,7 +435,6 @@ public class MenuScreen implements Screen {
// setup quick IBL (image based lighting)
IBLBuilder iblBuilder = IBLBuilder.createOutdoor(light);
- Cubemap environmentCubemap = iblBuilder.buildEnvMap(1024);
Cubemap diffuseCubemap = iblBuilder.buildIrradianceMap(256);
Cubemap specularCubemap = iblBuilder.buildRadianceMap(10);
iblBuilder.dispose();
@@ -449,5 +445,14 @@ public class MenuScreen implements Screen {
sceneManager.environment.set(new PBRTextureAttribute(PBRTextureAttribute.BRDFLUTTexture, brdfLUT));
sceneManager.environment.set(PBRCubemapAttribute.createSpecularEnv(specularCubemap));
sceneManager.environment.set(PBRCubemapAttribute.createDiffuseEnv(diffuseCubemap));
+
+ Cubemap environmentCubemap = EnvironmentUtil.createCubemap(
+ new InternalFileHandleResolver(),
+ "skyboxes/menu/",
+ ".png",
+ EnvironmentUtil.FACE_NAMES_NEG_POS
+ );
+
+ sceneManager.setSkyBox(new SceneSkybox(environmentCubemap));
}
}