higher dezoom + m hotkey to load another map #223

Vrixyz · 2022-11-02T16:02:01Z

worked on top of !225

Vrixyz · 2022-11-02T16:03:11Z

crates/map/src/io.rs

+        let path = Path::new("./de_map_test.tar");
        let tmp_dir = Builder::new().prefix("de_map_").tempdir().unwrap();
        let mut tmp_dir_path = PathBuf::from(tmp_dir.path());
        tmp_dir_path.push("test-map.tar");

-        task::block_on(store_map(&map, tmp_dir_path.as_path())).unwrap();
-        let loaded_map = task::block_on(load_map(tmp_dir_path.as_path())).unwrap();
+        task::block_on(store_map(&map, &path)).unwrap();
+        let loaded_map = task::block_on(load_map(&path)).unwrap();


that was only done to create a fake alternative map ; those changes don't belong there.

I've done the same trick. Another PR which extends the de_tools crate with some kind of simple "generate map" functionality would be appreciated.

Vrixyz · 2022-11-02T16:04:25Z

crates/camera/src/camera.rs

@@ -23,13 +23,13 @@ const CAMERA_HORIZONTAL_SPEED: InverseSecond = Quantity::new_unchecked(2.0);
 /// Minimum camera distance from terrain achievable with zooming along.
 const MIN_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(20.);
 /// Maximum camera distance from terrain achievable with zooming alone.
-const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(100.);
+const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(300.);


I personally think those are better defaults (for now at least), as the default map is way too big and needs a long scroll to see other units

You are right, at this point in time this change makes sense.

A bit of a context:

In the long run, I would like to implement a custom LOD so zooming out a lot is feasible from performance perspective.

Until this happens, it might be necessary to change this back to a lower value after we plug in better unit models (with possibly higher triangle counts etc.).

The appearance / UI has to change on high camera distances: drawing simple colored squares instead of true 3D models, not displaying health bars and selection circles etc. More info here LOD, "cartographic rendering", split screen & full-screen minimap #153.

Implementing some kind of a mini map (displaying at least all units & buildings & camera) is high on my priority list. That would solve most of the issue you mention (long scroll -> single click on the mini map, getting disoriented -> looking where you are looking at at the mini map).

This is related #68.

Vrixyz · 2022-11-02T16:07:45Z

crates/loader/src/map.rs

@@ -48,6 +51,7 @@ fn spawn_map(
    task: Option<ResMut<MapLoadingTask>>,
    mut move_focus_events: EventWriter<MoveFocusEvent>,
    game_config: Res<GameConfig>,
+    entities_to_remove: Query<Entity, Or<(With<Handle<Scene>>, With<RemoveBeforeLoad>)>>,


we might want a better strategy for removing stuff between loading states, I would err on the side of tagging everything that should not be removed (as I guess there should be a less amount of entities) rather than the opposite, but that was easier to implement.

I might have missed edge cases like the selection rectangle, or projectiles ?

I think that the desired solution to this problem is to add on exist system(s) to every plugin so that the responsibility is moved to where the entities / resources were inserted in the first place.

This all thing might not be needed to add map selection (see the other comment): I would just implement simple main menu where you click on a button with a map name to start the game. You would have to restart the game to select another map to decouple proper system clenaups with map selection.

Related #135.

Indy2222

Thank you for your contribution! It is the first contribution from anyone but me. I really appreciate it.

I see that this is still a draft but I have reviewed it anyways to give you some feedback ASAP.

assets/shaders/terrain.wgsl

Indy2222 · 2022-11-03T10:08:05Z

crates/camera/src/camera.rs

@@ -23,13 +23,13 @@ const CAMERA_HORIZONTAL_SPEED: InverseSecond = Quantity::new_unchecked(2.0);
 /// Minimum camera distance from terrain achievable with zooming along.
 const MIN_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(20.);
 /// Maximum camera distance from terrain achievable with zooming alone.
-const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(100.);
+const MAX_CAMERA_DISTANCE: Metre = Quantity::new_unchecked(300.);


You are right, at this point in time this change makes sense.

A bit of a context:

In the long run, I would like to implement a custom LOD so zooming out a lot is feasible from performance perspective.

Until this happens, it might be necessary to change this back to a lower value after we plug in better unit models (with possibly higher triangle counts etc.).

The appearance / UI has to change on high camera distances: drawing simple colored squares instead of true 3D models, not displaying health bars and selection circles etc. More info here LOD, "cartographic rendering", split screen & full-screen minimap #153.

Implementing some kind of a mini map (displaying at least all units & buildings & camera) is high on my priority list. That would solve most of the issue you mention (long scroll -> single click on the mini map, getting disoriented -> looking where you are looking at at the mini map).

Indy2222 · 2022-11-03T10:10:15Z

crates/map/src/io.rs

+        let path = Path::new("./de_map_test.tar");
        let tmp_dir = Builder::new().prefix("de_map_").tempdir().unwrap();
        let mut tmp_dir_path = PathBuf::from(tmp_dir.path());
        tmp_dir_path.push("test-map.tar");

-        task::block_on(store_map(&map, tmp_dir_path.as_path())).unwrap();
-        let loaded_map = task::block_on(load_map(tmp_dir_path.as_path())).unwrap();
+        task::block_on(store_map(&map, &path)).unwrap();
+        let loaded_map = task::block_on(load_map(&path)).unwrap();


I've done the same trick. Another PR which extends the de_tools crate with some kind of simple "generate map" functionality would be appreciated.

Indy2222 · 2022-11-03T10:21:13Z

crates/camera/src/camera.rs

@@ -209,7 +209,7 @@ impl DesiredPoW {
    }
 }

-fn setup(mut commands: Commands) {
+fn setup(mut commands: Commands, camera_query: Query<Entity, With<Camera3d>>) {


I will have to thing about it a bit more, but my current thought is that the whole map cycling & game setup has to be done differently:

Proper clean up after GameState::Playing is existed has to be implemented.

Map selection should be done via main menu. It might be very simplistic at this point (a button for each available map?).

Generally: once you enter a game (GameState::Playing) you cannot change its configuration (like in most RTS games). You have to quit the game first and then start a new game.

My second point is of highest priority IMO.

Related #34.

Indy2222 · 2022-11-03T10:24:51Z

crates/loader/src/map.rs

@@ -48,6 +51,7 @@ fn spawn_map(
    task: Option<ResMut<MapLoadingTask>>,
    mut move_focus_events: EventWriter<MoveFocusEvent>,
    game_config: Res<GameConfig>,
+    entities_to_remove: Query<Entity, Or<(With<Handle<Scene>>, With<RemoveBeforeLoad>)>>,


I think that the desired solution to this problem is to add on exist system(s) to every plugin so that the responsibility is moved to where the entities / resources were inserted in the first place.

This all thing might not be needed to add map selection (see the other comment): I would just implement simple main menu where you click on a button with a map name to start the game. You would have to restart the game to select another map to decouple proper system clenaups with map selection.

Indy2222 · 2022-11-03T10:28:51Z

Also, please mention this issue in relevant commits: #70

Indy2222 · 2022-12-09T23:24:19Z

Superseded by #259.

Vrixyz commented Nov 2, 2022

View reviewed changes

Indy2222 requested changes Nov 3, 2022

View reviewed changes

format wgsl terrain

4d71416

Vrixyz force-pushed the 124-hotkey-cycle-map branch 4 times, most recently from bd839d0 to c3b6e8e Compare November 3, 2022 20:39

Vrixyz added 2 commits November 4, 2022 09:21

better zoom defaults before work on DigitalExtinction#68

b197917

map selection through hotkey DigitalExtinction#70

c3b6e8e

Indy2222 closed this Dec 9, 2022

Indy2222 added the S-Wontfix label Dec 9, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

higher dezoom + m hotkey to load another map #223

higher dezoom + m hotkey to load another map #223

Vrixyz commented Nov 2, 2022 •

edited

Loading

Vrixyz Nov 2, 2022

Indy2222 Nov 3, 2022

Vrixyz Nov 2, 2022

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Vrixyz Nov 2, 2022

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Indy2222 left a comment

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Indy2222 Nov 3, 2022

Indy2222 commented Nov 3, 2022

Indy2222 commented Dec 9, 2022

higher dezoom + m hotkey to load another map #223

higher dezoom + m hotkey to load another map #223

Conversation

Vrixyz commented Nov 2, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Indy2222 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Indy2222 commented Nov 3, 2022

Indy2222 commented Dec 9, 2022

Vrixyz commented Nov 2, 2022 •

edited

Loading