diff options
| -rw-r--r-- | extension/src/openvic-extension/singletons/MapItemSingleton.cpp | 5 | ||||
| -rw-r--r-- | game/src/Game/GameSession/BillboardManager.gd | 4 | ||||
| -rw-r--r-- | game/src/Game/GameSession/GameSession.tscn | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/extension/src/openvic-extension/singletons/MapItemSingleton.cpp b/extension/src/openvic-extension/singletons/MapItemSingleton.cpp index 57b5ccb..67af22e 100644 --- a/extension/src/openvic-extension/singletons/MapItemSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MapItemSingleton.cpp @@ -133,9 +133,14 @@ PackedVector2Array MapItemSingleton::get_province_positions(){ PackedVector2Array billboard_pos = PackedVector2Array(); int prov_count = game_singleton->get_definition_manager().get_map_definition().get_province_definition_count(); + Logger::info("prov_count ", prov_count); + for(int i = 0; i < prov_count; i++){ ProvinceDefinition const* prov = game_singleton->get_definition_manager().get_map_definition().get_province_definition_by_index(i); billboard_pos.push_back(Vector2(prov->get_city_position().x,prov->get_city_position().y)); + if(i % 4){ + Logger::info("prov_x ", prov->get_city_position().x); + } } return billboard_pos; diff --git a/game/src/Game/GameSession/BillboardManager.gd b/game/src/Game/GameSession/BillboardManager.gd index f6b96c0..5a6fea6 100644 --- a/game/src/Game/GameSession/BillboardManager.gd +++ b/game/src/Game/GameSession/BillboardManager.gd @@ -56,8 +56,8 @@ func _ready(): #multimesh.instance_count = positions.size() #multimesh.visible_instance_count = positions.size() print("===============") - print(positions) - print(positions.size()) + #print(positions) + #print(positions.size()) # Set the transform of the instances. """for i in multimesh.visible_instance_count: multimesh.set_instance_transform(i, Transform3D(Basis(), diff --git a/game/src/Game/GameSession/GameSession.tscn b/game/src/Game/GameSession/GameSession.tscn index b5edb3d..e8354a5 100644 --- a/game/src/Game/GameSession/GameSession.tscn +++ b/game/src/Game/GameSession/GameSession.tscn @@ -46,8 +46,13 @@ script = ExtResource("4_b3l7b") [node name="UICanvasLayer" type="CanvasLayer" parent="."] -[node name="UI" type="GUINode" parent="UICanvasLayer"] +[node name="UI" type="Control" parent="UICanvasLayer"] +layout_mode = 3 anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 [node name="ProvinceOverviewPanel" type="GUINode" parent="UICanvasLayer/UI"] |