From 5bf70e5980008212c1a1249e1bfedb928b3409cb Mon Sep 17 00:00:00 2001 From: "Elijah C. Voigt" Date: Mon, 22 Apr 2024 11:00:06 -0700 Subject: [PATCH] Updated skybox, title, buttons --- assets/images/Blank Button (Depressed).png | 4 +-- assets/images/Blank Button (Resting).png | 4 +-- .../images/{ => skybox-clean}/skybox_negx.png | 0 .../images/{ => skybox-clean}/skybox_negy.png | 0 .../images/{ => skybox-clean}/skybox_negz.png | 0 .../images/{ => skybox-clean}/skybox_posx.png | 0 .../images/{ => skybox-clean}/skybox_posy.png | 0 .../images/{ => skybox-clean}/skybox_posz.png | 0 assets/images/skybox-fog.png | 3 +++ assets/images/skybox-fog/skybox-gen.sh | 1 + assets/images/skybox-fog/skybox_fog_negX.png | 3 +++ assets/images/skybox-fog/skybox_fog_negY.png | 3 +++ assets/images/skybox-fog/skybox_fog_negZ.png | 3 +++ assets/images/skybox-fog/skybox_fog_posX.png | 3 +++ assets/images/skybox-fog/skybox_fog_posY.png | 3 +++ assets/images/skybox-fog/skybox_fog_posZ.png | 3 +++ assets/images/title.png | 4 +-- assets/martian.tweak.toml | 4 +-- assets/models/Martian Chess.glb | 4 +-- src/display3d.rs | 27 ++++++++++++++++++- 20 files changed, 58 insertions(+), 11 deletions(-) rename assets/images/{ => skybox-clean}/skybox_negx.png (100%) rename assets/images/{ => skybox-clean}/skybox_negy.png (100%) rename assets/images/{ => skybox-clean}/skybox_negz.png (100%) rename assets/images/{ => skybox-clean}/skybox_posx.png (100%) rename assets/images/{ => skybox-clean}/skybox_posy.png (100%) rename assets/images/{ => skybox-clean}/skybox_posz.png (100%) create mode 100644 assets/images/skybox-fog.png create mode 100644 assets/images/skybox-fog/skybox-gen.sh create mode 100644 assets/images/skybox-fog/skybox_fog_negX.png create mode 100644 assets/images/skybox-fog/skybox_fog_negY.png create mode 100644 assets/images/skybox-fog/skybox_fog_negZ.png create mode 100644 assets/images/skybox-fog/skybox_fog_posX.png create mode 100644 assets/images/skybox-fog/skybox_fog_posY.png create mode 100644 assets/images/skybox-fog/skybox_fog_posZ.png diff --git a/assets/images/Blank Button (Depressed).png b/assets/images/Blank Button (Depressed).png index 27c3819..952c6d6 100644 --- a/assets/images/Blank Button (Depressed).png +++ b/assets/images/Blank Button (Depressed).png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8a138c799b96fbd64707f17784a243f39986897cc9c1d5db528141d5e814f58 -size 65219 +oid sha256:94808aea50806848e77ebe30485d27360510036bc0be8883b8b76aeca1d25f4b +size 86429 diff --git a/assets/images/Blank Button (Resting).png b/assets/images/Blank Button (Resting).png index 69f598e..e1fdc78 100644 --- a/assets/images/Blank Button (Resting).png +++ b/assets/images/Blank Button (Resting).png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91a8e710ce6731bcf2530bddaa55529e81a8b126250b01bfb22f6e28f523e59c -size 63413 +oid sha256:a452e4e8770daec94968fd23be7f519d17cb16a5af4c529716aa1de8c61c9ea2 +size 84440 diff --git a/assets/images/skybox_negx.png b/assets/images/skybox-clean/skybox_negx.png similarity index 100% rename from assets/images/skybox_negx.png rename to assets/images/skybox-clean/skybox_negx.png diff --git a/assets/images/skybox_negy.png b/assets/images/skybox-clean/skybox_negy.png similarity index 100% rename from assets/images/skybox_negy.png rename to assets/images/skybox-clean/skybox_negy.png diff --git a/assets/images/skybox_negz.png b/assets/images/skybox-clean/skybox_negz.png similarity index 100% rename from assets/images/skybox_negz.png rename to assets/images/skybox-clean/skybox_negz.png diff --git a/assets/images/skybox_posx.png b/assets/images/skybox-clean/skybox_posx.png similarity index 100% rename from assets/images/skybox_posx.png rename to assets/images/skybox-clean/skybox_posx.png diff --git a/assets/images/skybox_posy.png b/assets/images/skybox-clean/skybox_posy.png similarity index 100% rename from assets/images/skybox_posy.png rename to assets/images/skybox-clean/skybox_posy.png diff --git a/assets/images/skybox_posz.png b/assets/images/skybox-clean/skybox_posz.png similarity index 100% rename from assets/images/skybox_posz.png rename to assets/images/skybox-clean/skybox_posz.png diff --git a/assets/images/skybox-fog.png b/assets/images/skybox-fog.png new file mode 100644 index 0000000..fae21a6 --- /dev/null +++ b/assets/images/skybox-fog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:259582dbcaa4a766c4dce35f35266460de7c78e78604c1d8b351fb720f491583 +size 5436261 diff --git a/assets/images/skybox-fog/skybox-gen.sh b/assets/images/skybox-fog/skybox-gen.sh new file mode 100644 index 0000000..e275f45 --- /dev/null +++ b/assets/images/skybox-fog/skybox-gen.sh @@ -0,0 +1 @@ +magick.exe skybox_fog_posX.png skybox_fog_negX.png skybox_fog_posY.png skybox_fog_negY.png skybox_fog_posZ.png skybox_fog_negZ.png -gravity center -append skybox-fog.png diff --git a/assets/images/skybox-fog/skybox_fog_negX.png b/assets/images/skybox-fog/skybox_fog_negX.png new file mode 100644 index 0000000..c9002d7 --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_negX.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7054de96b03d7974a520bbbb6b1b6bcdcd90b3e7f44466e9729ded9583e0087 +size 1245928 diff --git a/assets/images/skybox-fog/skybox_fog_negY.png b/assets/images/skybox-fog/skybox_fog_negY.png new file mode 100644 index 0000000..8fe0f67 --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_negY.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:148602f57d4e6af2d3774ebe513b8cf76f792fc03157d8a600cd5654fa95a7f8 +size 1352175 diff --git a/assets/images/skybox-fog/skybox_fog_negZ.png b/assets/images/skybox-fog/skybox_fog_negZ.png new file mode 100644 index 0000000..3b0cb1a --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_negZ.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81900d57c5b4a896945bb2cb41654e2bc55273c0beebd8ba14fd85a2dc4848c5 +size 1429837 diff --git a/assets/images/skybox-fog/skybox_fog_posX.png b/assets/images/skybox-fog/skybox_fog_posX.png new file mode 100644 index 0000000..e76e675 --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_posX.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:931983cbb37fc9ef180f91d518d843c099b83842f8eec236708673b446348853 +size 1098575 diff --git a/assets/images/skybox-fog/skybox_fog_posY.png b/assets/images/skybox-fog/skybox_fog_posY.png new file mode 100644 index 0000000..edabdb7 --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_posY.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9d0227430dab9d32382d5fe26ef3cf8fb14e21f5f7f2a5e5147e125e4f38148 +size 1108271 diff --git a/assets/images/skybox-fog/skybox_fog_posZ.png b/assets/images/skybox-fog/skybox_fog_posZ.png new file mode 100644 index 0000000..75dc64a --- /dev/null +++ b/assets/images/skybox-fog/skybox_fog_posZ.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e89153e170f348d72a841fa37868f46200399c6a979391171f14edd5b56a12b9 +size 1106381 diff --git a/assets/images/title.png b/assets/images/title.png index a8e4c25..e10620a 100644 --- a/assets/images/title.png +++ b/assets/images/title.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afc4dfc003acfbb008bde814f29348ffe90c7046fc10dff71b506ec0ed58ed89 -size 1480940 +oid sha256:dfa9f1f87224a5a5e6959dcefc047a3234e5e83e4fbb2a2fde7ee5b014ca177b +size 1209591 diff --git a/assets/martian.tweak.toml b/assets/martian.tweak.toml index 608fc81..d71b18e 100644 --- a/assets/martian.tweak.toml +++ b/assets/martian.tweak.toml @@ -156,11 +156,11 @@ invalid = "/sfx/3D/3DInvalidMove" brightness = 500.0 [display3d.environment_map_light] -intensity = 2500.0 +intensity = 500.0 [display3d.models] assets_file = "models/Martian Chess.glb" -skybox_file = "images/skybox.png" +skybox_file = "images/skybox-fog.png" [display3d.models.scenes] queen_red = "QueenRed" diff --git a/assets/models/Martian Chess.glb b/assets/models/Martian Chess.glb index da36a8c..8fd629f 100644 --- a/assets/models/Martian Chess.glb +++ b/assets/models/Martian Chess.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d20f5dcde3c995a7a0540ee38887effce190b9954b820eb9663846d08fd6d06b -size 33877448 +oid sha256:4988192d4bc9ffab8366d11137d92890541a226e5a620adac4a8db0df677f9ea +size 66402104 diff --git a/src/display3d.rs b/src/display3d.rs index f1d0450..cd4a001 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -68,6 +68,11 @@ impl Plugin for Display3dPlugin { .run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))) .run_if(in_state(GameState::Play)), monitor_animations.run_if(in_state(GameState::Play)), + debug_lights + .run_if(any_component_added::() + .or_else(any_component_added::()) + .or_else(any_component_added::()) + ) ), ) .add_systems( @@ -294,7 +299,11 @@ fn hydrate_camera( ..default() }, dither: DebandDither::Enabled, - color_grading: ColorGrading { ..default() }, + color_grading: ColorGrading { + exposure: 1.0, + gamma: 1.0, + ..default() + }, tonemapping: Tonemapping::BlenderFilmic, ..default() }, @@ -1246,3 +1255,19 @@ fn dissolve_animation( } }); } + +fn debug_lights( + mut spot_lights: Query<&mut SpotLight, Added>, + mut point_lights: Query<&mut PointLight, Added>, + mut directional_lights: Query<&mut DirectionalLight, Added>, +) { + spot_lights.iter_mut().for_each(|mut l| { + l.shadows_enabled = true; + }); + point_lights.iter_mut().for_each(|mut l| { + l.shadows_enabled = true; + }); + directional_lights.iter_mut().for_each(|mut l| { + l.shadows_enabled = true; + }); +} \ No newline at end of file