Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix no province map crash #344

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Fix no province map crash #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/deps/openvic-simulation
Open in desktop
Submodule openvic-simulation updated 3 files
+2 −4 src/openvic-simulation/dataloader/Dataloader.cpp
+22 −23 src/openvic-simulation/map/MapDefinition.cpp
+17 −16 src/openvic-simulation/map/MapInstance.cpp
11 changes: 7 additions & 4 deletions game/src/Game/GameSession/MapView.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ func zoom_out() -> void:
_zoom_position = Vector2()

func set_hovered_province_index(hover_index : int) -> void:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_hover_index, hover_index)
if _map_shader_material:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_hover_index, hover_index)

func set_hovered_province_at(pos : Vector2) -> void:
var hover_index := GameSingleton.get_province_index_from_uv_coords(pos)
Expand All @@ -188,8 +189,9 @@ func _update_province_hover() -> void:
set_hovered_province_at(_viewport_to_map_coords(_mouse_pos_viewport))

func _on_province_selected(index : int) -> void:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_selected_index, index)
print("Province selected with index: ", index)
if _map_shader_material:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_selected_index, index)
print("Province selected with index: ", index)

func _input(event : InputEvent) -> void:
if event is InputEventMouseMotion:
Expand Down Expand Up @@ -324,7 +326,8 @@ func _zoom_process(delta : float) -> void:
# TODO - smooth transition similar to smooth zoom
_update_view_states(false)
var parchment_mapmode : bool = GameSingleton.is_parchment_mapmode_allowed() and _is_parchment_view
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_parchment_mix, float(parchment_mapmode))
if _map_shader_material:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_parchment_mix, float(parchment_mapmode))

func _update_orientation() -> void:
const up := Vector3(0, 0, -1)
Expand Down
Loading