From 643104f5387f94d7e867cae35458115beede3300 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 7 Oct 2024 15:19:15 -0700 Subject: [PATCH] reworked cpp includes to better conform to include-what-you-use principles --- .efrocachemap | 88 +++++++++---------- CHANGELOG.md | 5 +- config/requirements.txt | 2 +- src/assets/ba_data/python/baenv.py | 2 +- .../base/app_adapter/app_adapter.cc | 5 +- src/ballistica/base/app_adapter/app_adapter.h | 2 + .../base/app_adapter/app_adapter_apple.cc | 3 + .../base/app_adapter/app_adapter_apple.h | 1 + .../base/app_adapter/app_adapter_headless.h | 2 + .../base/app_adapter/app_adapter_sdl.cc | 7 +- .../base/app_adapter/app_adapter_sdl.h | 1 + src/ballistica/base/app_mode/app_mode.cc | 3 + src/ballistica/base/app_mode/app_mode.h | 1 + src/ballistica/base/assets/assets.cc | 6 ++ src/ballistica/base/assets/assets_server.cc | 4 + src/ballistica/base/assets/assets_server.h | 1 + .../base/assets/collision_mesh_asset.cc | 3 + src/ballistica/base/assets/data_asset.cc | 5 +- src/ballistica/base/assets/mesh_asset.cc | 5 ++ src/ballistica/base/assets/sound_asset.cc | 4 +- src/ballistica/base/assets/texture_asset.cc | 8 ++ .../base/assets/texture_asset_preload_data.cc | 3 +- src/ballistica/base/audio/al_sys.cc | 2 + src/ballistica/base/audio/audio_server.cc | 6 ++ src/ballistica/base/audio/audio_server.h | 2 + src/ballistica/base/audio/audio_streamer.cc | 5 +- src/ballistica/base/audio/ogg_stream.cc | 3 + src/ballistica/base/base.cc | 4 + .../base/dynamics/bg/bg_dynamics.cc | 8 ++ .../dynamics/bg/bg_dynamics_draw_snapshot.h | 5 +- .../dynamics/bg/bg_dynamics_height_cache.cc | 3 + .../base/dynamics/bg/bg_dynamics_server.cc | 7 +- .../base/dynamics/collision_cache.cc | 3 + .../base/graphics/gl/framebuffer_object_gl.h | 3 + .../base/graphics/gl/gl_sys_windows.cc | 2 + .../graphics/gl/mesh/mesh_asset_data_gl.h | 4 +- .../base/graphics/gl/mesh/mesh_data_gl.h | 5 ++ .../graphics/gl/program/program_blur_gl.h | 3 +- .../base/graphics/gl/program/program_gl.h | 3 + .../graphics/gl/program/program_object_gl.h | 3 +- .../gl/program/program_post_process_gl.h | 3 +- .../graphics/gl/program/program_shield_gl.h | 3 +- .../graphics/gl/program/program_simple_gl.h | 3 +- .../graphics/gl/program/program_smoke_gl.h | 3 +- .../graphics/gl/program/program_sprite_gl.h | 3 +- .../base/graphics/gl/renderer_gl.cc | 6 ++ .../base/graphics/gl/texture_data_gl.h | 2 + src/ballistica/base/graphics/graphics.cc | 8 ++ .../base/graphics/graphics_server.cc | 5 ++ src/ballistica/base/graphics/graphics_vr.cc | 2 + .../base/graphics/mesh/nine_patch_mesh.h | 2 + .../base/graphics/mesh/text_mesh.cc | 4 + .../base/graphics/renderer/render_pass.cc | 4 + .../base/graphics/renderer/renderer.cc | 7 +- .../base/graphics/renderer/renderer.h | 25 ------ .../base/graphics/support/camera.cc | 2 + .../base/graphics/support/frame_def.cc | 10 ++- .../base/graphics/support/net_graph.cc | 2 + .../base/graphics/support/screen_messages.cc | 4 + .../base/graphics/support/screen_messages.h | 3 + .../base/graphics/text/text_graphics.cc | 8 ++ .../base/graphics/text/text_group.cc | 6 ++ .../base/graphics/text/text_packer.cc | 3 + src/ballistica/base/graphics/texture/dds.cc | 4 + src/ballistica/base/graphics/texture/pvr.cc | 4 + .../base/input/device/input_device.cc | 4 +- .../base/input/device/input_device.h | 1 - .../input/device/input_device_delegate.cc | 2 + .../base/input/device/input_device_delegate.h | 1 + .../base/input/device/joystick_input.cc | 4 + .../base/input/device/keyboard_input.cc | 2 + .../base/input/device/test_input.cc | 2 + .../base/input/device/touch_input.cc | 5 ++ src/ballistica/base/input/input.cc | 5 ++ .../base/input/support/remote_app_server.cc | 5 +- src/ballistica/base/logic/logic.cc | 4 + .../base/networking/network_reader.cc | 5 ++ .../base/networking/network_writer.cc | 2 + src/ballistica/base/networking/networking.cc | 2 + .../platform/apple/base_platform_apple.cc | 2 + .../base/platform/apple/base_platform_apple.h | 3 +- src/ballistica/base/platform/base_platform.cc | 8 +- src/ballistica/base/platform/base_platform.h | 2 + .../base/platform/support/min_sdl_key_names.h | 4 +- .../platform/windows/base_platform_windows.cc | 2 + src/ballistica/base/python/base_python.cc | 5 +- src/ballistica/base/python/base_python.h | 2 + .../python/class/python_class_app_timer.cc | 4 +- .../python/class/python_class_context_call.cc | 3 +- .../python/class/python_class_context_ref.cc | 3 +- .../class/python_class_display_timer.cc | 3 +- .../base/python/class/python_class_env.cc | 4 + .../base/python/class/python_class_env.h | 2 + .../class/python_class_feature_set_data.h | 3 +- .../python/class/python_class_simple_sound.cc | 2 + .../python/class/python_class_simple_sound.h | 2 + .../base/python/class/python_class_vec3.cc | 3 + .../python/methods/python_methods_base_1.cc | 5 ++ .../python/methods/python_methods_base_2.cc | 6 +- .../python/methods/python_methods_base_3.cc | 3 + .../python/support/python_context_call.cc | 2 + src/ballistica/base/support/app_config.cc | 4 +- src/ballistica/base/support/context.cc | 2 + src/ballistica/base/support/huffman.cc | 3 + src/ballistica/base/support/stdio_console.cc | 6 +- src/ballistica/base/support/stdio_console.h | 4 +- src/ballistica/base/ui/dev_console.cc | 6 ++ src/ballistica/base/ui/dev_console.h | 4 +- src/ballistica/base/ui/ui.cc | 2 + src/ballistica/base/ui/ui.h | 1 + src/ballistica/base/ui/ui_delegate.h | 2 + src/ballistica/classic/classic.cc | 4 +- src/ballistica/classic/classic.h | 3 + .../classic/python/classic_python.cc | 5 +- .../classic/python/classic_python.h | 2 + .../python/methods/python_methods_classic.cc | 4 + .../classic/support/classic_app_mode.cc | 5 ++ .../classic/support/classic_app_mode.h | 2 + src/ballistica/classic/support/stress_test.h | 4 +- src/ballistica/classic/support/v1_account.cc | 4 + src/ballistica/core/core.cc | 5 +- .../platform/apple/core_platform_apple.cc | 7 ++ src/ballistica/core/platform/core_platform.cc | 13 +-- src/ballistica/core/platform/core_platform.h | 3 +- .../platform/linux/core_platform_linux.cc | 4 + .../core/platform/linux/core_platform_linux.h | 1 + .../platform/windows/core_platform_windows.cc | 5 ++ .../platform/windows/core_platform_windows.h | 2 + src/ballistica/core/python/core_python.cc | 5 +- src/ballistica/core/python/core_python.h | 2 + src/ballistica/core/support/base_soft.h | 5 +- src/ballistica/core/support/core_config.cc | 2 + src/ballistica/scene_v1/assets/scene_asset.cc | 6 +- .../scene_v1/assets/scene_collision_mesh.cc | 2 + .../scene_v1/assets/scene_cube_map_texture.cc | 2 + .../scene_v1/assets/scene_data_asset.cc | 2 + src/ballistica/scene_v1/assets/scene_mesh.cc | 2 + src/ballistica/scene_v1/assets/scene_sound.cc | 3 +- src/ballistica/scene_v1/assets/scene_sound.h | 2 +- .../scene_v1/assets/scene_texture.cc | 4 +- .../scene_v1/connection/connection.cc | 4 +- .../scene_v1/connection/connection_set.cc | 6 +- .../connection/connection_to_client.cc | 6 +- .../connection/connection_to_client_udp.cc | 4 + .../scene_v1/connection/connection_to_host.cc | 6 +- .../connection/connection_to_host_udp.cc | 3 + src/ballistica/scene_v1/dynamics/dynamics.cc | 4 +- .../scene_v1/dynamics/material/material.cc | 6 +- .../dynamics/material/material_component.cc | 2 + .../dynamics/material/material_component.h | 2 +- .../dynamics/material/material_context.cc | 1 - .../dynamics/material/material_context.h | 2 + .../material/python_call_material_action.h | 1 - .../material/skid_sound_material_action.h | 1 - .../dynamics/material/sound_material_action.h | 1 - src/ballistica/scene_v1/dynamics/part.cc | 2 + .../scene_v1/dynamics/rigid_body.cc | 1 - .../scene_v1/node/anim_curve_node.cc | 1 + src/ballistica/scene_v1/node/combine_node.cc | 3 + .../scene_v1/node/explosion_node.cc | 2 + src/ballistica/scene_v1/node/flag_node.cc | 4 + src/ballistica/scene_v1/node/flag_node.h | 2 +- src/ballistica/scene_v1/node/flash_node.cc | 2 + src/ballistica/scene_v1/node/globals_node.cc | 5 +- src/ballistica/scene_v1/node/image_node.cc | 3 + src/ballistica/scene_v1/node/light_node.cc | 3 + src/ballistica/scene_v1/node/locator_node.cc | 3 + src/ballistica/scene_v1/node/math_node.cc | 3 + src/ballistica/scene_v1/node/node.cc | 3 + .../scene_v1/node/node_attribute.cc | 4 + .../node/node_attribute_connection.cc | 2 + src/ballistica/scene_v1/node/player_node.cc | 2 + src/ballistica/scene_v1/node/prop_node.cc | 4 + src/ballistica/scene_v1/node/region_node.cc | 3 + src/ballistica/scene_v1/node/scorch_node.cc | 2 + src/ballistica/scene_v1/node/shield_node.cc | 3 + src/ballistica/scene_v1/node/sound_node.cc | 2 + src/ballistica/scene_v1/node/spaz_node.cc | 13 +-- src/ballistica/scene_v1/node/spaz_node.h | 3 +- src/ballistica/scene_v1/node/terrain_node.cc | 3 + src/ballistica/scene_v1/node/text_node.cc | 4 + src/ballistica/scene_v1/node/text_node.h | 2 +- .../scene_v1/node/texture_sequence_node.cc | 2 + .../scene_v1/node/time_display_node.cc | 3 + .../class/python_class_activity_data.cc | 3 +- .../python/class/python_class_base_timer.cc | 3 +- .../python/class/python_class_input_device.cc | 3 +- .../python/class/python_class_material.cc | 3 + .../python/class/python_class_node.cc | 2 + .../python_class_scene_collision_mesh.cc | 3 +- .../class/python_class_scene_data_asset.cc | 3 +- .../python/class/python_class_scene_mesh.cc | 3 +- .../python/class/python_class_scene_sound.cc | 3 + .../class/python_class_scene_texture.cc | 3 +- .../python/class/python_class_scene_timer.cc | 3 +- .../python/class/python_class_session_data.cc | 3 +- .../class/python_class_session_player.cc | 3 + .../python/methods/python_methods_assets.cc | 3 +- .../python/methods/python_methods_input.cc | 4 +- .../methods/python_methods_networking.cc | 4 + .../python/methods/python_methods_scene.cc | 6 +- .../scene_v1/python/scene_v1_python.cc | 9 +- .../scene_v1/python/scene_v1_python.h | 3 + src/ballistica/scene_v1/scene_v1.cc | 4 + src/ballistica/scene_v1/scene_v1.h | 3 +- .../scene_v1/support/client_input_device.cc | 2 + .../support/client_input_device_delegate.cc | 3 + .../support/client_input_device_delegate.h | 2 + .../scene_v1/support/client_session.cc | 3 + .../scene_v1/support/client_session_net.cc | 3 + .../scene_v1/support/client_session_replay.cc | 4 + .../scene_v1/support/client_session_replay.h | 1 + .../scene_v1/support/host_activity.cc | 7 +- .../scene_v1/support/host_activity.h | 2 +- .../scene_v1/support/host_session.cc | 7 +- src/ballistica/scene_v1/support/player.cc | 4 + .../scene_v1/support/player_spec.cc | 2 + src/ballistica/scene_v1/support/scene.cc | 10 ++- .../scene_v1/support/scene_v1_context.cc | 5 +- .../scene_v1/support/scene_v1_context.h | 2 + .../support/scene_v1_input_device_delegate.cc | 4 + .../support/scene_v1_input_device_delegate.h | 3 + .../scene_v1/support/session_stream.cc | 3 + src/ballistica/shared/ballistica.cc | 5 +- .../shared/foundation/event_loop.cc | 10 ++- src/ballistica/shared/foundation/exception.cc | 3 + .../shared/foundation/fatal_error.cc | 4 + .../feature_set_native_component.cc | 5 +- src/ballistica/shared/foundation/inline.h | 1 + src/ballistica/shared/foundation/logging.cc | 2 + src/ballistica/shared/foundation/macros.cc | 2 + src/ballistica/shared/foundation/object.cc | 3 + src/ballistica/shared/generic/base64.cc | 4 +- src/ballistica/shared/generic/runnable.cc | 2 + src/ballistica/shared/generic/utils.cc | 6 +- .../shared/networking/networking_sys.h | 2 - src/ballistica/shared/networking/sockaddr.cc | 2 + src/ballistica/shared/python/python.cc | 8 +- .../shared/python/python_command.cc | 3 + .../shared/python/python_module_builder.h | 4 +- .../shared/python/python_object_set.cc | 4 +- src/ballistica/shared/python/python_ref.cc | 4 + src/ballistica/shared/python/python_sys.h | 2 + .../python/class/python_class_hello.h | 2 + .../methods/python_methods_template_fs.cc | 3 +- .../python/class/python_class_ui_mesh.cc | 2 + .../ui_v1/python/class/python_class_ui_mesh.h | 2 + .../python/class/python_class_ui_sound.cc | 2 + .../python/class/python_class_ui_sound.h | 2 + .../python/class/python_class_ui_texture.cc | 2 + .../python/class/python_class_ui_texture.h | 2 + .../ui_v1/python/class/python_class_widget.cc | 3 +- .../python/methods/python_methods_ui_v1.cc | 4 + src/ballistica/ui_v1/python/ui_v1_python.cc | 2 + src/ballistica/ui_v1/python/ui_v1_python.h | 2 + src/ballistica/ui_v1/ui_v1.cc | 2 + src/ballistica/ui_v1/ui_v1.h | 2 + src/ballistica/ui_v1/widget/button_widget.cc | 3 + .../ui_v1/widget/check_box_widget.cc | 6 +- .../ui_v1/widget/check_box_widget.h | 2 +- .../ui_v1/widget/container_widget.cc | 3 + .../ui_v1/widget/h_scroll_widget.cc | 2 + src/ballistica/ui_v1/widget/image_widget.h | 1 + src/ballistica/ui_v1/widget/root_widget.cc | 3 + src/ballistica/ui_v1/widget/root_widget.h | 1 + src/ballistica/ui_v1/widget/row_widget.cc | 2 + src/ballistica/ui_v1/widget/scroll_widget.cc | 2 + src/ballistica/ui_v1/widget/text_widget.cc | 9 +- src/ballistica/ui_v1/widget/widget.cc | 3 +- tools/efro/call.py | 32 +++++-- tools/efrotools/code.py | 12 ++- 271 files changed, 873 insertions(+), 214 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index fba194c7..ebb4fc92 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4096,50 +4096,50 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "0b91292430d8deb60fea29ea3cbd08c4", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "5de7507d5eecd943a259306e4a88e31f", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "b784c5218097a3cc9cb1fb128252745f", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "fe567c99090f94f169a09a8a49f072c6", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "a1718fa31093008d7e06df5437ad094e", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8b8a7d3a484d4bca1946d479be3dfa0b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "f55dda6ac5c57e950fd6caca43723e04", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "d7cf60f2dd71b8ea6e44e86384897542", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "34bffdb7d43d4a918f03d7adc3185572", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e1eaf4393ae32874fc7ed09eb9e87071", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "76fb2324412f05f62d6664c0fbaaa6ff", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "45fdd4c09007e601a74e8be5705c64f5", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "36dcd45c4503216ab4c213ed92386c31", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "bf22c964c56cd8593c17504ab19ec152", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "da9177bfef989af57ce047267e7fdf23", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f5fd6eada12cf3de3735b80d6a707240", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "60fd3eb460320f3246001ba9b57b0c65", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "7bdf4ca50de9ff62bc6cbd86a07ca68d", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "daa2b20a69b554f619de0b1e3f8083fc", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "facbfecf157677de9756cc02833fbaea", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f731b23639b0b152109c3a367ab19340", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "af1fa785407814fb7cab31dc95b6246d", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f731b23639b0b152109c3a367ab19340", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "af1fa785407814fb7cab31dc95b6246d", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "1eff75bbcdce0ff611678ce79ba0ac18", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "af504ed9b0990fdbc5441b40f925890a", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "1eff75bbcdce0ff611678ce79ba0ac18", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "af504ed9b0990fdbc5441b40f925890a", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "2c88978e61c4a37606c4964ab0e62561", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "0422ad13cbb5234fecfc14f7573ba020", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "2c88978e61c4a37606c4964ab0e62561", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "0422ad13cbb5234fecfc14f7573ba020", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "412efbbf3d7d9c85398c43303b03466e", - "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "82b3e97e5f7620294eede876424e0c75", - "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "dc201ad653d7098266caa12bcd038c30", - "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "82b3e97e5f7620294eede876424e0c75", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5d5a32f8689888afe15b4bf082e3a21e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d7267b05c7f8f62786f2f7990b0bf5fa", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "7a2710912719f036223e55afe427676f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e2ccdb0ee72f166b12dc33002b169f4c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "8c7c457e748d8fcf3a067197ba1745fd", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9b8e2960261083daaf8b4a283531a8bb", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "47bfa200bb3a75e5cd94c4bcddb74a68", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "6b865403653c3d080088e4e3cdba6f45", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c8904594aa4867a7525e6644249d5fd5", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "7d3ba05e21b198bdccbdaf9d334f96f2", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "8601ef36314294c18b686995ce9a02f6", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "36742622076742a5642de8c287cd92e4", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "b05ee46d11b618cf917cae591fe6b97a", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "a9a03ded1e4fccfdc1879bd8f70e0e7a", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "05f37deacb796ef45828233ded9325e3", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f4b4df8f17219f81148efe3dc057856f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "b6201f83d4f80fcc567398807c7d77b5", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "331335944425c5a48abbcf137da46f0f", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "ac2d7714d87b781659c1e3333f760888", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "1e7cc9348498df9bfb7b25cd83009d7c", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a3c7e011ad99046d2ef8b102e7d15733", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "43fd8535ad1e2c2c64fe57dacfb3305b", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "fc17d6883ddd4486a62b75494dbb9d15", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0a557a638ee4cb3150d90bcb5913de3e", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "85afe70f81c1f7d2de9520d498c74eb8", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a617c0412a804bce272113585c000318", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "5642e5614711b8e106de659db2b33ac7", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ea7018647c89777469979aa08e88573e", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ba7dc0b4e927f32fcf15c2f738fe004c", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "fb4c90da8d46ddab5847406fa397dbd5", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ba7dc0b4e927f32fcf15c2f738fe004c", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "fb4c90da8d46ddab5847406fa397dbd5", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "225f13c4755aa018e63168c8aca0a8fd", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "d4c6e0f0ac69af106f1227daeae2db55", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "225f13c4755aa018e63168c8aca0a8fd", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "d4c6e0f0ac69af106f1227daeae2db55", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "e16971f1da7ad7f44bb185b4446965c6", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "d5638285fa481d769a5cd488a78d8269", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "e16971f1da7ad7f44bb185b4446965c6", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "d5638285fa481d769a5cd488a78d8269", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "184b7e4731b09ccf3a6a3b001d8af097", + "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "507b5555ef5d067caf18fe9844ca04c7", + "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "838ee9bfd43169efe8daff8bb0efb1db", + "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "507b5555ef5d067caf18fe9844ca04c7", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d1edb04136c433b57f3842830e9b272d", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "4e64e07e3527e0536d1dc7f2dacd681a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "301bad929a4f3c6e9f67e57ab730bded", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "6224ca7790cfa8274c3f9c8e4461b93f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "bedcc6b5cc2a403a65d83c6244922feb", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "545edb5e8f7cce4e7bc3cdb0e4f98b82", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "79102625aebc9df3a0834f8d571fdbac", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "9e5a350dc8f5fcd1ab96c7a4c24a7ebe", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index d45647b3..f3a7daa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ -### 1.7.37 (build 22024, api 9, 2024-10-04) +### 1.7.37 (build 22025, api 9, 2024-10-07) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. I'm hopeful that api version won't need to be bumped again for along time (if ever). +- Went ahead and fully removed `efro.call.tpartial` (since we're breaking + compatibility anyway by bumping api version). If you are using + `efro.call.tpartial` anywhere, simply replace it with `functools.partial`. - The newest Pylint update (3.3) added a check for 'too-many-positional-arguments'. This seems like a good idea, so I updated various functions to conform to it and set some others to ignore it. Basically diff --git a/config/requirements.txt b/config/requirements.txt index 816a0d45..b8567d39 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -1,4 +1,4 @@ -cpplint==1.6.1 +cpplint==2.0.0 dmgbuild==1.6.2 filelock==3.16.1 furo==2024.8.6 diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index b57dd676..7b5e0163 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22024 +TARGET_BALLISTICA_BUILD = 22025 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/base/app_adapter/app_adapter.cc b/src/ballistica/base/app_adapter/app_adapter.cc index 48417181..ba06f953 100644 --- a/src/ballistica/base/app_adapter/app_adapter.cc +++ b/src/ballistica/base/app_adapter/app_adapter.cc @@ -2,7 +2,10 @@ #include "ballistica/base/app_adapter/app_adapter.h" -#include "ballistica/base/graphics/renderer/renderer.h" +#include + +#include "ballistica/base/graphics/support/graphics_client_context.h" +#include "ballistica/base/graphics/support/graphics_settings.h" #include "ballistica/base/input/input.h" #include "ballistica/base/python/base_python.h" #include "ballistica/base/support/app_config.h" diff --git a/src/ballistica/base/app_adapter/app_adapter.h b/src/ballistica/base/app_adapter/app_adapter.h index f51fdde1..68234ce5 100644 --- a/src/ballistica/base/app_adapter/app_adapter.h +++ b/src/ballistica/base/app_adapter/app_adapter.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_BASE_APP_ADAPTER_APP_ADAPTER_H_ #define BALLISTICA_BASE_APP_ADAPTER_APP_ADAPTER_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/generic/lambda_runnable.h" diff --git a/src/ballistica/base/app_adapter/app_adapter_apple.cc b/src/ballistica/base/app_adapter/app_adapter_apple.cc index 667e1a0c..894a7a55 100644 --- a/src/ballistica/base/app_adapter/app_adapter_apple.cc +++ b/src/ballistica/base/app_adapter/app_adapter_apple.cc @@ -3,6 +3,9 @@ #include "ballistica/base/app_adapter/app_adapter_apple.h" +#include +#include + #include "ballistica/base/graphics/gl/renderer_gl.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/graphics_server.h" diff --git a/src/ballistica/base/app_adapter/app_adapter_apple.h b/src/ballistica/base/app_adapter/app_adapter_apple.h index 6a51b51e..11459721 100644 --- a/src/ballistica/base/app_adapter/app_adapter_apple.h +++ b/src/ballistica/base/app_adapter/app_adapter_apple.h @@ -6,6 +6,7 @@ #if BA_XCODE_BUILD #include +#include #include #include diff --git a/src/ballistica/base/app_adapter/app_adapter_headless.h b/src/ballistica/base/app_adapter/app_adapter_headless.h index 2df675ea..2ebbc14c 100644 --- a/src/ballistica/base/app_adapter/app_adapter_headless.h +++ b/src/ballistica/base/app_adapter/app_adapter_headless.h @@ -4,6 +4,8 @@ #define BALLISTICA_BASE_APP_ADAPTER_APP_ADAPTER_HEADLESS_H_ #if BA_HEADLESS_BUILD +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/base/app_adapter/app_adapter_sdl.cc b/src/ballistica/base/app_adapter/app_adapter_sdl.cc index 060ffd95..956b5815 100644 --- a/src/ballistica/base/app_adapter/app_adapter_sdl.cc +++ b/src/ballistica/base/app_adapter/app_adapter_sdl.cc @@ -4,6 +4,11 @@ #include "ballistica/base/app_adapter/app_adapter_sdl.h" +#include +#include +#include +#include + #include "ballistica/base/base.h" #include "ballistica/base/graphics/gl/gl_sys.h" #include "ballistica/base/graphics/gl/renderer_gl.h" @@ -78,7 +83,7 @@ void AppAdapterSDL::OnMainThreadStartApp() { // Register events we can send ourself. sdl_runnable_event_id_ = SDL_RegisterEvents(1); - assert(sdl_runnable_event_id_ != (uint32_t)-1); + assert(sdl_runnable_event_id_ != static_cast(-1)); // SDL builds just assume keyboard input is available. g_base->input->PushCreateKeyboardInputDevices(); diff --git a/src/ballistica/base/app_adapter/app_adapter_sdl.h b/src/ballistica/base/app_adapter/app_adapter_sdl.h index 2f9b6f29..3151df45 100644 --- a/src/ballistica/base/app_adapter/app_adapter_sdl.h +++ b/src/ballistica/base/app_adapter/app_adapter_sdl.h @@ -6,6 +6,7 @@ #include "ballistica/base/base.h" #if BA_SDL_BUILD +#include #include #include "ballistica/base/app_adapter/app_adapter.h" diff --git a/src/ballistica/base/app_mode/app_mode.cc b/src/ballistica/base/app_mode/app_mode.cc index b4361428..3918cc62 100644 --- a/src/ballistica/base/app_mode/app_mode.cc +++ b/src/ballistica/base/app_mode/app_mode.cc @@ -2,6 +2,9 @@ #include "ballistica/base/app_mode/app_mode.h" +#include +#include + #include "ballistica/base/input/device/input_device_delegate.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/support/context.h" diff --git a/src/ballistica/base/app_mode/app_mode.h b/src/ballistica/base/app_mode/app_mode.h index 5f848367..b4c7feed 100644 --- a/src/ballistica/base/app_mode/app_mode.h +++ b/src/ballistica/base/app_mode/app_mode.h @@ -3,6 +3,7 @@ #ifndef BALLISTICA_BASE_APP_MODE_APP_MODE_H_ #define BALLISTICA_BASE_APP_MODE_APP_MODE_H_ +#include #include #include "ballistica/base/base.h" diff --git a/src/ballistica/base/assets/assets.cc b/src/ballistica/base/assets/assets.cc index 7a0ecc90..f513dcf8 100644 --- a/src/ballistica/base/assets/assets.cc +++ b/src/ballistica/base/assets/assets.cc @@ -2,6 +2,12 @@ #include "ballistica/base/assets/assets.h" +#include +#include +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/assets/assets_server.h" diff --git a/src/ballistica/base/assets/assets_server.cc b/src/ballistica/base/assets/assets_server.cc index aaf27ba5..c24eda65 100644 --- a/src/ballistica/base/assets/assets_server.cc +++ b/src/ballistica/base/assets/assets_server.cc @@ -2,6 +2,10 @@ #include "ballistica/base/assets/assets_server.h" +#include +#include +#include + #include "ballistica/base/assets/asset.h" #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/graphics.h" diff --git a/src/ballistica/base/assets/assets_server.h b/src/ballistica/base/assets/assets_server.h index 65853ecf..754bbdd6 100644 --- a/src/ballistica/base/assets/assets_server.h +++ b/src/ballistica/base/assets/assets_server.h @@ -3,6 +3,7 @@ #ifndef BALLISTICA_BASE_ASSETS_ASSETS_SERVER_H_ #define BALLISTICA_BASE_ASSETS_ASSETS_SERVER_H_ +#include #include #include diff --git a/src/ballistica/base/assets/collision_mesh_asset.cc b/src/ballistica/base/assets/collision_mesh_asset.cc index e078306f..a52a3323 100644 --- a/src/ballistica/base/assets/collision_mesh_asset.cc +++ b/src/ballistica/base/assets/collision_mesh_asset.cc @@ -2,6 +2,9 @@ #include "ballistica/base/assets/collision_mesh_asset.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/core/core.h" diff --git a/src/ballistica/base/assets/data_asset.cc b/src/ballistica/base/assets/data_asset.cc index 6933a3d8..60e49f74 100644 --- a/src/ballistica/base/assets/data_asset.cc +++ b/src/ballistica/base/assets/data_asset.cc @@ -2,10 +2,13 @@ #include "ballistica/base/assets/data_asset.h" +#include + +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/core/python/core_python.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::base { diff --git a/src/ballistica/base/assets/mesh_asset.cc b/src/ballistica/base/assets/mesh_asset.cc index bbc14e3c..8801d8c9 100644 --- a/src/ballistica/base/assets/mesh_asset.cc +++ b/src/ballistica/base/assets/mesh_asset.cc @@ -2,6 +2,11 @@ #include "ballistica/base/assets/mesh_asset.h" +#include +#include +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/core/core.h" diff --git a/src/ballistica/base/assets/sound_asset.cc b/src/ballistica/base/assets/sound_asset.cc index 34acd22a..84841660 100644 --- a/src/ballistica/base/assets/sound_asset.cc +++ b/src/ballistica/base/assets/sound_asset.cc @@ -2,7 +2,10 @@ #include "ballistica/base/assets/sound_asset.h" +#include #include +#include +#include #if BA_ENABLE_AUDIO #if BA_USE_TREMOR_VORBIS @@ -16,7 +19,6 @@ #include "ballistica/base/audio/audio_server.h" #include "ballistica/base/python/base_python.h" #include "ballistica/core/core.h" -#include "ballistica/shared/python/python.h" // Need to move away from OpenAL on Apple stuff. #if __clang__ diff --git a/src/ballistica/base/assets/texture_asset.cc b/src/ballistica/base/assets/texture_asset.cc index 8198a4d9..a7fabefc 100644 --- a/src/ballistica/base/assets/texture_asset.cc +++ b/src/ballistica/base/assets/texture_asset.cc @@ -2,9 +2,17 @@ #include "ballistica/base/assets/texture_asset.h" +#include +#include +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" +#include "ballistica/base/assets/assets.h" #include "ballistica/base/assets/texture_asset_preload_data.h" #include "ballistica/base/assets/texture_asset_renderer_data.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/base/graphics/text/text_packer.h" diff --git a/src/ballistica/base/assets/texture_asset_preload_data.cc b/src/ballistica/base/assets/texture_asset_preload_data.cc index 5934ab62..9a157eed 100644 --- a/src/ballistica/base/assets/texture_asset_preload_data.cc +++ b/src/ballistica/base/assets/texture_asset_preload_data.cc @@ -2,9 +2,8 @@ #include "ballistica/base/assets/texture_asset_preload_data.h" -#if BA_OSTYPE_LINUX +#include #include -#endif #include "ballistica/base/assets/texture_asset.h" #include "ballistica/base/graphics/texture/ktx.h" diff --git a/src/ballistica/base/audio/al_sys.cc b/src/ballistica/base/audio/al_sys.cc index 39b6fada..579b4c90 100644 --- a/src/ballistica/base/audio/al_sys.cc +++ b/src/ballistica/base/audio/al_sys.cc @@ -2,6 +2,8 @@ #include "ballistica/base/audio/al_sys.h" +#include + #include "ballistica/base/audio/audio_server.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/audio/audio_server.cc b/src/ballistica/base/audio/audio_server.cc index 798f0d49..23f771b3 100644 --- a/src/ballistica/base/audio/audio_server.cc +++ b/src/ballistica/base/audio/audio_server.cc @@ -3,6 +3,12 @@ #include "ballistica/base/audio/audio_server.h" #include +#include +#include +#include +#include +#include +#include #include "ballistica/shared/buildconfig/buildconfig_common.h" diff --git a/src/ballistica/base/audio/audio_server.h b/src/ballistica/base/audio/audio_server.h index 411cd3cf..a819e1dd 100644 --- a/src/ballistica/base/audio/audio_server.h +++ b/src/ballistica/base/audio/audio_server.h @@ -4,7 +4,9 @@ #define BALLISTICA_BASE_AUDIO_AUDIO_SERVER_H_ #include +#include #include +#include #include #include "ballistica/base/base.h" diff --git a/src/ballistica/base/audio/audio_streamer.cc b/src/ballistica/base/audio/audio_streamer.cc index bc6f1488..3867558d 100644 --- a/src/ballistica/base/audio/audio_streamer.cc +++ b/src/ballistica/base/audio/audio_streamer.cc @@ -2,8 +2,9 @@ #include "ballistica/base/audio/audio_streamer.h" -#include "ballistica/base/audio/audio.h" -#include "ballistica/base/audio/audio_server.h" +#include + +#include "ballistica/base/base.h" // Need to move away from OpenAL on Apple stuff. #if __clang__ diff --git a/src/ballistica/base/audio/ogg_stream.cc b/src/ballistica/base/audio/ogg_stream.cc index 5b51d427..486780d5 100644 --- a/src/ballistica/base/audio/ogg_stream.cc +++ b/src/ballistica/base/audio/ogg_stream.cc @@ -2,6 +2,9 @@ #include "ballistica/base/audio/ogg_stream.h" +#include +#include + #include "ballistica/base/base.h" #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/base/base.cc b/src/ballistica/base/base.cc index b9063780..3d153d65 100644 --- a/src/ballistica/base/base.cc +++ b/src/ballistica/base/base.cc @@ -2,6 +2,10 @@ #include "ballistica/base/base.h" +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/empty_app_mode.h" #include "ballistica/base/assets/assets.h" diff --git a/src/ballistica/base/dynamics/bg/bg_dynamics.cc b/src/ballistica/base/dynamics/bg/bg_dynamics.cc index 231a964b..232241bb 100644 --- a/src/ballistica/base/dynamics/bg/bg_dynamics.cc +++ b/src/ballistica/base/dynamics/bg/bg_dynamics.cc @@ -2,6 +2,11 @@ #include "ballistica/base/dynamics/bg/bg_dynamics.h" +#include +#include +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/base/assets/collision_mesh_asset.h" #include "ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h" #include "ballistica/base/dynamics/bg/bg_dynamics_fuse_data.h" @@ -10,6 +15,9 @@ #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/smoke_component.h" #include "ballistica/base/graphics/component/sprite_component.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_smoke_full.h" +#include "ballistica/base/graphics/mesh/sprite_mesh.h" #include "ballistica/shared/foundation/event_loop.h" namespace ballistica::base { diff --git a/src/ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h b/src/ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h index 4e2db886..977e2db3 100644 --- a/src/ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h +++ b/src/ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h @@ -5,7 +5,10 @@ #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_simple_full.h" +#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_smoke_full.h" +#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_sprite.h" +#include "ballistica/base/graphics/mesh/mesh_index_buffer_16.h" namespace ballistica::base { diff --git a/src/ballistica/base/dynamics/bg/bg_dynamics_height_cache.cc b/src/ballistica/base/dynamics/bg/bg_dynamics_height_cache.cc index 7fd00919..6879ad56 100644 --- a/src/ballistica/base/dynamics/bg/bg_dynamics_height_cache.cc +++ b/src/ballistica/base/dynamics/bg/bg_dynamics_height_cache.cc @@ -2,6 +2,9 @@ #include "ballistica/base/dynamics/bg/bg_dynamics_height_cache.h" +#include +#include + namespace ballistica::base { const int kBGDynamicsHeightCacheMaxContacts = 20; diff --git a/src/ballistica/base/dynamics/bg/bg_dynamics_server.cc b/src/ballistica/base/dynamics/bg/bg_dynamics_server.cc index d0ff57bf..631bac78 100644 --- a/src/ballistica/base/dynamics/bg/bg_dynamics_server.cc +++ b/src/ballistica/base/dynamics/bg/bg_dynamics_server.cc @@ -2,6 +2,11 @@ #include "ballistica/base/dynamics/bg/bg_dynamics_server.h" +#include +#include +#include +#include + #include "ballistica/base/assets/collision_mesh_asset.h" #include "ballistica/base/dynamics/bg/bg_dynamics_draw_snapshot.h" #include "ballistica/base/dynamics/bg/bg_dynamics_fuse_data.h" @@ -9,7 +14,7 @@ #include "ballistica/base/dynamics/bg/bg_dynamics_shadow_data.h" #include "ballistica/base/dynamics/bg/bg_dynamics_volume_light_data.h" #include "ballistica/base/dynamics/collision_cache.h" -#include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/dynamics/collision_cache.cc b/src/ballistica/base/dynamics/collision_cache.cc index 4d3ae725..243d4604 100644 --- a/src/ballistica/base/dynamics/collision_cache.cc +++ b/src/ballistica/base/dynamics/collision_cache.cc @@ -2,6 +2,9 @@ #include "ballistica/base/dynamics/collision_cache.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ode/ode_collision_kernel.h" diff --git a/src/ballistica/base/graphics/gl/framebuffer_object_gl.h b/src/ballistica/base/graphics/gl/framebuffer_object_gl.h index 7742ddd1..5cb52ff2 100644 --- a/src/ballistica/base/graphics/gl/framebuffer_object_gl.h +++ b/src/ballistica/base/graphics/gl/framebuffer_object_gl.h @@ -5,9 +5,12 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/graphics/gl/renderer_gl.h" #include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/renderer/framebuffer.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/gl_sys_windows.cc b/src/ballistica/base/graphics/gl/gl_sys_windows.cc index ae65f49e..ad8861ab 100644 --- a/src/ballistica/base/graphics/gl/gl_sys_windows.cc +++ b/src/ballistica/base/graphics/gl/gl_sys_windows.cc @@ -3,6 +3,8 @@ #if BA_ENABLE_OPENGL && BA_OSTYPE_WINDOWS #include "ballistica/base/graphics/gl/gl_sys_windows.h" +#include + #include "SDL.h" #include "ballistica/base/graphics/gl/gl_sys.h" #include "ballistica/base/graphics/gl/renderer_gl.h" diff --git a/src/ballistica/base/graphics/gl/mesh/mesh_asset_data_gl.h b/src/ballistica/base/graphics/gl/mesh/mesh_asset_data_gl.h index edc34e1a..5190a191 100644 --- a/src/ballistica/base/graphics/gl/mesh/mesh_asset_data_gl.h +++ b/src/ballistica/base/graphics/gl/mesh/mesh_asset_data_gl.h @@ -5,12 +5,12 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/graphics/gl/gl_sys.h" #include "ballistica/base/graphics/gl/renderer_gl.h" #include "ballistica/base/graphics/graphics_server.h" -#include "ballistica/base/graphics/mesh/mesh_renderer_data.h" -#include "ballistica/shared/ballistica.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/mesh/mesh_data_gl.h b/src/ballistica/base/graphics/gl/mesh/mesh_data_gl.h index e902ef97..2ba8ffcf 100644 --- a/src/ballistica/base/graphics/gl/mesh/mesh_data_gl.h +++ b/src/ballistica/base/graphics/gl/mesh/mesh_data_gl.h @@ -3,9 +3,14 @@ #ifndef BALLISTICA_BASE_GRAPHICS_GL_MESH_MESH_DATA_GL_H_ #define BALLISTICA_BASE_GRAPHICS_GL_MESH_MESH_DATA_GL_H_ +#include "ballistica/base/graphics/mesh/mesh_index_buffer_16.h" +#include "ballistica/base/graphics/mesh/mesh_index_buffer_32.h" #if BA_ENABLE_OPENGL +#include "ballistica/base/app_adapter/app_adapter.h" +#include "ballistica/base/graphics/gl/renderer_gl.h" #include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/mesh/mesh_renderer_data.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_blur_gl.h b/src/ballistica/base/graphics/gl/program/program_blur_gl.h index 7d1deb27..05a212b6 100644 --- a/src/ballistica/base/graphics/gl/program/program_blur_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_blur_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_gl.h b/src/ballistica/base/graphics/gl/program/program_gl.h index 84f1f57b..dff358a8 100644 --- a/src/ballistica/base/graphics/gl/program/program_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_gl.h @@ -5,6 +5,9 @@ #if BA_ENABLE_OPENGL +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/graphics/gl/renderer_gl.h" #include "ballistica/base/graphics/graphics_server.h" diff --git a/src/ballistica/base/graphics/gl/program/program_object_gl.h b/src/ballistica/base/graphics/gl/program/program_object_gl.h index 7bb620db..d04cb2c7 100644 --- a/src/ballistica/base/graphics/gl/program/program_object_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_object_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_post_process_gl.h b/src/ballistica/base/graphics/gl/program/program_post_process_gl.h index 87c31d78..1a4e12b1 100644 --- a/src/ballistica/base/graphics/gl/program/program_post_process_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_post_process_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_shield_gl.h b/src/ballistica/base/graphics/gl/program/program_shield_gl.h index 16ad3724..2c2d9806 100644 --- a/src/ballistica/base/graphics/gl/program/program_shield_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_shield_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_simple_gl.h b/src/ballistica/base/graphics/gl/program/program_simple_gl.h index 23c85f48..45215fbf 100644 --- a/src/ballistica/base/graphics/gl/program/program_simple_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_simple_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { class RendererGL::ProgramSimpleGL : public RendererGL::ProgramGL { diff --git a/src/ballistica/base/graphics/gl/program/program_smoke_gl.h b/src/ballistica/base/graphics/gl/program/program_smoke_gl.h index e5050e1c..9d2cd0bb 100644 --- a/src/ballistica/base/graphics/gl/program/program_smoke_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_smoke_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/program/program_sprite_gl.h b/src/ballistica/base/graphics/gl/program/program_sprite_gl.h index da8625d0..0177ef69 100644 --- a/src/ballistica/base/graphics/gl/program/program_sprite_gl.h +++ b/src/ballistica/base/graphics/gl/program/program_sprite_gl.h @@ -5,9 +5,10 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/graphics/gl/program/program_gl.h" #include "ballistica/base/graphics/gl/renderer_gl.h" -#include "ballistica/base/graphics/graphics_server.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/gl/renderer_gl.cc b/src/ballistica/base/graphics/gl/renderer_gl.cc index 156f8630..a0814019 100644 --- a/src/ballistica/base/graphics/gl/renderer_gl.cc +++ b/src/ballistica/base/graphics/gl/renderer_gl.cc @@ -3,8 +3,14 @@ #if BA_ENABLE_OPENGL #include "ballistica/base/graphics/gl/renderer_gl.h" +#include +#include #include +#include +#include #include +#include +#include #include "ballistica/base/graphics/component/special_component.h" #include "ballistica/base/graphics/gl/mesh/mesh_asset_data_gl.h" diff --git a/src/ballistica/base/graphics/gl/texture_data_gl.h b/src/ballistica/base/graphics/gl/texture_data_gl.h index 71090184..3ba25ac1 100644 --- a/src/ballistica/base/graphics/gl/texture_data_gl.h +++ b/src/ballistica/base/graphics/gl/texture_data_gl.h @@ -5,6 +5,8 @@ #if BA_ENABLE_OPENGL +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/assets/texture_asset_preload_data.h" #include "ballistica/base/assets/texture_asset_renderer_data.h" diff --git a/src/ballistica/base/graphics/graphics.cc b/src/ballistica/base/graphics/graphics.cc index bbf66a55..892170f1 100644 --- a/src/ballistica/base/graphics/graphics.cc +++ b/src/ballistica/base/graphics/graphics.cc @@ -2,6 +2,11 @@ #include "ballistica/base/graphics/graphics.h" +#include +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/dynamics/bg/bg_dynamics.h" @@ -12,10 +17,13 @@ #include "ballistica/base/graphics/component/sprite_component.h" #include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/mesh/image_mesh.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" +#include "ballistica/base/graphics/mesh/sprite_mesh.h" #include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/graphics/support/net_graph.h" #include "ballistica/base/graphics/support/screen_messages.h" +#include "ballistica/base/graphics/text/text_group.h" #include "ballistica/base/input/input.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/support/python_context_call.h" diff --git a/src/ballistica/base/graphics/graphics_server.cc b/src/ballistica/base/graphics/graphics_server.cc index 08bae26e..1941fa11 100644 --- a/src/ballistica/base/graphics/graphics_server.cc +++ b/src/ballistica/base/graphics/graphics_server.cc @@ -2,7 +2,12 @@ #include "ballistica/base/graphics/graphics_server.h" +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" +#include "ballistica/base/assets/assets.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/base/graphics/graphics_vr.cc b/src/ballistica/base/graphics/graphics_vr.cc index 60c5484c..aa32901e 100644 --- a/src/ballistica/base/graphics/graphics_vr.cc +++ b/src/ballistica/base/graphics/graphics_vr.cc @@ -3,6 +3,8 @@ #include "ballistica/base/graphics/graphics_vr.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/simple_component.h" diff --git a/src/ballistica/base/graphics/mesh/nine_patch_mesh.h b/src/ballistica/base/graphics/mesh/nine_patch_mesh.h index 64b6638d..386c5869 100644 --- a/src/ballistica/base/graphics/mesh/nine_patch_mesh.h +++ b/src/ballistica/base/graphics/mesh/nine_patch_mesh.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_BASE_GRAPHICS_MESH_NINE_PATCH_MESH_H_ #define BALLISTICA_BASE_GRAPHICS_MESH_NINE_PATCH_MESH_H_ +#include + #include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/mesh/text_mesh.cc b/src/ballistica/base/graphics/mesh/text_mesh.cc index 6b735175..86722ac4 100644 --- a/src/ballistica/base/graphics/mesh/text_mesh.cc +++ b/src/ballistica/base/graphics/mesh/text_mesh.cc @@ -2,6 +2,10 @@ #include "ballistica/base/graphics/mesh/text_mesh.h" +#include +#include +#include + #include "ballistica/base/graphics/text/text_graphics.h" #include "ballistica/base/graphics/text/text_packer.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/graphics/renderer/render_pass.cc b/src/ballistica/base/graphics/renderer/render_pass.cc index e8bfd9b5..03f638bc 100644 --- a/src/ballistica/base/graphics/renderer/render_pass.cc +++ b/src/ballistica/base/graphics/renderer/render_pass.cc @@ -2,7 +2,11 @@ #include "ballistica/base/graphics/renderer/render_pass.h" +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/renderer/renderer.h" diff --git a/src/ballistica/base/graphics/renderer/renderer.cc b/src/ballistica/base/graphics/renderer/renderer.cc index c3cc98db..4695d416 100644 --- a/src/ballistica/base/graphics/renderer/renderer.cc +++ b/src/ballistica/base/graphics/renderer/renderer.cc @@ -2,11 +2,16 @@ #include "ballistica/base/graphics/renderer/renderer.h" +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" -#include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/core/core.h" #if BA_VR_BUILD +#include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/graphics_vr.h" #endif diff --git a/src/ballistica/base/graphics/renderer/renderer.h b/src/ballistica/base/graphics/renderer/renderer.h index 3bc6ccc2..f3c32fe2 100644 --- a/src/ballistica/base/graphics/renderer/renderer.h +++ b/src/ballistica/base/graphics/renderer/renderer.h @@ -3,42 +3,17 @@ #ifndef BALLISTICA_BASE_GRAPHICS_RENDERER_RENDERER_H_ #define BALLISTICA_BASE_GRAPHICS_RENDERER_RENDERER_H_ -#include #include #include -#include "ballistica/base/assets/assets.h" #include "ballistica/base/assets/mesh_asset.h" -#include "ballistica/base/graphics/graphics.h" -#include "ballistica/base/graphics/mesh/image_mesh.h" -#include "ballistica/base/graphics/mesh/mesh.h" -#include "ballistica/base/graphics/mesh/mesh_buffer.h" #include "ballistica/base/graphics/mesh/mesh_buffer_base.h" -#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_simple_full.h" -#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_smoke_full.h" -#include "ballistica/base/graphics/mesh/mesh_buffer_vertex_sprite.h" -#include "ballistica/base/graphics/mesh/mesh_data.h" #include "ballistica/base/graphics/mesh/mesh_data_client_handle.h" -#include "ballistica/base/graphics/mesh/mesh_index_buffer_16.h" -#include "ballistica/base/graphics/mesh/mesh_index_buffer_32.h" -#include "ballistica/base/graphics/mesh/mesh_indexed.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_dual_texture_full.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_object_split.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_simple_split.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_smoke_full.h" -#include "ballistica/base/graphics/mesh/mesh_indexed_static_dynamic.h" -#include "ballistica/base/graphics/mesh/mesh_non_indexed.h" -#include "ballistica/base/graphics/mesh/sprite_mesh.h" -#include "ballistica/base/graphics/mesh/text_mesh.h" -#include "ballistica/base/graphics/renderer/framebuffer.h" #include "ballistica/base/graphics/renderer/render_pass.h" #include "ballistica/base/graphics/renderer/render_target.h" #include "ballistica/base/graphics/support/frame_def.h" #include "ballistica/base/graphics/support/render_command_buffer.h" -#include "ballistica/base/graphics/text/text_group.h" #include "ballistica/shared/foundation/object.h" -#include "ballistica/shared/math/matrix44f.h" #include "ballistica/shared/math/vector3f.h" namespace ballistica::base { diff --git a/src/ballistica/base/graphics/support/camera.cc b/src/ballistica/base/graphics/support/camera.cc index 39b9b934..e8137cb9 100644 --- a/src/ballistica/base/graphics/support/camera.cc +++ b/src/ballistica/base/graphics/support/camera.cc @@ -2,6 +2,8 @@ #include "ballistica/base/graphics/support/camera.h" +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/graphics_vr.h" diff --git a/src/ballistica/base/graphics/support/frame_def.cc b/src/ballistica/base/graphics/support/frame_def.cc index 99d7e2a3..9c7c1e2c 100644 --- a/src/ballistica/base/graphics/support/frame_def.cc +++ b/src/ballistica/base/graphics/support/frame_def.cc @@ -2,9 +2,15 @@ #include "ballistica/base/graphics/support/frame_def.h" -#include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/graphics.h" +#include "ballistica/base/graphics/mesh/mesh.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_dual_texture_full.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_object_split.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_simple_split.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_smoke_full.h" +#include "ballistica/base/graphics/mesh/sprite_mesh.h" #include "ballistica/base/graphics/renderer/render_pass.h" -#include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/core/core.h" diff --git a/src/ballistica/base/graphics/support/net_graph.cc b/src/ballistica/base/graphics/support/net_graph.cc index 409fbfa2..38ed8e7f 100644 --- a/src/ballistica/base/graphics/support/net_graph.cc +++ b/src/ballistica/base/graphics/support/net_graph.cc @@ -2,7 +2,9 @@ #include "ballistica/base/graphics/support/net_graph.h" +#include #include +#include #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/mesh/image_mesh.h" diff --git a/src/ballistica/base/graphics/support/screen_messages.cc b/src/ballistica/base/graphics/support/screen_messages.cc index 83a3f519..79c52707 100644 --- a/src/ballistica/base/graphics/support/screen_messages.cc +++ b/src/ballistica/base/graphics/support/screen_messages.cc @@ -2,6 +2,10 @@ #include "ballistica/base/graphics/support/screen_messages.h" +#include +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/mesh/nine_patch_mesh.h" diff --git a/src/ballistica/base/graphics/support/screen_messages.h b/src/ballistica/base/graphics/support/screen_messages.h index 91652149..6cf4395b 100644 --- a/src/ballistica/base/graphics/support/screen_messages.h +++ b/src/ballistica/base/graphics/support/screen_messages.h @@ -3,6 +3,9 @@ #ifndef BALLISTICA_BASE_GRAPHICS_SUPPORT_SCREEN_MESSAGES_H_ #define BALLISTICA_BASE_GRAPHICS_SUPPORT_SCREEN_MESSAGES_H_ +#include +#include + #include "ballistica/base/base.h" #include "ballistica/shared/math/vector3f.h" diff --git a/src/ballistica/base/graphics/text/text_graphics.cc b/src/ballistica/base/graphics/text/text_graphics.cc index daddd6b4..3f3bbbc4 100644 --- a/src/ballistica/base/graphics/text/text_graphics.cc +++ b/src/ballistica/base/graphics/text/text_graphics.cc @@ -2,6 +2,14 @@ #include "ballistica/base/graphics/text/text_graphics.h" +#include +#include +#include +#include +#include +#include +#include + #include "ballistica/base/graphics/text/font_page_map_data.h" #include "ballistica/core/platform/core_platform.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/graphics/text/text_group.cc b/src/ballistica/base/graphics/text/text_group.cc index 71f85955..f92f372e 100644 --- a/src/ballistica/base/graphics/text/text_group.cc +++ b/src/ballistica/base/graphics/text/text_group.cc @@ -2,6 +2,12 @@ #include "ballistica/base/graphics/text/text_group.h" +#include +#include +#include +#include +#include + #include "ballistica/base/graphics/text/text_graphics.h" #include "ballistica/base/graphics/text/text_packer.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/graphics/text/text_packer.cc b/src/ballistica/base/graphics/text/text_packer.cc index fffd74b1..602e2c54 100644 --- a/src/ballistica/base/graphics/text/text_packer.cc +++ b/src/ballistica/base/graphics/text/text_packer.cc @@ -2,6 +2,9 @@ #include "ballistica/base/graphics/text/text_packer.h" +#include +#include + namespace ballistica::base { TextPacker::TextPacker(float resolution_scale) diff --git a/src/ballistica/base/graphics/texture/dds.cc b/src/ballistica/base/graphics/texture/dds.cc index b47aebd1..e2f9ec59 100644 --- a/src/ballistica/base/graphics/texture/dds.cc +++ b/src/ballistica/base/graphics/texture/dds.cc @@ -2,6 +2,10 @@ #include "ballistica/base/graphics/texture/dds.h" +#include +#include +#include + #include "ballistica/core/platform/core_platform.h" /* DDS loader written by Jon Watte 2002 */ diff --git a/src/ballistica/base/graphics/texture/pvr.cc b/src/ballistica/base/graphics/texture/pvr.cc index c2cc9125..f4fb8340 100644 --- a/src/ballistica/base/graphics/texture/pvr.cc +++ b/src/ballistica/base/graphics/texture/pvr.cc @@ -2,6 +2,10 @@ #include "ballistica/base/graphics/texture/pvr.h" +#include +#include +#include + #include "ballistica/core/platform/core_platform.h" namespace ballistica::base { diff --git a/src/ballistica/base/input/device/input_device.cc b/src/ballistica/base/input/device/input_device.cc index 4f0fd68e..d2947f8c 100644 --- a/src/ballistica/base/input/device/input_device.cc +++ b/src/ballistica/base/input/device/input_device.cc @@ -2,8 +2,8 @@ #include "ballistica/base/input/device/input_device.h" -#include -#include +#include +#include #include "ballistica/base/assets/assets.h" #include "ballistica/base/input/input.h" diff --git a/src/ballistica/base/input/device/input_device.h b/src/ballistica/base/input/device/input_device.h index e3f41b51..cca2b06c 100644 --- a/src/ballistica/base/input/device/input_device.h +++ b/src/ballistica/base/input/device/input_device.h @@ -4,7 +4,6 @@ #define BALLISTICA_BASE_INPUT_DEVICE_INPUT_DEVICE_H_ #include -#include #include "ballistica/base/input/device/input_device_delegate.h" #include "ballistica/shared/foundation/object.h" diff --git a/src/ballistica/base/input/device/input_device_delegate.cc b/src/ballistica/base/input/device/input_device_delegate.cc index 8d43d6b4..891f1adb 100644 --- a/src/ballistica/base/input/device/input_device_delegate.cc +++ b/src/ballistica/base/input/device/input_device_delegate.cc @@ -2,6 +2,8 @@ #include "ballistica/base/input/device/input_device_delegate.h" +#include + #include "ballistica/base/input/device/input_device.h" #include "ballistica/shared/math/vector3f.h" diff --git a/src/ballistica/base/input/device/input_device_delegate.h b/src/ballistica/base/input/device/input_device_delegate.h index 94437962..ac4da9c2 100644 --- a/src/ballistica/base/input/device/input_device_delegate.h +++ b/src/ballistica/base/input/device/input_device_delegate.h @@ -4,6 +4,7 @@ #define BALLISTICA_BASE_INPUT_DEVICE_INPUT_DEVICE_DELEGATE_H_ #include +#include #include "ballistica/base/base.h" #include "ballistica/shared/foundation/object.h" diff --git a/src/ballistica/base/input/device/joystick_input.cc b/src/ballistica/base/input/device/joystick_input.cc index 5a529ce4..14b0cecc 100644 --- a/src/ballistica/base/input/device/joystick_input.cc +++ b/src/ballistica/base/input/device/joystick_input.cc @@ -2,6 +2,10 @@ #include "ballistica/base/input/device/joystick_input.h" +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/assets/assets.h" #include "ballistica/base/input/input.h" diff --git a/src/ballistica/base/input/device/keyboard_input.cc b/src/ballistica/base/input/device/keyboard_input.cc index 28f2bfe3..7201316e 100644 --- a/src/ballistica/base/input/device/keyboard_input.cc +++ b/src/ballistica/base/input/device/keyboard_input.cc @@ -2,6 +2,8 @@ #include "ballistica/base/input/device/keyboard_input.h" +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/support/classic_soft.h" #include "ballistica/base/support/repeater.h" diff --git a/src/ballistica/base/input/device/test_input.cc b/src/ballistica/base/input/device/test_input.cc index 32bb42e3..d1d6c8ea 100644 --- a/src/ballistica/base/input/device/test_input.cc +++ b/src/ballistica/base/input/device/test_input.cc @@ -2,6 +2,8 @@ #include "ballistica/base/input/device/test_input.h" +#include + #include "ballistica/base/input/device/joystick_input.h" #include "ballistica/base/input/input.h" #include "ballistica/base/ui/ui.h" diff --git a/src/ballistica/base/input/device/touch_input.cc b/src/ballistica/base/input/device/touch_input.cc index b940e20a..5b2a8add 100644 --- a/src/ballistica/base/input/device/touch_input.cc +++ b/src/ballistica/base/input/device/touch_input.cc @@ -2,6 +2,11 @@ #include "ballistica/base/input/device/touch_input.h" +#include +#include +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/support/camera.h" diff --git a/src/ballistica/base/input/input.cc b/src/ballistica/base/input/input.cc index b754c0a9..1d5417d1 100644 --- a/src/ballistica/base/input/input.cc +++ b/src/ballistica/base/input/input.cc @@ -2,9 +2,14 @@ #include "ballistica/base/input/input.h" +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/audio/audio.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/input/device/joystick_input.h" #include "ballistica/base/input/device/keyboard_input.h" diff --git a/src/ballistica/base/input/support/remote_app_server.cc b/src/ballistica/base/input/support/remote_app_server.cc index 265c38ae..b127a942 100644 --- a/src/ballistica/base/input/support/remote_app_server.cc +++ b/src/ballistica/base/input/support/remote_app_server.cc @@ -2,6 +2,9 @@ #include "ballistica/base/input/support/remote_app_server.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/graphics.h" @@ -10,7 +13,7 @@ #include "ballistica/base/logic/logic.h" #include "ballistica/base/networking/network_reader.h" #include "ballistica/core/platform/core_platform.h" -#include "ballistica/core/platform/support/min_sdl.h" +#include "ballistica/core/platform/support/min_sdl.h" // IWYU pragma: keep. #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" diff --git a/src/ballistica/base/logic/logic.cc b/src/ballistica/base/logic/logic.cc index 3acc82fa..75d74e6a 100644 --- a/src/ballistica/base/logic/logic.cc +++ b/src/ballistica/base/logic/logic.cc @@ -4,9 +4,13 @@ #include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/audio/audio.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/input/input.h" #include "ballistica/base/networking/networking.h" #include "ballistica/base/platform/base_platform.h" diff --git a/src/ballistica/base/networking/network_reader.cc b/src/ballistica/base/networking/network_reader.cc index 44b48089..560e667c 100644 --- a/src/ballistica/base/networking/network_reader.cc +++ b/src/ballistica/base/networking/network_reader.cc @@ -2,6 +2,11 @@ #include "ballistica/base/networking/network_reader.h" +#include +#include +#include +#include + #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/input/support/remote_app_server.h" #include "ballistica/base/logic/logic.h" diff --git a/src/ballistica/base/networking/network_writer.cc b/src/ballistica/base/networking/network_writer.cc index 6c4704c8..2de1ebb8 100644 --- a/src/ballistica/base/networking/network_writer.cc +++ b/src/ballistica/base/networking/network_writer.cc @@ -2,6 +2,8 @@ #include "ballistica/base/networking/network_writer.h" +#include + #include "ballistica/base/base.h" #include "ballistica/base/networking/networking.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/base/networking/networking.cc b/src/ballistica/base/networking/networking.cc index 3b83f698..d60e396d 100644 --- a/src/ballistica/base/networking/networking.cc +++ b/src/ballistica/base/networking/networking.cc @@ -2,6 +2,8 @@ #include "ballistica/base/networking/networking.h" +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/networking/network_reader.h" #include "ballistica/base/support/app_config.h" diff --git a/src/ballistica/base/platform/apple/base_platform_apple.cc b/src/ballistica/base/platform/apple/base_platform_apple.cc index 30eada99..4acc20b2 100644 --- a/src/ballistica/base/platform/apple/base_platform_apple.cc +++ b/src/ballistica/base/platform/apple/base_platform_apple.cc @@ -3,6 +3,8 @@ #if BA_OSTYPE_MACOS || BA_OSTYPE_IOS_TVOS #include "ballistica/base/platform/apple/base_platform_apple.h" +#include + #if BA_XCODE_BUILD #include "ballistica/base/platform/apple/from_swift.h" #endif diff --git a/src/ballistica/base/platform/apple/base_platform_apple.h b/src/ballistica/base/platform/apple/base_platform_apple.h index 7d8c8864..9f355462 100644 --- a/src/ballistica/base/platform/apple/base_platform_apple.h +++ b/src/ballistica/base/platform/apple/base_platform_apple.h @@ -4,8 +4,9 @@ #define BALLISTICA_BASE_PLATFORM_APPLE_BASE_PLATFORM_APPLE_H_ #if BA_OSTYPE_MACOS || BA_OSTYPE_IOS_TVOS -#include "ballistica/base/platform/base_platform.h" +#include +#include "ballistica/base/platform/base_platform.h" namespace ballistica::base { class BasePlatformApple : public BasePlatform { diff --git a/src/ballistica/base/platform/base_platform.cc b/src/ballistica/base/platform/base_platform.cc index dcaf72c2..1bd1c068 100644 --- a/src/ballistica/base/platform/base_platform.cc +++ b/src/ballistica/base/platform/base_platform.cc @@ -3,23 +3,25 @@ #include "ballistica/base/platform/base_platform.h" #include +#include +#include +#include #if !BA_OSTYPE_WINDOWS #include #include #endif +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/base.h" -#include "ballistica/base/input/input.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/base_python.h" -#include "ballistica/base/ui/ui.h" #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::base { diff --git a/src/ballistica/base/platform/base_platform.h b/src/ballistica/base/platform/base_platform.h index def25e98..f9e9917d 100644 --- a/src/ballistica/base/platform/base_platform.h +++ b/src/ballistica/base/platform/base_platform.h @@ -3,8 +3,10 @@ #ifndef BALLISTICA_BASE_PLATFORM_BASE_PLATFORM_H_ #define BALLISTICA_BASE_PLATFORM_BASE_PLATFORM_H_ +#include #include #include +#include #include "ballistica/base/base.h" #include "ballistica/shared/python/python_ref.h" diff --git a/src/ballistica/base/platform/support/min_sdl_key_names.h b/src/ballistica/base/platform/support/min_sdl_key_names.h index 64c57704..df8172b7 100644 --- a/src/ballistica/base/platform/support/min_sdl_key_names.h +++ b/src/ballistica/base/platform/support/min_sdl_key_names.h @@ -3,7 +3,9 @@ #ifndef BALLISTICA_BASE_PLATFORM_SUPPORT_MIN_SDL_KEY_NAMES_H_ #define BALLISTICA_BASE_PLATFORM_SUPPORT_MIN_SDL_KEY_NAMES_H_ -#include "ballistica/base/input/device/keyboard_input.h" +#include // IWYU pragma: keep. + +#include "ballistica/base/input/device/keyboard_input.h" // IWYU pragma: keep. namespace ballistica::base { diff --git a/src/ballistica/base/platform/windows/base_platform_windows.cc b/src/ballistica/base/platform/windows/base_platform_windows.cc index ea3dd39b..6ce7330b 100644 --- a/src/ballistica/base/platform/windows/base_platform_windows.cc +++ b/src/ballistica/base/platform/windows/base_platform_windows.cc @@ -12,6 +12,8 @@ #include #include +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/core/platform/windows/core_platform_windows.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/base/python/base_python.cc b/src/ballistica/base/python/base_python.cc index cec3b878..8afe4a06 100644 --- a/src/ballistica/base/python/base_python.cc +++ b/src/ballistica/base/python/base_python.cc @@ -2,6 +2,9 @@ #include "ballistica/base/python/base_python.h" +#include +#include + #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/python/class/python_class_app_timer.h" #include "ballistica/base/python/class/python_class_context_call.h" @@ -14,7 +17,7 @@ #include "ballistica/base/python/methods/python_methods_base_1.h" #include "ballistica/base/python/methods/python_methods_base_2.h" #include "ballistica/base/python/methods/python_methods_base_3.h" -#include "ballistica/shared/python/python_command.h" +#include "ballistica/shared/python/python_command.h" // IWYU pragma: keep. #include "ballistica/shared/python/python_module_builder.h" namespace ballistica::base { diff --git a/src/ballistica/base/python/base_python.h b/src/ballistica/base/python/base_python.h index 479cde21..289e975e 100644 --- a/src/ballistica/base/python/base_python.h +++ b/src/ballistica/base/python/base_python.h @@ -4,6 +4,8 @@ #define BALLISTICA_BASE_PYTHON_BASE_PYTHON_H_ #include +#include +#include #include "ballistica/base/base.h" #include "ballistica/shared/python/python_object_set.h" diff --git a/src/ballistica/base/python/class/python_class_app_timer.cc b/src/ballistica/base/python/class/python_class_app_timer.cc index 1ef19306..1c9452c4 100644 --- a/src/ballistica/base/python/class/python_class_app_timer.cc +++ b/src/ballistica/base/python/class/python_class_app_timer.cc @@ -2,11 +2,13 @@ #include "ballistica/base/python/class/python_class_app_timer.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/base_python.h" #include "ballistica/base/python/support/python_context_call_runnable.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" +#include "ballistica/shared/python/python_sys.h" namespace ballistica::base { diff --git a/src/ballistica/base/python/class/python_class_context_call.cc b/src/ballistica/base/python/class/python_class_context_call.cc index 3dad799a..d43b1629 100644 --- a/src/ballistica/base/python/class/python_class_context_call.cc +++ b/src/ballistica/base/python/class/python_class_context_call.cc @@ -2,10 +2,11 @@ #include "ballistica/base/python/class/python_class_context_call.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::base { diff --git a/src/ballistica/base/python/class/python_class_context_ref.cc b/src/ballistica/base/python/class/python_class_context_ref.cc index e32fb729..329ced90 100644 --- a/src/ballistica/base/python/class/python_class_context_ref.cc +++ b/src/ballistica/base/python/class/python_class_context_ref.cc @@ -2,9 +2,10 @@ #include "ballistica/base/python/class/python_class_context_ref.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::base { diff --git a/src/ballistica/base/python/class/python_class_display_timer.cc b/src/ballistica/base/python/class/python_class_display_timer.cc index d95d7918..ea84dffc 100644 --- a/src/ballistica/base/python/class/python_class_display_timer.cc +++ b/src/ballistica/base/python/class/python_class_display_timer.cc @@ -2,11 +2,12 @@ #include "ballistica/base/python/class/python_class_display_timer.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/base_python.h" #include "ballistica/base/python/support/python_context_call_runnable.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::base { diff --git a/src/ballistica/base/python/class/python_class_env.cc b/src/ballistica/base/python/class/python_class_env.cc index c84055c5..273a9102 100644 --- a/src/ballistica/base/python/class/python_class_env.cc +++ b/src/ballistica/base/python/class/python_class_env.cc @@ -2,8 +2,12 @@ #include "ballistica/base/python/class/python_class_env.h" +#include +#include + #include "ballistica/base/base.h" #include "ballistica/core/platform/core_platform.h" + namespace ballistica::base { struct EnvEntry_ { diff --git a/src/ballistica/base/python/class/python_class_env.h b/src/ballistica/base/python/class/python_class_env.h index dcca64c5..f7aeee24 100644 --- a/src/ballistica/base/python/class/python_class_env.h +++ b/src/ballistica/base/python/class/python_class_env.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_ENV_H_ #define BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_ENV_H_ +#include + #include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_class.h" diff --git a/src/ballistica/base/python/class/python_class_feature_set_data.h b/src/ballistica/base/python/class/python_class_feature_set_data.h index f9283d4d..bde9d61a 100644 --- a/src/ballistica/base/python/class/python_class_feature_set_data.h +++ b/src/ballistica/base/python/class/python_class_feature_set_data.h @@ -3,7 +3,8 @@ #ifndef BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_FEATURE_SET_DATA_H_ #define BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_FEATURE_SET_DATA_H_ -#include "ballistica/shared/foundation/object.h" +#include + #include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_class.h" diff --git a/src/ballistica/base/python/class/python_class_simple_sound.cc b/src/ballistica/base/python/class/python_class_simple_sound.cc index 5145243b..881b24ff 100644 --- a/src/ballistica/base/python/class/python_class_simple_sound.cc +++ b/src/ballistica/base/python/class/python_class_simple_sound.cc @@ -2,6 +2,8 @@ #include "ballistica/base/python/class/python_class_simple_sound.h" +#include + #include "ballistica/base/assets/sound_asset.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/logic/logic.h" diff --git a/src/ballistica/base/python/class/python_class_simple_sound.h b/src/ballistica/base/python/class/python_class_simple_sound.h index 6f4e3e69..9ad20d51 100644 --- a/src/ballistica/base/python/class/python_class_simple_sound.h +++ b/src/ballistica/base/python/class/python_class_simple_sound.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_SIMPLE_SOUND_H_ #define BALLISTICA_BASE_PYTHON_CLASS_PYTHON_CLASS_SIMPLE_SOUND_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/foundation/object.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/base/python/class/python_class_vec3.cc b/src/ballistica/base/python/class/python_class_vec3.cc index cbf96e4d..553f4f7b 100644 --- a/src/ballistica/base/python/class/python_class_vec3.cc +++ b/src/ballistica/base/python/class/python_class_vec3.cc @@ -2,6 +2,9 @@ #include "ballistica/base/python/class/python_class_vec3.h" +#include +#include + #include "ballistica/base/python/base_python.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/base/python/methods/python_methods_base_1.cc b/src/ballistica/base/python/methods/python_methods_base_1.cc index 0b63f144..98d77428 100644 --- a/src/ballistica/base/python/methods/python_methods_base_1.cc +++ b/src/ballistica/base/python/methods/python_methods_base_1.cc @@ -2,6 +2,11 @@ #include "ballistica/base/python/methods/python_methods_base_1.h" +#include +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/empty_app_mode.h" #include "ballistica/base/audio/audio_server.h" diff --git a/src/ballistica/base/python/methods/python_methods_base_2.cc b/src/ballistica/base/python/methods/python_methods_base_2.cc index 508724ec..6f2d6040 100644 --- a/src/ballistica/base/python/methods/python_methods_base_2.cc +++ b/src/ballistica/base/python/methods/python_methods_base_2.cc @@ -2,16 +2,18 @@ #include "ballistica/base/python/methods/python_methods_base_2.h" +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/graphics/support/screen_messages.h" #include "ballistica/base/graphics/text/text_graphics.h" -#include "ballistica/base/logic/logic.h" #include "ballistica/base/platform/base_platform.h" #include "ballistica/base/python/base_python.h" -#include "ballistica/base/python/support/python_context_call_runnable.h" +#include "ballistica/base/python/support/python_context_call.h" #include "ballistica/base/ui/ui.h" #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/base/python/methods/python_methods_base_3.cc b/src/ballistica/base/python/methods/python_methods_base_3.cc index de15d716..e4b6afa8 100644 --- a/src/ballistica/base/python/methods/python_methods_base_3.cc +++ b/src/ballistica/base/python/methods/python_methods_base_3.cc @@ -3,11 +3,14 @@ #include "ballistica/base/python/methods/python_methods_base_3.h" #include +#include #include +#include #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/assets/sound_asset.h" // IWYU pragma: keep. +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/input/input.h" #include "ballistica/base/platform/base_platform.h" #include "ballistica/base/python/base_python.h" diff --git a/src/ballistica/base/python/support/python_context_call.cc b/src/ballistica/base/python/support/python_context_call.cc index 534723d0..0d50f2e1 100644 --- a/src/ballistica/base/python/support/python_context_call.cc +++ b/src/ballistica/base/python/support/python_context_call.cc @@ -2,6 +2,8 @@ #include "ballistica/base/python/support/python_context_call.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/ui/ui.h" #include "ballistica/core/python/core_python.h" diff --git a/src/ballistica/base/support/app_config.cc b/src/ballistica/base/support/app_config.cc index d7ee21c0..2704b7b1 100644 --- a/src/ballistica/base/support/app_config.cc +++ b/src/ballistica/base/support/app_config.cc @@ -2,11 +2,13 @@ #include "ballistica/base/support/app_config.h" +#include +#include + #include "ballistica/base/python/base_python.h" #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" #include "ballistica/shared/ballistica.h" -#include "ballistica/shared/python/python.h" namespace ballistica::base { diff --git a/src/ballistica/base/support/context.cc b/src/ballistica/base/support/context.cc index fefd6a3b..f2a0c673 100644 --- a/src/ballistica/base/support/context.cc +++ b/src/ballistica/base/support/context.cc @@ -2,6 +2,8 @@ #include "ballistica/base/support/context.h" +#include + namespace ballistica::base { ContextRef::ContextRef() diff --git a/src/ballistica/base/support/huffman.cc b/src/ballistica/base/support/huffman.cc index dd0f94d6..b04805e5 100644 --- a/src/ballistica/base/support/huffman.cc +++ b/src/ballistica/base/support/huffman.cc @@ -2,6 +2,9 @@ #include "ballistica/base/support/huffman.h" +#include +#include + #include "ballistica/base/networking/networking.h" namespace ballistica::base { diff --git a/src/ballistica/base/support/stdio_console.cc b/src/ballistica/base/support/stdio_console.cc index fc5a3271..000ada76 100644 --- a/src/ballistica/base/support/stdio_console.cc +++ b/src/ballistica/base/support/stdio_console.cc @@ -2,7 +2,10 @@ #include "ballistica/base/support/stdio_console.h" -#include +#include + +#include +#include #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" @@ -12,7 +15,6 @@ #include "ballistica/core/platform/core_platform.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/python/python_command.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::base { diff --git a/src/ballistica/base/support/stdio_console.h b/src/ballistica/base/support/stdio_console.h index 14bcef1d..b047efee 100644 --- a/src/ballistica/base/support/stdio_console.h +++ b/src/ballistica/base/support/stdio_console.h @@ -3,9 +3,9 @@ #ifndef BALLISTICA_BASE_SUPPORT_STDIO_CONSOLE_H_ #define BALLISTICA_BASE_SUPPORT_STDIO_CONSOLE_H_ -#include +#include -#include "ballistica/shared/ballistica.h" +#include "ballistica/shared/foundation/types.h" namespace ballistica::base { diff --git a/src/ballistica/base/ui/dev_console.cc b/src/ballistica/base/ui/dev_console.cc index abb2b810..ad4beb7c 100644 --- a/src/ballistica/base/ui/dev_console.cc +++ b/src/ballistica/base/ui/dev_console.cc @@ -4,6 +4,12 @@ #include +#include +#include +#include +#include +#include + #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/audio/audio.h" diff --git a/src/ballistica/base/ui/dev_console.h b/src/ballistica/base/ui/dev_console.h index 032bfe49..221cfc71 100644 --- a/src/ballistica/base/ui/dev_console.h +++ b/src/ballistica/base/ui/dev_console.h @@ -5,10 +5,10 @@ #include #include -#include #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/mesh/image_mesh.h" +#include "ballistica/base/graphics/text/text_group.h" #include "ballistica/shared/foundation/object.h" #include "ballistica/shared/python/python_ref.h" diff --git a/src/ballistica/base/ui/ui.cc b/src/ballistica/base/ui/ui.cc index c053f9ad..b3195075 100644 --- a/src/ballistica/base/ui/ui.cc +++ b/src/ballistica/base/ui/ui.cc @@ -3,6 +3,8 @@ #include "ballistica/base/ui/ui.h" #include +#include +#include #include "ballistica/base/app_adapter/app_adapter.h" #include "ballistica/base/audio/audio.h" diff --git a/src/ballistica/base/ui/ui.h b/src/ballistica/base/ui/ui.h index 9e12aa04..28567f41 100644 --- a/src/ballistica/base/ui/ui.h +++ b/src/ballistica/base/ui/ui.h @@ -4,6 +4,7 @@ #define BALLISTICA_BASE_UI_UI_H_ #include +#include #include "ballistica/base/graphics/support/frame_def.h" #include "ballistica/base/ui/widget_message.h" diff --git a/src/ballistica/base/ui/ui_delegate.h b/src/ballistica/base/ui/ui_delegate.h index 5ab15bea..e87955d6 100644 --- a/src/ballistica/base/ui/ui_delegate.h +++ b/src/ballistica/base/ui/ui_delegate.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_BASE_UI_UI_DELEGATE_H_ #define BALLISTICA_BASE_UI_UI_DELEGATE_H_ +#include + #include "ballistica/base/ui/ui.h" // Predeclare some types we use. diff --git a/src/ballistica/classic/classic.cc b/src/ballistica/classic/classic.cc index 56a42e41..31e50172 100644 --- a/src/ballistica/classic/classic.cc +++ b/src/ballistica/classic/classic.cc @@ -2,7 +2,9 @@ #include "ballistica/classic/classic.h" -#include "ballistica/base/support/app_timer.h" +#include +#include + #include "ballistica/classic/python/classic_python.h" #include "ballistica/classic/support/stress_test.h" #include "ballistica/classic/support/v1_account.h" diff --git a/src/ballistica/classic/classic.h b/src/ballistica/classic/classic.h index 0d01d7a5..6bd3d56d 100644 --- a/src/ballistica/classic/classic.h +++ b/src/ballistica/classic/classic.h @@ -5,6 +5,9 @@ #include +#include +#include + #include "ballistica/base/support/classic_soft.h" #include "ballistica/shared/foundation/feature_set_native_component.h" diff --git a/src/ballistica/classic/python/classic_python.cc b/src/ballistica/classic/python/classic_python.cc index 1c1219c7..cfd3b966 100644 --- a/src/ballistica/classic/python/classic_python.cc +++ b/src/ballistica/classic/python/classic_python.cc @@ -2,10 +2,13 @@ #include "ballistica/classic/python/classic_python.h" +#include + #include "ballistica/classic/python/methods/python_methods_classic.h" #include "ballistica/classic/support/classic_app_mode.h" -#include "ballistica/shared/python/python_command.h" +#include "ballistica/shared/python/python_command.h" // IWYU pragma: keep. #include "ballistica/shared/python/python_module_builder.h" +#include "ballistica/shared/python/python_sys.h" namespace ballistica::classic { diff --git a/src/ballistica/classic/python/classic_python.h b/src/ballistica/classic/python/classic_python.h index b7f7ecc3..b02f885a 100644 --- a/src/ballistica/classic/python/classic_python.h +++ b/src/ballistica/classic/python/classic_python.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_CLASSIC_PYTHON_CLASSIC_PYTHON_H_ #define BALLISTICA_CLASSIC_PYTHON_CLASSIC_PYTHON_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/classic/classic.h" #include "ballistica/shared/python/python_object_set.h" diff --git a/src/ballistica/classic/python/methods/python_methods_classic.cc b/src/ballistica/classic/python/methods/python_methods_classic.cc index eb442393..ec99f2ab 100644 --- a/src/ballistica/classic/python/methods/python_methods_classic.cc +++ b/src/ballistica/classic/python/methods/python_methods_classic.cc @@ -2,6 +2,10 @@ #include "ballistica/classic/python/methods/python_methods_classic.h" +#include +#include +#include + #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/input/input.h" diff --git a/src/ballistica/classic/support/classic_app_mode.cc b/src/ballistica/classic/support/classic_app_mode.cc index ac7fb69f..90618017 100644 --- a/src/ballistica/classic/support/classic_app_mode.cc +++ b/src/ballistica/classic/support/classic_app_mode.cc @@ -2,6 +2,11 @@ #include "ballistica/classic/support/classic_app_mode.h" +#include +#include +#include +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/audio/audio_source.h" #include "ballistica/base/graphics/graphics.h" diff --git a/src/ballistica/classic/support/classic_app_mode.h b/src/ballistica/classic/support/classic_app_mode.h index 223ffe74..d0711c3f 100644 --- a/src/ballistica/classic/support/classic_app_mode.h +++ b/src/ballistica/classic/support/classic_app_mode.h @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/base.h" diff --git a/src/ballistica/classic/support/stress_test.h b/src/ballistica/classic/support/stress_test.h index 7c17c805..1a062ba5 100644 --- a/src/ballistica/classic/support/stress_test.h +++ b/src/ballistica/classic/support/stress_test.h @@ -3,8 +3,10 @@ #ifndef BALLISTICA_CLASSIC_SUPPORT_STRESS_TEST_H_ #define BALLISTICA_CLASSIC_SUPPORT_STRESS_TEST_H_ +#include + #include "ballistica/base/base.h" -#include "ballistica/shared/ballistica.h" +#include "ballistica/base/support/app_timer.h" #include "ballistica/shared/foundation/object.h" namespace ballistica::classic { diff --git a/src/ballistica/classic/support/v1_account.cc b/src/ballistica/classic/support/v1_account.cc index 05c3631d..5da691fc 100644 --- a/src/ballistica/classic/support/v1_account.cc +++ b/src/ballistica/classic/support/v1_account.cc @@ -2,6 +2,10 @@ #include "ballistica/classic/support/v1_account.h" +#include +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/support/plus_soft.h" diff --git a/src/ballistica/core/core.cc b/src/ballistica/core/core.cc index 5cf8fb3f..d6adf3f4 100644 --- a/src/ballistica/core/core.cc +++ b/src/ballistica/core/core.cc @@ -2,13 +2,16 @@ #include "ballistica/core/core.h" +#include #include +#include #include +#include #include "ballistica/core/platform/core_platform.h" #include "ballistica/core/python/core_python.h" -#include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/foundation/types.h" +#include "ballistica/shared/generic/runnable.h" namespace ballistica::core { diff --git a/src/ballistica/core/platform/apple/core_platform_apple.cc b/src/ballistica/core/platform/apple/core_platform_apple.cc index a0a6df03..484a8161 100644 --- a/src/ballistica/core/platform/apple/core_platform_apple.cc +++ b/src/ballistica/core/platform/apple/core_platform_apple.cc @@ -10,11 +10,18 @@ #include +#include +#include +#include +#include + #if BA_XCODE_BUILD #include "ballistica/base/platform/apple/from_swift.h" #include "ballistica/shared/math/rect.h" #endif +#include "ballistica/shared/ballistica.h" + #if BA_XCODE_BUILD // This needs to be below ballistica headers since it relies on // some types in them but does not include headers itself. diff --git a/src/ballistica/core/platform/core_platform.cc b/src/ballistica/core/platform/core_platform.cc index d03596a6..da46d639 100644 --- a/src/ballistica/core/platform/core_platform.cc +++ b/src/ballistica/core/platform/core_platform.cc @@ -2,7 +2,10 @@ #include "ballistica/core/platform/core_platform.h" -#include +#include +#include +#include +#include #if !BA_OSTYPE_WINDOWS #include @@ -24,14 +27,12 @@ #include #endif -#include "ballistica/core/platform/support/min_sdl.h" +#include "ballistica/core/core.h" +#include "ballistica/core/platform/support/min_sdl.h" // IWYU pragma: keep. #include "ballistica/core/support/base_soft.h" -#include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/native_stack_trace.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/networking/networking_sys.h" -#include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" +#include "ballistica/shared/networking/networking_sys.h" // IWYU pragma: keep. // ------------------------- PLATFORM SELECTION -------------------------------- diff --git a/src/ballistica/core/platform/core_platform.h b/src/ballistica/core/platform/core_platform.h index 7be064b3..1a267f0f 100644 --- a/src/ballistica/core/platform/core_platform.h +++ b/src/ballistica/core/platform/core_platform.h @@ -5,12 +5,13 @@ #include +#include #include #include #include #include -#include "ballistica/shared/ballistica.h" +#include "ballistica/shared/foundation/types.h" namespace ballistica::core { diff --git a/src/ballistica/core/platform/linux/core_platform_linux.cc b/src/ballistica/core/platform/linux/core_platform_linux.cc index 96686f14..0dfef8f5 100644 --- a/src/ballistica/core/platform/linux/core_platform_linux.cc +++ b/src/ballistica/core/platform/linux/core_platform_linux.cc @@ -5,10 +5,14 @@ #include +#include #include #include +#include #include +#include "ballistica/shared/ballistica.h" + namespace ballistica::core { CorePlatformLinux::CorePlatformLinux() {} diff --git a/src/ballistica/core/platform/linux/core_platform_linux.h b/src/ballistica/core/platform/linux/core_platform_linux.h index d37e1113..6f304b3a 100644 --- a/src/ballistica/core/platform/linux/core_platform_linux.h +++ b/src/ballistica/core/platform/linux/core_platform_linux.h @@ -4,6 +4,7 @@ #define BALLISTICA_CORE_PLATFORM_LINUX_CORE_PLATFORM_LINUX_H_ #if BA_OSTYPE_LINUX +#include #include #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/core/platform/windows/core_platform_windows.cc b/src/ballistica/core/platform/windows/core_platform_windows.cc index 7e0d8442..f594aac8 100644 --- a/src/ballistica/core/platform/windows/core_platform_windows.cc +++ b/src/ballistica/core/platform/windows/core_platform_windows.cc @@ -19,6 +19,11 @@ #include /* clang-format on */ +#include +#include +#include +#include + #pragma comment(lib, "Rpcrt4.lib") #pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "iphlpapi.lib") diff --git a/src/ballistica/core/platform/windows/core_platform_windows.h b/src/ballistica/core/platform/windows/core_platform_windows.h index 4943e85e..ea772374 100644 --- a/src/ballistica/core/platform/windows/core_platform_windows.h +++ b/src/ballistica/core/platform/windows/core_platform_windows.h @@ -4,6 +4,8 @@ #define BALLISTICA_CORE_PLATFORM_WINDOWS_CORE_PLATFORM_WINDOWS_H_ #if BA_OSTYPE_WINDOWS +#include +#include #include #include #include diff --git a/src/ballistica/core/python/core_python.cc b/src/ballistica/core/python/core_python.cc index a5674712..ebf2ed77 100644 --- a/src/ballistica/core/python/core_python.cc +++ b/src/ballistica/core/python/core_python.cc @@ -2,9 +2,12 @@ #include "ballistica/core/python/core_python.h" +#include +#include +#include + #include "ballistica/core/mgen/python_modules_monolithic.h" #include "ballistica/core/platform/core_platform.h" -#include "ballistica/core/support/base_soft.h" #include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_command.h" diff --git a/src/ballistica/core/python/core_python.h b/src/ballistica/core/python/core_python.h index fef471f4..63900110 100644 --- a/src/ballistica/core/python/core_python.h +++ b/src/ballistica/core/python/core_python.h @@ -5,6 +5,8 @@ #include #include +#include +#include #include "ballistica/core/core.h" #include "ballistica/shared/python/python_object_set.h" diff --git a/src/ballistica/core/support/base_soft.h b/src/ballistica/core/support/base_soft.h index f45d661d..bde97e10 100644 --- a/src/ballistica/core/support/base_soft.h +++ b/src/ballistica/core/support/base_soft.h @@ -3,8 +3,9 @@ #ifndef BALLISTICA_CORE_SUPPORT_BASE_SOFT_H_ #define BALLISTICA_CORE_SUPPORT_BASE_SOFT_H_ -#include "ballistica/core/core.h" -#include "ballistica/shared/ballistica.h" +#include + +#include "ballistica/shared/math/vector3f.h" namespace ballistica::core { diff --git a/src/ballistica/core/support/core_config.cc b/src/ballistica/core/support/core_config.cc index f18b08e4..4c5bb8ae 100644 --- a/src/ballistica/core/support/core_config.cc +++ b/src/ballistica/core/support/core_config.cc @@ -2,8 +2,10 @@ #include "ballistica/core/support/core_config.h" +#include #include #include +#include // Note to self: this stuff gets used before *any* of the engine is inited // so we can't use engine functionality at all here. diff --git a/src/ballistica/scene_v1/assets/scene_asset.cc b/src/ballistica/scene_v1/assets/scene_asset.cc index 9c1312dd..b94dca63 100644 --- a/src/ballistica/scene_v1/assets/scene_asset.cc +++ b/src/ballistica/scene_v1/assets/scene_asset.cc @@ -2,8 +2,12 @@ #include "ballistica/scene_v1/assets/scene_asset.h" +#include + +#include +#include + #include "ballistica/scene_v1/support/scene.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/assets/scene_collision_mesh.cc b/src/ballistica/scene_v1/assets/scene_collision_mesh.cc index 61ca8323..36874204 100644 --- a/src/ballistica/scene_v1/assets/scene_collision_mesh.cc +++ b/src/ballistica/scene_v1/assets/scene_collision_mesh.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/assets/scene_collision_mesh.h" +#include + #include "ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" diff --git a/src/ballistica/scene_v1/assets/scene_cube_map_texture.cc b/src/ballistica/scene_v1/assets/scene_cube_map_texture.cc index cb1c7629..30164e7d 100644 --- a/src/ballistica/scene_v1/assets/scene_cube_map_texture.cc +++ b/src/ballistica/scene_v1/assets/scene_cube_map_texture.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/assets/scene_cube_map_texture.h" +#include + #include "ballistica/base/assets/assets.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/assets/scene_data_asset.cc b/src/ballistica/scene_v1/assets/scene_data_asset.cc index f4c34596..98f6f7e4 100644 --- a/src/ballistica/scene_v1/assets/scene_data_asset.cc +++ b/src/ballistica/scene_v1/assets/scene_data_asset.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/assets/scene_data_asset.h" +#include + #include "ballistica/scene_v1/python/class/python_class_scene_data_asset.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" diff --git a/src/ballistica/scene_v1/assets/scene_mesh.cc b/src/ballistica/scene_v1/assets/scene_mesh.cc index be0e13f1..5db1a85a 100644 --- a/src/ballistica/scene_v1/assets/scene_mesh.cc +++ b/src/ballistica/scene_v1/assets/scene_mesh.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/assets/scene_mesh.h" +#include + #include "ballistica/scene_v1/python/class/python_class_scene_mesh.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" diff --git a/src/ballistica/scene_v1/assets/scene_sound.cc b/src/ballistica/scene_v1/assets/scene_sound.cc index bc8a4dfd..f26086bf 100644 --- a/src/ballistica/scene_v1/assets/scene_sound.cc +++ b/src/ballistica/scene_v1/assets/scene_sound.cc @@ -2,8 +2,9 @@ #include "ballistica/scene_v1/assets/scene_sound.h" +#include + #include "ballistica/base/assets/assets.h" -#include "ballistica/base/assets/sound_asset.h" #include "ballistica/scene_v1/python/class/python_class_scene_sound.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" diff --git a/src/ballistica/scene_v1/assets/scene_sound.h b/src/ballistica/scene_v1/assets/scene_sound.h index 4ba8d360..01d0bfb0 100644 --- a/src/ballistica/scene_v1/assets/scene_sound.h +++ b/src/ballistica/scene_v1/assets/scene_sound.h @@ -4,8 +4,8 @@ #define BALLISTICA_SCENE_V1_ASSETS_SCENE_SOUND_H_ #include -#include +#include "ballistica/base/assets/sound_asset.h" #include "ballistica/base/base.h" #include "ballistica/scene_v1/assets/scene_asset.h" diff --git a/src/ballistica/scene_v1/assets/scene_texture.cc b/src/ballistica/scene_v1/assets/scene_texture.cc index a7309927..d57760fb 100644 --- a/src/ballistica/scene_v1/assets/scene_texture.cc +++ b/src/ballistica/scene_v1/assets/scene_texture.cc @@ -2,7 +2,9 @@ #include "ballistica/scene_v1/assets/scene_texture.h" -#include "ballistica/base/graphics/renderer/renderer.h" +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/scene_v1/python/class/python_class_scene_texture.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" diff --git a/src/ballistica/scene_v1/connection/connection.cc b/src/ballistica/scene_v1/connection/connection.cc index 8ad19be4..36daa542 100644 --- a/src/ballistica/scene_v1/connection/connection.cc +++ b/src/ballistica/scene_v1/connection/connection.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/connection/connection.h" +#include +#include + #include "ballistica/base/base.h" #include "ballistica/base/networking/networking.h" #include "ballistica/base/support/huffman.h" @@ -9,7 +12,6 @@ #include "ballistica/core/platform/core_platform.h" #include "ballistica/scene_v1/scene_v1.h" #include "ballistica/shared/generic/json.h" -#include "ballistica/shared/generic/utils.h" #include "ballistica/shared/math/vector3f.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/connection/connection_set.cc b/src/ballistica/scene_v1/connection/connection_set.cc index 78dafb0c..1f318416 100644 --- a/src/ballistica/scene_v1/connection/connection_set.cc +++ b/src/ballistica/scene_v1/connection/connection_set.cc @@ -2,6 +2,11 @@ #include "ballistica/scene_v1/connection/connection_set.h" +#include + +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/networking/network_writer.h" #include "ballistica/classic/support/classic_app_mode.h" @@ -12,7 +17,6 @@ #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/connection/connection_to_client.cc b/src/ballistica/scene_v1/connection/connection_to_client.cc index 4c011d8c..458bf421 100644 --- a/src/ballistica/scene_v1/connection/connection_to_client.cc +++ b/src/ballistica/scene_v1/connection/connection_to_client.cc @@ -2,6 +2,11 @@ #include "ballistica/scene_v1/connection/connection_to_client.h" +#include + +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/networking/networking.h" @@ -17,7 +22,6 @@ #include "ballistica/scene_v1/support/host_session.h" #include "ballistica/shared/generic/json.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/connection/connection_to_client_udp.cc b/src/ballistica/scene_v1/connection/connection_to_client_udp.cc index fd07e855..805336db 100644 --- a/src/ballistica/scene_v1/connection/connection_to_client_udp.cc +++ b/src/ballistica/scene_v1/connection/connection_to_client_udp.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/connection/connection_to_client_udp.h" +#include +#include +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/networking/network_writer.h" #include "ballistica/classic/support/classic_app_mode.h" diff --git a/src/ballistica/scene_v1/connection/connection_to_host.cc b/src/ballistica/scene_v1/connection/connection_to_host.cc index ee578fb9..8da325cd 100644 --- a/src/ballistica/scene_v1/connection/connection_to_host.cc +++ b/src/ballistica/scene_v1/connection/connection_to_host.cc @@ -2,6 +2,11 @@ #include "ballistica/scene_v1/connection/connection_to_host.h" +#include + +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/input/device/input_device.h" @@ -15,7 +20,6 @@ #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" #include "ballistica/shared/generic/json.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/connection/connection_to_host_udp.cc b/src/ballistica/scene_v1/connection/connection_to_host_udp.cc index d737ed93..ad9bcf4f 100644 --- a/src/ballistica/scene_v1/connection/connection_to_host_udp.cc +++ b/src/ballistica/scene_v1/connection/connection_to_host_udp.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/connection/connection_to_host_udp.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/networking/network_writer.h" diff --git a/src/ballistica/scene_v1/dynamics/dynamics.cc b/src/ballistica/scene_v1/dynamics/dynamics.cc index ba6e5564..020039ad 100644 --- a/src/ballistica/scene_v1/dynamics/dynamics.cc +++ b/src/ballistica/scene_v1/dynamics/dynamics.cc @@ -2,10 +2,12 @@ #include "ballistica/scene_v1/dynamics/dynamics.h" +#include +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/audio/audio_source.h" #include "ballistica/base/dynamics/collision_cache.h" -#include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/core/core.h" #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/dynamics/collision.h" diff --git a/src/ballistica/scene_v1/dynamics/material/material.cc b/src/ballistica/scene_v1/dynamics/material/material.cc index f519c4e2..2f6cecad 100644 --- a/src/ballistica/scene_v1/dynamics/material/material.cc +++ b/src/ballistica/scene_v1/dynamics/material/material.cc @@ -2,10 +2,14 @@ #include "ballistica/scene_v1/dynamics/material/material.h" +#include + +#include +#include + #include "ballistica/scene_v1/dynamics/material/material_component.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/scene_v1/support/session_stream.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/dynamics/material/material_component.cc b/src/ballistica/scene_v1/dynamics/material/material_component.cc index 55b9963d..f3eec408 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_component.cc +++ b/src/ballistica/scene_v1/dynamics/material/material_component.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/dynamics/material/material_component.h" +#include + #include "ballistica/scene_v1/dynamics/material/impact_sound_material_action.h" #include "ballistica/scene_v1/dynamics/material/material.h" #include "ballistica/scene_v1/dynamics/material/material_condition_node.h" diff --git a/src/ballistica/scene_v1/dynamics/material/material_component.h b/src/ballistica/scene_v1/dynamics/material/material_component.h index bbd06761..b2199c6e 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_component.h +++ b/src/ballistica/scene_v1/dynamics/material/material_component.h @@ -3,9 +3,9 @@ #ifndef BALLISTICA_SCENE_V1_DYNAMICS_MATERIAL_MATERIAL_COMPONENT_H_ #define BALLISTICA_SCENE_V1_DYNAMICS_MATERIAL_MATERIAL_COMPONENT_H_ -#include #include +#include "ballistica/scene_v1/dynamics/material/material_action.h" #include "ballistica/scene_v1/scene_v1.h" #include "ballistica/shared/foundation/object.h" diff --git a/src/ballistica/scene_v1/dynamics/material/material_context.cc b/src/ballistica/scene_v1/dynamics/material/material_context.cc index eab72da9..34f85401 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_context.cc +++ b/src/ballistica/scene_v1/dynamics/material/material_context.cc @@ -5,7 +5,6 @@ #include "ballistica/base/audio/audio.h" #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/dynamics/dynamics.h" -#include "ballistica/scene_v1/dynamics/material/material_action.h" #include "ballistica/scene_v1/support/scene.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/dynamics/material/material_context.h b/src/ballistica/scene_v1/dynamics/material/material_context.h index 15934349..84d856db 100644 --- a/src/ballistica/scene_v1/dynamics/material/material_context.h +++ b/src/ballistica/scene_v1/dynamics/material/material_context.h @@ -5,6 +5,8 @@ #include +#include "ballistica/scene_v1/assets/scene_sound.h" +#include "ballistica/scene_v1/dynamics/material/material_action.h" #include "ballistica/scene_v1/scene_v1.h" #include "ballistica/shared/foundation/object.h" diff --git a/src/ballistica/scene_v1/dynamics/material/python_call_material_action.h b/src/ballistica/scene_v1/dynamics/material/python_call_material_action.h index b289f0b9..7ec94f1a 100644 --- a/src/ballistica/scene_v1/dynamics/material/python_call_material_action.h +++ b/src/ballistica/scene_v1/dynamics/material/python_call_material_action.h @@ -5,7 +5,6 @@ #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/scene_v1/dynamics/material/material_action.h" -#include "ballistica/shared/ballistica.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/dynamics/material/skid_sound_material_action.h b/src/ballistica/scene_v1/dynamics/material/skid_sound_material_action.h index 432c388a..e9893fa9 100644 --- a/src/ballistica/scene_v1/dynamics/material/skid_sound_material_action.h +++ b/src/ballistica/scene_v1/dynamics/material/skid_sound_material_action.h @@ -5,7 +5,6 @@ #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/dynamics/material/material_action.h" -#include "ballistica/shared/ballistica.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/dynamics/material/sound_material_action.h b/src/ballistica/scene_v1/dynamics/material/sound_material_action.h index 0ae48ce9..c464abf4 100644 --- a/src/ballistica/scene_v1/dynamics/material/sound_material_action.h +++ b/src/ballistica/scene_v1/dynamics/material/sound_material_action.h @@ -5,7 +5,6 @@ #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/dynamics/material/material_action.h" -#include "ballistica/shared/ballistica.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/dynamics/part.cc b/src/ballistica/scene_v1/dynamics/part.cc index 21476cb3..81b1ecb4 100644 --- a/src/ballistica/scene_v1/dynamics/part.cc +++ b/src/ballistica/scene_v1/dynamics/part.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/dynamics/part.h" +#include + #include "ballistica/scene_v1/dynamics/dynamics.h" #include "ballistica/scene_v1/dynamics/material/material.h" #include "ballistica/scene_v1/support/scene.h" diff --git a/src/ballistica/scene_v1/dynamics/rigid_body.cc b/src/ballistica/scene_v1/dynamics/rigid_body.cc index e0b76192..670ebcae 100644 --- a/src/ballistica/scene_v1/dynamics/rigid_body.cc +++ b/src/ballistica/scene_v1/dynamics/rigid_body.cc @@ -3,7 +3,6 @@ #include "ballistica/scene_v1/dynamics/rigid_body.h" #include "ballistica/base/graphics/component/render_component.h" -#include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/scene_v1/assets/scene_collision_mesh.h" #include "ballistica/scene_v1/dynamics/dynamics.h" #include "ballistica/scene_v1/dynamics/part.h" diff --git a/src/ballistica/scene_v1/node/anim_curve_node.cc b/src/ballistica/scene_v1/node/anim_curve_node.cc index 9b1361eb..fb62b451 100644 --- a/src/ballistica/scene_v1/node/anim_curve_node.cc +++ b/src/ballistica/scene_v1/node/anim_curve_node.cc @@ -2,6 +2,7 @@ #include "ballistica/scene_v1/node/anim_curve_node.h" +#include #include #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/combine_node.cc b/src/ballistica/scene_v1/node/combine_node.cc index 10f5941b..477e662d 100644 --- a/src/ballistica/scene_v1/node/combine_node.cc +++ b/src/ballistica/scene_v1/node/combine_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/combine_node.h" +#include +#include + #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" diff --git a/src/ballistica/scene_v1/node/explosion_node.cc b/src/ballistica/scene_v1/node/explosion_node.cc index d646271f..5789d18b 100644 --- a/src/ballistica/scene_v1/node/explosion_node.cc +++ b/src/ballistica/scene_v1/node/explosion_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/explosion_node.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/post_process_component.h" diff --git a/src/ballistica/scene_v1/node/flag_node.cc b/src/ballistica/scene_v1/node/flag_node.cc index ede8eb98..81ce8300 100644 --- a/src/ballistica/scene_v1/node/flag_node.cc +++ b/src/ballistica/scene_v1/node/flag_node.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/node/flag_node.h" +#include +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/base/dynamics/bg/bg_dynamics_shadow.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/simple_component.h" diff --git a/src/ballistica/scene_v1/node/flag_node.h b/src/ballistica/scene_v1/node/flag_node.h index 198f0b2a..b99c2fd9 100644 --- a/src/ballistica/scene_v1/node/flag_node.h +++ b/src/ballistica/scene_v1/node/flag_node.h @@ -5,7 +5,7 @@ #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_object_split.h" #include "ballistica/scene_v1/dynamics/part.h" #include "ballistica/scene_v1/node/node.h" diff --git a/src/ballistica/scene_v1/node/flash_node.cc b/src/ballistica/scene_v1/node/flash_node.cc index 73e79871..3bcc94a8 100644 --- a/src/ballistica/scene_v1/node/flash_node.cc +++ b/src/ballistica/scene_v1/node/flash_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/flash_node.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/globals_node.cc b/src/ballistica/scene_v1/node/globals_node.cc index ecbb6bad..83b05fdb 100644 --- a/src/ballistica/scene_v1/node/globals_node.cc +++ b/src/ballistica/scene_v1/node/globals_node.cc @@ -2,18 +2,19 @@ #include "ballistica/scene_v1/node/globals_node.h" +#include +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/dynamics/bg/bg_dynamics.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/support/classic_soft.h" #include "ballistica/classic/support/classic_app_mode.h" -#include "ballistica/core/core.h" #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" #include "ballistica/scene_v1/support/host_activity.h" #include "ballistica/scene_v1/support/scene.h" -#include "ballistica/shared/python/python.h" // FIXME: should not need this here. #if BA_VR_BUILD diff --git a/src/ballistica/scene_v1/node/image_node.cc b/src/ballistica/scene_v1/node/image_node.cc index 20586f65..9ea8a0d9 100644 --- a/src/ballistica/scene_v1/node/image_node.cc +++ b/src/ballistica/scene_v1/node/image_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/image_node.h" +#include +#include + #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/core/core.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/light_node.cc b/src/ballistica/scene_v1/node/light_node.cc index f9cc2603..e600f687 100644 --- a/src/ballistica/scene_v1/node/light_node.cc +++ b/src/ballistica/scene_v1/node/light_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/light_node.h" +#include +#include + #include "ballistica/base/dynamics/bg/bg_dynamics_volume_light.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/locator_node.cc b/src/ballistica/scene_v1/node/locator_node.cc index 7a829f7c..39b0b1a0 100644 --- a/src/ballistica/scene_v1/node/locator_node.cc +++ b/src/ballistica/scene_v1/node/locator_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/locator_node.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/math_node.cc b/src/ballistica/scene_v1/node/math_node.cc index 0aa59409..f3954c34 100644 --- a/src/ballistica/scene_v1/node/math_node.cc +++ b/src/ballistica/scene_v1/node/math_node.cc @@ -2,7 +2,10 @@ #include "ballistica/scene_v1/node/math_node.h" +#include #include +#include +#include #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" diff --git a/src/ballistica/scene_v1/node/node.cc b/src/ballistica/scene_v1/node/node.cc index a07b78b1..24fcd99d 100644 --- a/src/ballistica/scene_v1/node/node.cc +++ b/src/ballistica/scene_v1/node/node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/node.h" +#include +#include + #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/scene_v1/dynamics/part.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/node_attribute.cc b/src/ballistica/scene_v1/node/node_attribute.cc index 4411ca2f..bc3e2cf5 100644 --- a/src/ballistica/scene_v1/node/node_attribute.cc +++ b/src/ballistica/scene_v1/node/node_attribute.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/node/node_attribute.h" +#include +#include +#include + #include "ballistica/scene_v1/node/node.h" #include "ballistica/scene_v1/node/node_attribute_connection.h" #include "ballistica/scene_v1/node/node_type.h" diff --git a/src/ballistica/scene_v1/node/node_attribute_connection.cc b/src/ballistica/scene_v1/node/node_attribute_connection.cc index 7303c125..49c9cdcd 100644 --- a/src/ballistica/scene_v1/node/node_attribute_connection.cc +++ b/src/ballistica/scene_v1/node/node_attribute_connection.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/node_attribute_connection.h" +#include + #include "ballistica/scene_v1/node/node.h" #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" diff --git a/src/ballistica/scene_v1/node/player_node.cc b/src/ballistica/scene_v1/node/player_node.cc index 04a1e8db..9bcc71a8 100644 --- a/src/ballistica/scene_v1/node/player_node.cc +++ b/src/ballistica/scene_v1/node/player_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/player_node.h" +#include + #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" #include "ballistica/scene_v1/support/scene.h" diff --git a/src/ballistica/scene_v1/node/prop_node.cc b/src/ballistica/scene_v1/node/prop_node.cc index 5153a1e7..b6cadb67 100644 --- a/src/ballistica/scene_v1/node/prop_node.cc +++ b/src/ballistica/scene_v1/node/prop_node.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/node/prop_node.h" +#include +#include +#include + #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/support/area_of_interest.h" diff --git a/src/ballistica/scene_v1/node/region_node.cc b/src/ballistica/scene_v1/node/region_node.cc index 3b026da3..28dd98dc 100644 --- a/src/ballistica/scene_v1/node/region_node.cc +++ b/src/ballistica/scene_v1/node/region_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/region_node.h" +#include +#include + #include "ballistica/base/graphics/graphics_server.h" #include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/scorch_node.cc b/src/ballistica/scene_v1/node/scorch_node.cc index d2b4fa4f..8a28c550 100644 --- a/src/ballistica/scene_v1/node/scorch_node.cc +++ b/src/ballistica/scene_v1/node/scorch_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/scorch_node.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/shield_node.cc b/src/ballistica/scene_v1/node/shield_node.cc index 00513cb7..edf8ba21 100644 --- a/src/ballistica/scene_v1/node/shield_node.cc +++ b/src/ballistica/scene_v1/node/shield_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/shield_node.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/base/graphics/component/post_process_component.h" diff --git a/src/ballistica/scene_v1/node/sound_node.cc b/src/ballistica/scene_v1/node/sound_node.cc index 61a13726..4f4f4f4e 100644 --- a/src/ballistica/scene_v1/node/sound_node.cc +++ b/src/ballistica/scene_v1/node/sound_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/sound_node.h" +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/audio/audio_source.h" #include "ballistica/scene_v1/assets/scene_sound.h" diff --git a/src/ballistica/scene_v1/node/spaz_node.cc b/src/ballistica/scene_v1/node/spaz_node.cc index 8efa91ea..13db24b9 100644 --- a/src/ballistica/scene_v1/node/spaz_node.cc +++ b/src/ballistica/scene_v1/node/spaz_node.cc @@ -2,6 +2,11 @@ #include "ballistica/scene_v1/node/spaz_node.h" +#include +#include +#include +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/audio/audio_source.h" #include "ballistica/base/dynamics/bg/bg_dynamics_shadow.h" @@ -9,10 +14,10 @@ #include "ballistica/base/graphics/component/post_process_component.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/graphics_server.h" +#include "ballistica/base/graphics/renderer/renderer.h" #include "ballistica/base/graphics/support/area_of_interest.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/graphics/text/text_graphics.h" -#include "ballistica/base/input/device/input_device.h" #include "ballistica/base/ui/ui.h" #include "ballistica/core/core.h" #include "ballistica/scene_v1/assets/scene_mesh.h" @@ -20,12 +25,10 @@ #include "ballistica/scene_v1/assets/scene_texture.h" #include "ballistica/scene_v1/dynamics/collision.h" #include "ballistica/scene_v1/dynamics/dynamics.h" -#include "ballistica/scene_v1/dynamics/material/material_action.h" #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" #include "ballistica/shared/generic/utils.h" #include "ballistica/shared/math/random.h" -#include "ballistica/shared/python/python.h" #include "ode/ode_collision_util.h" namespace ballistica::scene_v1 { @@ -184,9 +187,9 @@ static auto AngleBetween2DVectors(dReal x1, dReal y1, dReal x2, dReal y2) static void RotationFrom2Axes(dMatrix3 r, dReal x_forward, dReal y_forward, dReal z_forward, dReal x_up, dReal y_up, dReal z_up) { - Vector3f forward(x_forward, y_forward, z_forward); + Vector3f fwd(x_forward, y_forward, z_forward); Vector3f up = Vector3f(x_up, y_up, z_up).Normalized(); - Vector3f side = Vector3f(Vector3f::Cross(forward, up)).Normalized(); + Vector3f side = Vector3f(Vector3f::Cross(fwd, up)).Normalized(); Vector3f forward2 = Vector3f::Cross(up, side); r[0] = forward2.x; r[4] = forward2.y; diff --git a/src/ballistica/scene_v1/node/spaz_node.h b/src/ballistica/scene_v1/node/spaz_node.h index 3440ef59..a0534787 100644 --- a/src/ballistica/scene_v1/node/spaz_node.h +++ b/src/ballistica/scene_v1/node/spaz_node.h @@ -6,7 +6,8 @@ #include #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/mesh/mesh_indexed_simple_full.h" +#include "ballistica/base/graphics/text/text_group.h" #include "ballistica/scene_v1/dynamics/part.h" #include "ballistica/scene_v1/node/node.h" #include "ballistica/scene_v1/support/player.h" diff --git a/src/ballistica/scene_v1/node/terrain_node.cc b/src/ballistica/scene_v1/node/terrain_node.cc index 5a748230..1a61de32 100644 --- a/src/ballistica/scene_v1/node/terrain_node.cc +++ b/src/ballistica/scene_v1/node/terrain_node.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/node/terrain_node.h" +#include +#include + #include "ballistica/base/dynamics/bg/bg_dynamics.h" #include "ballistica/base/graphics/component/object_component.h" #include "ballistica/core/core.h" diff --git a/src/ballistica/scene_v1/node/text_node.cc b/src/ballistica/scene_v1/node/text_node.cc index 94f72cb9..58acbf58 100644 --- a/src/ballistica/scene_v1/node/text_node.cc +++ b/src/ballistica/scene_v1/node/text_node.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/node/text_node.h" +#include +#include +#include + #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/graphics/text/text_graphics.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/node/text_node.h b/src/ballistica/scene_v1/node/text_node.h index 22593a01..b74ba886 100644 --- a/src/ballistica/scene_v1/node/text_node.h +++ b/src/ballistica/scene_v1/node/text_node.h @@ -6,7 +6,7 @@ #include #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/text/text_group.h" #include "ballistica/scene_v1/node/node.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/node/texture_sequence_node.cc b/src/ballistica/scene_v1/node/texture_sequence_node.cc index 320ce8c7..26829350 100644 --- a/src/ballistica/scene_v1/node/texture_sequence_node.cc +++ b/src/ballistica/scene_v1/node/texture_sequence_node.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/node/texture_sequence_node.h" +#include + #include "ballistica/scene_v1/assets/scene_texture.h" #include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_type.h" diff --git a/src/ballistica/scene_v1/node/time_display_node.cc b/src/ballistica/scene_v1/node/time_display_node.cc index 7bbbb14c..947609d5 100644 --- a/src/ballistica/scene_v1/node/time_display_node.cc +++ b/src/ballistica/scene_v1/node/time_display_node.cc @@ -2,7 +2,10 @@ #include "ballistica/scene_v1/node/time_display_node.h" +#include #include +#include +#include #include "ballistica/base/assets/assets.h" #include "ballistica/scene_v1/node/node_attribute.h" diff --git a/src/ballistica/scene_v1/python/class/python_class_activity_data.cc b/src/ballistica/scene_v1/python/class/python_class_activity_data.cc index fcfe716f..c04960dc 100644 --- a/src/ballistica/scene_v1/python/class/python_class_activity_data.cc +++ b/src/ballistica/scene_v1/python/class/python_class_activity_data.cc @@ -2,13 +2,14 @@ #include "ballistica/scene_v1/python/class/python_class_activity_data.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/class/python_class_context_ref.h" #include "ballistica/scene_v1/support/host_activity.h" #include "ballistica/scene_v1/support/host_session.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_base_timer.cc b/src/ballistica/scene_v1/python/class/python_class_base_timer.cc index faa8f8d6..7a5ce867 100644 --- a/src/ballistica/scene_v1/python/class/python_class_base_timer.cc +++ b/src/ballistica/scene_v1/python/class/python_class_base_timer.cc @@ -2,11 +2,12 @@ #include "ballistica/scene_v1/python/class/python_class_base_timer.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/support/python_context_call_runnable.h" #include "ballistica/scene_v1/support/scene_v1_context.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_input_device.cc b/src/ballistica/scene_v1/python/class/python_class_input_device.cc index 4d54399b..a73add29 100644 --- a/src/ballistica/scene_v1/python/class/python_class_input_device.cc +++ b/src/ballistica/scene_v1/python/class/python_class_input_device.cc @@ -2,12 +2,13 @@ #include "ballistica/scene_v1/python/class/python_class_input_device.h" +#include + #include "ballistica/base/input/device/input_device.h" #include "ballistica/base/python/base_python.h" #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_material.cc b/src/ballistica/scene_v1/python/class/python_class_material.cc index 3ea51b8d..ca9986a3 100644 --- a/src/ballistica/scene_v1/python/class/python_class_material.cc +++ b/src/ballistica/scene_v1/python/class/python_class_material.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/python/class/python_class_material.h" +#include +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/scene_v1/dynamics/material/impact_sound_material_action.h" #include "ballistica/scene_v1/dynamics/material/material.h" diff --git a/src/ballistica/scene_v1/python/class/python_class_node.cc b/src/ballistica/scene_v1/python/class/python_class_node.cc index fad31158..4d548cbb 100644 --- a/src/ballistica/scene_v1/python/class/python_class_node.cc +++ b/src/ballistica/scene_v1/python/class/python_class_node.cc @@ -3,6 +3,8 @@ #include "ballistica/scene_v1/python/class/python_class_node.h" #include +#include +#include #include "ballistica/scene_v1/python/scene_v1_python.h" #include "ballistica/scene_v1/support/scene.h" diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.cc b/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.cc index 55ccc889..7887e3e3 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_collision_mesh.cc @@ -2,10 +2,11 @@ #include "ballistica/scene_v1/python/class/python_class_scene_collision_mesh.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/scene_v1/assets/scene_collision_mesh.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.cc b/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.cc index 90fc888f..6455465a 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_data_asset.cc @@ -2,10 +2,11 @@ #include "ballistica/scene_v1/python/class/python_class_scene_data_asset.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/scene_v1/assets/scene_data_asset.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_mesh.cc b/src/ballistica/scene_v1/python/class/python_class_scene_mesh.cc index 73ad5c0f..f191d68b 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_mesh.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_mesh.cc @@ -2,10 +2,11 @@ #include "ballistica/scene_v1/python/class/python_class_scene_mesh.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/scene_v1/assets/scene_mesh.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_sound.cc b/src/ballistica/scene_v1/python/class/python_class_scene_sound.cc index dfc7b95b..e34ce7ae 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_sound.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_sound.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/python/class/python_class_scene_sound.h" +#include +#include + #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/support/scene.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_texture.cc b/src/ballistica/scene_v1/python/class/python_class_scene_texture.cc index 3c0cd8d6..0457b798 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_texture.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_texture.cc @@ -2,10 +2,11 @@ #include "ballistica/scene_v1/python/class/python_class_scene_texture.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/scene_v1/assets/scene_texture.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_scene_timer.cc b/src/ballistica/scene_v1/python/class/python_class_scene_timer.cc index f9a8c608..4ec0a8ed 100644 --- a/src/ballistica/scene_v1/python/class/python_class_scene_timer.cc +++ b/src/ballistica/scene_v1/python/class/python_class_scene_timer.cc @@ -2,11 +2,12 @@ #include "ballistica/scene_v1/python/class/python_class_scene_timer.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/support/python_context_call_runnable.h" #include "ballistica/scene_v1/support/scene_v1_context.h" #include "ballistica/shared/foundation/event_loop.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_session_data.cc b/src/ballistica/scene_v1/python/class/python_class_session_data.cc index fb10d8ae..f26a87bf 100644 --- a/src/ballistica/scene_v1/python/class/python_class_session_data.cc +++ b/src/ballistica/scene_v1/python/class/python_class_session_data.cc @@ -2,12 +2,13 @@ #include "ballistica/scene_v1/python/class/python_class_session_data.h" +#include + #include "ballistica/base/logic/logic.h" #include "ballistica/base/python/class/python_class_context_ref.h" #include "ballistica/scene_v1/support/session.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/class/python_class_session_player.cc b/src/ballistica/scene_v1/python/class/python_class_session_player.cc index 5431aff9..2b8a46b8 100644 --- a/src/ballistica/scene_v1/python/class/python_class_session_player.cc +++ b/src/ballistica/scene_v1/python/class/python_class_session_player.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/python/class/python_class_session_player.h" +#include +#include + #include "ballistica/base/python/base_python.h" #include "ballistica/scene_v1/python/scene_v1_python.h" #include "ballistica/scene_v1/support/host_session.h" diff --git a/src/ballistica/scene_v1/python/methods/python_methods_assets.cc b/src/ballistica/scene_v1/python/methods/python_methods_assets.cc index 58f63c19..55317bd1 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_assets.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_assets.cc @@ -2,8 +2,8 @@ #include "ballistica/scene_v1/python/methods/python_methods_assets.h" -#include #include +#include #include "ballistica/scene_v1/assets/scene_collision_mesh.h" #include "ballistica/scene_v1/assets/scene_data_asset.h" @@ -11,7 +11,6 @@ #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/assets/scene_texture.h" #include "ballistica/scene_v1/python/scene_v1_python.h" -#include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/methods/python_methods_input.cc b/src/ballistica/scene_v1/python/methods/python_methods_input.cc index 55700a64..b39df097 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_input.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_input.cc @@ -2,11 +2,13 @@ #include "ballistica/scene_v1/python/methods/python_methods_input.h" +#include +#include + #include "ballistica/base/input/device/touch_input.h" #include "ballistica/base/ui/ui.h" #include "ballistica/scene_v1/python/scene_v1_python.h" #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" -#include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/methods/python_methods_networking.cc b/src/ballistica/scene_v1/python/methods/python_methods_networking.cc index 8cca87e5..c553f159 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_networking.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_networking.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/python/methods/python_methods_networking.h" +#include +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/networking/network_reader.h" #include "ballistica/base/python/base_python.h" diff --git a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc index aa862616..d450a6f6 100644 --- a/src/ballistica/scene_v1/python/methods/python_methods_scene.cc +++ b/src/ballistica/scene_v1/python/methods/python_methods_scene.cc @@ -2,7 +2,10 @@ #include "ballistica/scene_v1/python/methods/python_methods_scene.h" +#include #include +#include +#include #include "ballistica/base/dynamics/bg/bg_dynamics.h" #include "ballistica/base/graphics/graphics.h" @@ -13,13 +16,11 @@ #include "ballistica/base/support/plus_soft.h" #include "ballistica/classic/support/classic_app_mode.h" #include "ballistica/core/python/core_python.h" -#include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/assets/scene_texture.h" #include "ballistica/scene_v1/connection/connection_set.h" #include "ballistica/scene_v1/connection/connection_to_client.h" #include "ballistica/scene_v1/dynamics/collision.h" #include "ballistica/scene_v1/dynamics/dynamics.h" -#include "ballistica/scene_v1/dynamics/material/material_action.h" #include "ballistica/scene_v1/node/node_type.h" #include "ballistica/scene_v1/python/class/python_class_activity_data.h" #include "ballistica/scene_v1/python/class/python_class_session_data.h" @@ -31,7 +32,6 @@ #include "ballistica/scene_v1/support/session_stream.h" #include "ballistica/shared/generic/json.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_command.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/scene_v1_python.cc b/src/ballistica/scene_v1/python/scene_v1_python.cc index 1c7ed978..bc12fdbe 100644 --- a/src/ballistica/scene_v1/python/scene_v1_python.cc +++ b/src/ballistica/scene_v1/python/scene_v1_python.cc @@ -2,6 +2,13 @@ #include "ballistica/scene_v1/python/scene_v1_python.h" +#include +#include +#include +#include +#include +#include + #include "ballistica/base/input/device/keyboard_input.h" #include "ballistica/base/python/base_python.h" #include "ballistica/base/python/class/python_class_context_ref.h" @@ -31,7 +38,7 @@ #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" #include "ballistica/scene_v1/support/session_stream.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_command.h" +#include "ballistica/shared/python/python_command.h" // IWYU pragma: keep. #include "ballistica/shared/python/python_module_builder.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/python/scene_v1_python.h b/src/ballistica/scene_v1/python/scene_v1_python.h index afa67832..8ff9bd53 100644 --- a/src/ballistica/scene_v1/python/scene_v1_python.h +++ b/src/ballistica/scene_v1/python/scene_v1_python.h @@ -3,6 +3,9 @@ #ifndef BALLISTICA_SCENE_V1_PYTHON_SCENE_V1_PYTHON_H_ #define BALLISTICA_SCENE_V1_PYTHON_SCENE_V1_PYTHON_H_ +#include +#include + #include "ballistica/base/base.h" #include "ballistica/scene_v1/scene_v1.h" #include "ballistica/shared/python/python_object_set.h" diff --git a/src/ballistica/scene_v1/scene_v1.cc b/src/ballistica/scene_v1/scene_v1.cc index 6ad16791..6c4c3fe9 100644 --- a/src/ballistica/scene_v1/scene_v1.cc +++ b/src/ballistica/scene_v1/scene_v1.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/scene_v1.h" +#include +#include +#include + #include "ballistica/scene_v1/node/anim_curve_node.h" #include "ballistica/scene_v1/node/bomb_node.h" #include "ballistica/scene_v1/node/combine_node.h" diff --git a/src/ballistica/scene_v1/scene_v1.h b/src/ballistica/scene_v1/scene_v1.h index e1ae0644..a3f287d3 100644 --- a/src/ballistica/scene_v1/scene_v1.h +++ b/src/ballistica/scene_v1/scene_v1.h @@ -4,12 +4,11 @@ #define BALLISTICA_SCENE_V1_SCENE_V1_H_ #include +#include #include #include -#include "ballistica/shared/ballistica.h" #include "ballistica/shared/foundation/feature_set_native_component.h" -#include "ballistica/shared/python/python_ref.h" // Common header that most everything using our feature-set should include. // It predeclares our feature-set's various types and globals and other diff --git a/src/ballistica/scene_v1/support/client_input_device.cc b/src/ballistica/scene_v1/support/client_input_device.cc index df4d562e..52d6385e 100644 --- a/src/ballistica/scene_v1/support/client_input_device.cc +++ b/src/ballistica/scene_v1/support/client_input_device.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/support/client_input_device.h" +#include + #include "ballistica/scene_v1/connection/connection_to_client.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/client_input_device_delegate.cc b/src/ballistica/scene_v1/support/client_input_device_delegate.cc index 1d2ef24d..6d3cd3b9 100644 --- a/src/ballistica/scene_v1/support/client_input_device_delegate.cc +++ b/src/ballistica/scene_v1/support/client_input_device_delegate.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/support/client_input_device_delegate.h" +#include +#include + #include "ballistica/base/networking/networking.h" #include "ballistica/scene_v1/connection/connection_to_client.h" #include "ballistica/scene_v1/support/client_input_device.h" diff --git a/src/ballistica/scene_v1/support/client_input_device_delegate.h b/src/ballistica/scene_v1/support/client_input_device_delegate.h index 03f6c8f2..ba0c9b5a 100644 --- a/src/ballistica/scene_v1/support/client_input_device_delegate.h +++ b/src/ballistica/scene_v1/support/client_input_device_delegate.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_SCENE_V1_SUPPORT_CLIENT_INPUT_DEVICE_DELEGATE_H_ #define BALLISTICA_SCENE_V1_SUPPORT_CLIENT_INPUT_DEVICE_DELEGATE_H_ +#include + #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/client_session.cc b/src/ballistica/scene_v1/support/client_session.cc index d2e55997..0c052a0c 100644 --- a/src/ballistica/scene_v1/support/client_session.cc +++ b/src/ballistica/scene_v1/support/client_session.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/support/client_session.h" +#include +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/dynamics/bg/bg_dynamics.h" #include "ballistica/base/graphics/graphics.h" diff --git a/src/ballistica/scene_v1/support/client_session_net.cc b/src/ballistica/scene_v1/support/client_session_net.cc index 58e68a9a..1269e1e0 100644 --- a/src/ballistica/scene_v1/support/client_session_net.cc +++ b/src/ballistica/scene_v1/support/client_session_net.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/support/client_session_net.h" +#include +#include + #include "ballistica/base/assets/assets_server.h" #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/net_graph.h" diff --git a/src/ballistica/scene_v1/support/client_session_replay.cc b/src/ballistica/scene_v1/support/client_session_replay.cc index 2d2f1fc5..50dc9583 100644 --- a/src/ballistica/scene_v1/support/client_session_replay.cc +++ b/src/ballistica/scene_v1/support/client_session_replay.cc @@ -3,6 +3,10 @@ #include "ballistica/scene_v1/support/client_session_replay.h" #include +#include +#include +#include +#include #include "ballistica/base/assets/assets.h" #include "ballistica/base/networking/networking.h" diff --git a/src/ballistica/scene_v1/support/client_session_replay.h b/src/ballistica/scene_v1/support/client_session_replay.h index ae5b8f72..ac9e97ef 100644 --- a/src/ballistica/scene_v1/support/client_session_replay.h +++ b/src/ballistica/scene_v1/support/client_session_replay.h @@ -3,6 +3,7 @@ #ifndef BALLISTICA_SCENE_V1_SUPPORT_CLIENT_SESSION_REPLAY_H_ #define BALLISTICA_SCENE_V1_SUPPORT_CLIENT_SESSION_REPLAY_H_ +#include #include #include diff --git a/src/ballistica/scene_v1/support/host_activity.cc b/src/ballistica/scene_v1/support/host_activity.cc index c74d338c..e0dd1582 100644 --- a/src/ballistica/scene_v1/support/host_activity.cc +++ b/src/ballistica/scene_v1/support/host_activity.cc @@ -2,6 +2,12 @@ #include "ballistica/scene_v1/support/host_activity.h" +#include + +#include +#include +#include + #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/classic/support/classic_app_mode.h" #include "ballistica/scene_v1/assets/scene_collision_mesh.h" @@ -17,7 +23,6 @@ #include "ballistica/scene_v1/support/session_stream.h" #include "ballistica/shared/generic/lambda_runnable.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/host_activity.h b/src/ballistica/scene_v1/support/host_activity.h index 507e75d0..f75927f6 100644 --- a/src/ballistica/scene_v1/support/host_activity.h +++ b/src/ballistica/scene_v1/support/host_activity.h @@ -6,9 +6,9 @@ #include #include #include +#include #include "ballistica/base/base.h" -#include "ballistica/base/support/context.h" #include "ballistica/scene_v1/support/scene_v1_context.h" #include "ballistica/shared/generic/timer_list.h" #include "ballistica/shared/python/python_ref.h" diff --git a/src/ballistica/scene_v1/support/host_session.cc b/src/ballistica/scene_v1/support/host_session.cc index 9a9406ab..82310276 100644 --- a/src/ballistica/scene_v1/support/host_session.cc +++ b/src/ballistica/scene_v1/support/host_session.cc @@ -2,6 +2,12 @@ #include "ballistica/scene_v1/support/host_session.h" +#include + +#include +#include +#include + #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/python/base_python.h" #include "ballistica/base/python/support/python_context_call.h" @@ -16,7 +22,6 @@ #include "ballistica/shared/generic/lambda_runnable.h" #include "ballistica/shared/generic/utils.h" #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/player.cc b/src/ballistica/scene_v1/support/player.cc index 8b79db19..78c929c1 100644 --- a/src/ballistica/scene_v1/support/player.cc +++ b/src/ballistica/scene_v1/support/player.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/support/player.h" +#include +#include +#include + #include "ballistica/base/input/device/joystick_input.h" #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/classic/support/classic_app_mode.h" diff --git a/src/ballistica/scene_v1/support/player_spec.cc b/src/ballistica/scene_v1/support/player_spec.cc index 3322464e..3a4fc27f 100644 --- a/src/ballistica/scene_v1/support/player_spec.cc +++ b/src/ballistica/scene_v1/support/player_spec.cc @@ -2,6 +2,8 @@ #include "ballistica/scene_v1/support/player_spec.h" +#include + #include "ballistica/base/support/classic_soft.h" #include "ballistica/classic/support/classic_app_mode.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/scene_v1/support/scene.cc b/src/ballistica/scene_v1/support/scene.cc index cef709e4..3b5c610a 100644 --- a/src/ballistica/scene_v1/support/scene.cc +++ b/src/ballistica/scene_v1/support/scene.cc @@ -2,17 +2,23 @@ #include "ballistica/scene_v1/support/scene.h" +#include +#include + #include "ballistica/base/audio/audio.h" +#include "ballistica/base/dynamics/bg/bg_dynamics.h" +#include "ballistica/base/graphics/graphics.h" #include "ballistica/base/graphics/support/camera.h" #include "ballistica/base/networking/networking.h" #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/classic/support/classic_app_mode.h" #include "ballistica/scene_v1/assets/scene_sound.h" #include "ballistica/scene_v1/dynamics/dynamics.h" -#include "ballistica/scene_v1/node/bomb_node.h" +#include "ballistica/scene_v1/dynamics/part.h" +#include "ballistica/scene_v1/node/node_attribute.h" #include "ballistica/scene_v1/node/node_attribute_connection.h" +#include "ballistica/scene_v1/node/node_type.h" #include "ballistica/scene_v1/node/player_node.h" -#include "ballistica/scene_v1/node/text_node.h" #include "ballistica/scene_v1/support/session_stream.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/scene_v1_context.cc b/src/ballistica/scene_v1/support/scene_v1_context.cc index fa3becf2..7739a9c5 100644 --- a/src/ballistica/scene_v1/support/scene_v1_context.cc +++ b/src/ballistica/scene_v1/support/scene_v1_context.cc @@ -2,10 +2,13 @@ #include "ballistica/scene_v1/support/scene_v1_context.h" +#include + +#include + #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/scene_v1/support/host_activity.h" #include "ballistica/shared/generic/runnable.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::scene_v1 { diff --git a/src/ballistica/scene_v1/support/scene_v1_context.h b/src/ballistica/scene_v1/support/scene_v1_context.h index 60e27916..15611617 100644 --- a/src/ballistica/scene_v1/support/scene_v1_context.h +++ b/src/ballistica/scene_v1/support/scene_v1_context.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_SCENE_V1_SUPPORT_SCENE_V1_CONTEXT_H_ #define BALLISTICA_SCENE_V1_SUPPORT_SCENE_V1_CONTEXT_H_ +#include + #include "ballistica/base/support/context.h" #include "ballistica/scene_v1/scene_v1.h" diff --git a/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.cc b/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.cc index 7388ef7f..2694058b 100644 --- a/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.cc +++ b/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.cc @@ -2,6 +2,10 @@ #include "ballistica/scene_v1/support/scene_v1_input_device_delegate.h" +#include +#include +#include + #include "ballistica/base/input/device/input_device.h" #include "ballistica/base/networking/networking.h" #include "ballistica/base/support/plus_soft.h" diff --git a/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.h b/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.h index 1363c7c0..0a67bafc 100644 --- a/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.h +++ b/src/ballistica/scene_v1/support/scene_v1_input_device_delegate.h @@ -3,6 +3,9 @@ #ifndef BALLISTICA_SCENE_V1_SUPPORT_SCENE_V1_INPUT_DEVICE_DELEGATE_H_ #define BALLISTICA_SCENE_V1_SUPPORT_SCENE_V1_INPUT_DEVICE_DELEGATE_H_ +#include +#include + #include "ballistica/base/input/device/input_device_delegate.h" #include "ballistica/scene_v1/support/player.h" diff --git a/src/ballistica/scene_v1/support/session_stream.cc b/src/ballistica/scene_v1/support/session_stream.cc index ffd3094f..4db81709 100644 --- a/src/ballistica/scene_v1/support/session_stream.cc +++ b/src/ballistica/scene_v1/support/session_stream.cc @@ -2,6 +2,9 @@ #include "ballistica/scene_v1/support/session_stream.h" +#include +#include + #include "ballistica/base/assets/assets_server.h" #include "ballistica/base/dynamics/bg/bg_dynamics.h" #include "ballistica/base/networking/networking.h" diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 1edeb4d4..466beb3c 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -2,11 +2,12 @@ #include "ballistica/shared/ballistica.h" +#include + #include "ballistica/core/platform/core_platform.h" #include "ballistica/core/platform/support/min_sdl.h" #include "ballistica/core/python/core_python.h" #include "ballistica/core/support/base_soft.h" -#include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/foundation/fatal_error.h" #include "ballistica/shared/foundation/logging.h" #include "ballistica/shared/math/vector3f.h" @@ -39,7 +40,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22024; +const int kEngineBuildNumber = 22025; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/src/ballistica/shared/foundation/event_loop.cc b/src/ballistica/shared/foundation/event_loop.cc index eb36357f..207a64c1 100644 --- a/src/ballistica/shared/foundation/event_loop.cc +++ b/src/ballistica/shared/foundation/event_loop.cc @@ -2,12 +2,16 @@ #include "ballistica/shared/foundation/event_loop.h" +#include + +#include +#include +#include +#include + #include "ballistica/core/platform/core_platform.h" -#include "ballistica/core/python/core_python.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/foundation/fatal_error.h" -#include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica { diff --git a/src/ballistica/shared/foundation/exception.cc b/src/ballistica/shared/foundation/exception.cc index 5c6a14c4..df766c07 100644 --- a/src/ballistica/shared/foundation/exception.cc +++ b/src/ballistica/shared/foundation/exception.cc @@ -2,6 +2,9 @@ #include "ballistica/shared/foundation/exception.h" +#include +#include + #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" #include "ballistica/shared/generic/native_stack_trace.h" diff --git a/src/ballistica/shared/foundation/fatal_error.cc b/src/ballistica/shared/foundation/fatal_error.cc index ab720860..46a433ab 100644 --- a/src/ballistica/shared/foundation/fatal_error.cc +++ b/src/ballistica/shared/foundation/fatal_error.cc @@ -2,6 +2,10 @@ #include "ballistica/shared/foundation/fatal_error.h" +#include +#include + +#include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/foundation/logging.h" diff --git a/src/ballistica/shared/foundation/feature_set_native_component.cc b/src/ballistica/shared/foundation/feature_set_native_component.cc index a601c61c..a7be300d 100644 --- a/src/ballistica/shared/foundation/feature_set_native_component.cc +++ b/src/ballistica/shared/foundation/feature_set_native_component.cc @@ -2,9 +2,12 @@ #include "ballistica/shared/foundation/feature_set_native_component.h" +#include + +#include + #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica { diff --git a/src/ballistica/shared/foundation/inline.h b/src/ballistica/shared/foundation/inline.h index 5376eeb3..8ea47340 100644 --- a/src/ballistica/shared/foundation/inline.h +++ b/src/ballistica/shared/foundation/inline.h @@ -6,6 +6,7 @@ #ifdef __cplusplus #include +#include #include #include diff --git a/src/ballistica/shared/foundation/logging.cc b/src/ballistica/shared/foundation/logging.cc index 64ccfc74..8601c5ef 100644 --- a/src/ballistica/shared/foundation/logging.cc +++ b/src/ballistica/shared/foundation/logging.cc @@ -2,6 +2,8 @@ #include "ballistica/shared/foundation/logging.h" +#include + #include "ballistica/core/platform/core_platform.h" #include "ballistica/core/python/core_python.h" #include "ballistica/core/support/base_soft.h" diff --git a/src/ballistica/shared/foundation/macros.cc b/src/ballistica/shared/foundation/macros.cc index c2ae788d..7813dbf0 100644 --- a/src/ballistica/shared/foundation/macros.cc +++ b/src/ballistica/shared/foundation/macros.cc @@ -2,7 +2,9 @@ #include "ballistica/shared/foundation/macros.h" +#include #include +#include #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/shared/foundation/object.cc b/src/ballistica/shared/foundation/object.cc index 1324e8d5..f045cf9c 100644 --- a/src/ballistica/shared/foundation/object.cc +++ b/src/ballistica/shared/foundation/object.cc @@ -2,8 +2,11 @@ #include "ballistica/shared/foundation/object.h" +#include #include +#include #include +#include #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/shared/generic/base64.cc b/src/ballistica/shared/generic/base64.cc index 77df7e20..1912d36c 100644 --- a/src/ballistica/shared/generic/base64.cc +++ b/src/ballistica/shared/generic/base64.cc @@ -26,9 +26,11 @@ René Nyffenegger rene.nyffenegger@adp-gmbh.ch -*/ + */ #include "ballistica/shared/generic/base64.h" +#include + namespace ballistica { // NOLINTNEXTLINE(cert-err58-cpp) diff --git a/src/ballistica/shared/generic/runnable.cc b/src/ballistica/shared/generic/runnable.cc index f5ebb16f..04711629 100644 --- a/src/ballistica/shared/generic/runnable.cc +++ b/src/ballistica/shared/generic/runnable.cc @@ -2,6 +2,8 @@ #include "ballistica/shared/generic/runnable.h" +#include + #include "ballistica/core/core.h" #include "ballistica/core/platform/core_platform.h" diff --git a/src/ballistica/shared/generic/utils.cc b/src/ballistica/shared/generic/utils.cc index 10025b03..e0da681d 100644 --- a/src/ballistica/shared/generic/utils.cc +++ b/src/ballistica/shared/generic/utils.cc @@ -2,14 +2,16 @@ #include "ballistica/shared/generic/utils.h" +#include #include +#include #include +#include +#include #include "ballistica/core/core.h" -#include "ballistica/core/platform/core_platform.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/generic/json.h" -#include "ballistica/shared/generic/runnable.h" #include "ballistica/shared/generic/utf8.h" #include "ballistica/shared/math/random.h" #include "ballistica/shared/math/vector3f.h" diff --git a/src/ballistica/shared/networking/networking_sys.h b/src/ballistica/shared/networking/networking_sys.h index f0a11d64..0cf613ac 100644 --- a/src/ballistica/shared/networking/networking_sys.h +++ b/src/ballistica/shared/networking/networking_sys.h @@ -26,7 +26,5 @@ #include #endif #endif -#include -#include #endif // BALLISTICA_SHARED_NETWORKING_NETWORKING_SYS_H_ diff --git a/src/ballistica/shared/networking/sockaddr.cc b/src/ballistica/shared/networking/sockaddr.cc index af4c5dab..b23ca8e0 100644 --- a/src/ballistica/shared/networking/sockaddr.cc +++ b/src/ballistica/shared/networking/sockaddr.cc @@ -2,6 +2,8 @@ #include "ballistica/shared/networking/sockaddr.h" +#include + namespace ballistica { SockAddr::SockAddr(const std::string& addr, int port) { diff --git a/src/ballistica/shared/python/python.cc b/src/ballistica/shared/python/python.cc index 0068077b..47471e13 100644 --- a/src/ballistica/shared/python/python.cc +++ b/src/ballistica/shared/python/python.cc @@ -2,8 +2,14 @@ #include "ballistica/shared/python/python.h" +#include + +#include +#include +#include + +#include "ballistica/core/core.h" #include "ballistica/core/support/base_soft.h" -#include "ballistica/shared/python/python_sys.h" // Sanity test: our XCode, Android, and Windows builds should be // using a debug build of the Python library. diff --git a/src/ballistica/shared/python/python_command.cc b/src/ballistica/shared/python/python_command.cc index ab04999f..46bd8d31 100644 --- a/src/ballistica/shared/python/python_command.cc +++ b/src/ballistica/shared/python/python_command.cc @@ -2,6 +2,9 @@ #include "ballistica/shared/python/python_command.h" +#include +#include + #include "ballistica/core/python/core_python.h" #include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_sys.h" diff --git a/src/ballistica/shared/python/python_module_builder.h b/src/ballistica/shared/python/python_module_builder.h index edd95f12..8faf3179 100644 --- a/src/ballistica/shared/python/python_module_builder.h +++ b/src/ballistica/shared/python/python_module_builder.h @@ -3,10 +3,12 @@ #ifndef BALLISTICA_SHARED_PYTHON_PYTHON_MODULE_BUILDER_H_ #define BALLISTICA_SHARED_PYTHON_PYTHON_MODULE_BUILDER_H_ +#include + +#include #include #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica { diff --git a/src/ballistica/shared/python/python_object_set.cc b/src/ballistica/shared/python/python_object_set.cc index 77f29e6e..7f7ee884 100644 --- a/src/ballistica/shared/python/python_object_set.cc +++ b/src/ballistica/shared/python/python_object_set.cc @@ -2,11 +2,13 @@ #include "ballistica/shared/python/python_object_set.h" +#include + #include +#include "ballistica/core/core.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/python/python_command.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica { diff --git a/src/ballistica/shared/python/python_ref.cc b/src/ballistica/shared/python/python_ref.cc index eb74d121..ab237c51 100644 --- a/src/ballistica/shared/python/python_ref.cc +++ b/src/ballistica/shared/python/python_ref.cc @@ -2,6 +2,10 @@ #include "ballistica/shared/python/python_ref.h" +#include +#include + +#include "ballistica/core/core.h" #include "ballistica/core/support/base_soft.h" #include "ballistica/shared/math/vector2f.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/shared/python/python_sys.h b/src/ballistica/shared/python/python_sys.h index 774e9105..30796fce 100644 --- a/src/ballistica/shared/python/python_sys.h +++ b/src/ballistica/shared/python/python_sys.h @@ -15,6 +15,8 @@ #include // IWYU pragma: keep. (macros below use this) +#include "ballistica/shared/python/python.h" // IWYU pragma: keep. + // Saving/restoring Python error state; useful when function PyObject_Str() // or other functionality is needed during error reporting; by default it // craps out when an error is set. diff --git a/src/ballistica/template_fs/python/class/python_class_hello.h b/src/ballistica/template_fs/python/class/python_class_hello.h index e2e3f28d..bbf37f70 100644 --- a/src/ballistica/template_fs/python/class/python_class_hello.h +++ b/src/ballistica/template_fs/python/class/python_class_hello.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_TEMPLATE_FS_PYTHON_CLASS_PYTHON_CLASS_HELLO_H_ #define BALLISTICA_TEMPLATE_FS_PYTHON_CLASS_PYTHON_CLASS_HELLO_H_ +#include + #include "ballistica/shared/python/python.h" #include "ballistica/shared/python/python_class.h" diff --git a/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc b/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc index 2e0015ad..4cd4f76a 100644 --- a/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc +++ b/src/ballistica/template_fs/python/methods/python_methods_template_fs.cc @@ -2,7 +2,8 @@ #include "ballistica/template_fs/python/methods/python_methods_template_fs.h" -#include "ballistica/shared/python/python.h" +#include + #include "ballistica/shared/python/python_sys.h" namespace ballistica::template_fs { diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.cc b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.cc index da5d6d24..c062708a 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.cc +++ b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/python/class/python_class_ui_mesh.h" +#include + #include "ballistica/base/assets/mesh_asset.h" #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h index 09edebc9..b009edd3 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_mesh.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_MESH_H_ #define BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_MESH_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/foundation/object.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_sound.cc b/src/ballistica/ui_v1/python/class/python_class_ui_sound.cc index eb0e4ccf..9ee315e8 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_sound.cc +++ b/src/ballistica/ui_v1/python/class/python_class_ui_sound.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/python/class/python_class_ui_sound.h" +#include + #include "ballistica/base/assets/sound_asset.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/logic/logic.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_sound.h b/src/ballistica/ui_v1/python/class/python_class_ui_sound.h index 50aefb51..221d2e20 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_sound.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_sound.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_SOUND_H_ #define BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_SOUND_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/foundation/object.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_texture.cc b/src/ballistica/ui_v1/python/class/python_class_ui_texture.cc index 7697a97f..b60c1008 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_texture.cc +++ b/src/ballistica/ui_v1/python/class/python_class_ui_texture.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/python/class/python_class_ui_texture.h" +#include + #include "ballistica/base/assets/texture_asset.h" #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_ui_texture.h b/src/ballistica/ui_v1/python/class/python_class_ui_texture.h index 56e720b6..46bbd105 100644 --- a/src/ballistica/ui_v1/python/class/python_class_ui_texture.h +++ b/src/ballistica/ui_v1/python/class/python_class_ui_texture.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_TEXTURE_H_ #define BALLISTICA_UI_V1_PYTHON_CLASS_PYTHON_CLASS_UI_TEXTURE_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/foundation/object.h" #include "ballistica/shared/python/python.h" diff --git a/src/ballistica/ui_v1/python/class/python_class_widget.cc b/src/ballistica/ui_v1/python/class/python_class_widget.cc index 62b879be..2623a8a5 100644 --- a/src/ballistica/ui_v1/python/class/python_class_widget.cc +++ b/src/ballistica/ui_v1/python/class/python_class_widget.cc @@ -2,11 +2,12 @@ #include "ballistica/ui_v1/python/class/python_class_widget.h" +#include + #include "ballistica/base/graphics/graphics.h" #include "ballistica/base/logic/logic.h" #include "ballistica/shared/foundation/event_loop.h" #include "ballistica/shared/generic/utils.h" -#include "ballistica/shared/python/python.h" #include "ballistica/ui_v1/widget/container_widget.h" namespace ballistica::ui_v1 { diff --git a/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc b/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc index 5e4d4d9b..075c4e3d 100644 --- a/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc +++ b/src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc @@ -2,6 +2,10 @@ #include "ballistica/ui_v1/python/methods/python_methods_ui_v1.h" +#include +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/base/assets/sound_asset.h" // IWYU pragma: keep. #include "ballistica/base/python/base_python.h" #include "ballistica/base/support/context.h" diff --git a/src/ballistica/ui_v1/python/ui_v1_python.cc b/src/ballistica/ui_v1/python/ui_v1_python.cc index dd4b616d..7a6592c0 100644 --- a/src/ballistica/ui_v1/python/ui_v1_python.cc +++ b/src/ballistica/ui_v1/python/ui_v1_python.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/python/ui_v1_python.h" +#include + #include "ballistica/base/audio/audio.h" #include "ballistica/base/input/device/keyboard_input.h" // IWYU pragma: keep. #include "ballistica/base/input/input.h" diff --git a/src/ballistica/ui_v1/python/ui_v1_python.h b/src/ballistica/ui_v1/python/ui_v1_python.h index 5a3f8c95..8d9578d2 100644 --- a/src/ballistica/ui_v1/python/ui_v1_python.h +++ b/src/ballistica/ui_v1/python/ui_v1_python.h @@ -3,6 +3,8 @@ #ifndef BALLISTICA_UI_V1_PYTHON_UI_V1_PYTHON_H_ #define BALLISTICA_UI_V1_PYTHON_UI_V1_PYTHON_H_ +#include + #include "ballistica/base/base.h" #include "ballistica/shared/python/python_object_set.h" #include "ballistica/ui_v1/ui_v1.h" diff --git a/src/ballistica/ui_v1/ui_v1.cc b/src/ballistica/ui_v1/ui_v1.cc index 9b6b38e5..f51a2aba 100644 --- a/src/ballistica/ui_v1/ui_v1.cc +++ b/src/ballistica/ui_v1/ui_v1.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/ui_v1.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/empty_component.h" #include "ballistica/base/input/input.h" diff --git a/src/ballistica/ui_v1/ui_v1.h b/src/ballistica/ui_v1/ui_v1.h index c2e149bc..cc24d260 100644 --- a/src/ballistica/ui_v1/ui_v1.h +++ b/src/ballistica/ui_v1/ui_v1.h @@ -5,6 +5,8 @@ #include +#include + #include "ballistica/base/ui/ui_delegate.h" #include "ballistica/shared/foundation/feature_set_native_component.h" diff --git a/src/ballistica/ui_v1/widget/button_widget.cc b/src/ballistica/ui_v1/widget/button_widget.cc index 2f22dbee..00584833 100644 --- a/src/ballistica/ui_v1/widget/button_widget.cc +++ b/src/ballistica/ui_v1/widget/button_widget.cc @@ -2,6 +2,9 @@ #include "ballistica/ui_v1/widget/button_widget.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/component/empty_component.h" diff --git a/src/ballistica/ui_v1/widget/check_box_widget.cc b/src/ballistica/ui_v1/widget/check_box_widget.cc index c77a0ef8..b1613414 100644 --- a/src/ballistica/ui_v1/widget/check_box_widget.cc +++ b/src/ballistica/ui_v1/widget/check_box_widget.cc @@ -2,11 +2,15 @@ #include "ballistica/ui_v1/widget/check_box_widget.h" +#include + +#include + +#include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/component/empty_component.h" #include "ballistica/base/graphics/component/simple_component.h" #include "ballistica/base/python/support/python_context_call.h" -#include "ballistica/shared/python/python_sys.h" namespace ballistica::ui_v1 { diff --git a/src/ballistica/ui_v1/widget/check_box_widget.h b/src/ballistica/ui_v1/widget/check_box_widget.h index a2bb3c1f..a76b4c6c 100644 --- a/src/ballistica/ui_v1/widget/check_box_widget.h +++ b/src/ballistica/ui_v1/widget/check_box_widget.h @@ -5,7 +5,7 @@ #include -#include "ballistica/base/graphics/renderer/renderer.h" +#include "ballistica/base/graphics/mesh/image_mesh.h" #include "ballistica/ui_v1/widget/text_widget.h" namespace ballistica::ui_v1 { diff --git a/src/ballistica/ui_v1/widget/container_widget.cc b/src/ballistica/ui_v1/widget/container_widget.cc index 63873e1a..fa50aec4 100644 --- a/src/ballistica/ui_v1/widget/container_widget.cc +++ b/src/ballistica/ui_v1/widget/container_widget.cc @@ -2,6 +2,9 @@ #include "ballistica/ui_v1/widget/container_widget.h" +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/component/empty_component.h" diff --git a/src/ballistica/ui_v1/widget/h_scroll_widget.cc b/src/ballistica/ui_v1/widget/h_scroll_widget.cc index b8bbed73..42f07ca2 100644 --- a/src/ballistica/ui_v1/widget/h_scroll_widget.cc +++ b/src/ballistica/ui_v1/widget/h_scroll_widget.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/widget/h_scroll_widget.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/empty_component.h" #include "ballistica/base/graphics/component/simple_component.h" diff --git a/src/ballistica/ui_v1/widget/image_widget.h b/src/ballistica/ui_v1/widget/image_widget.h index 8e2149df..cdeca509 100644 --- a/src/ballistica/ui_v1/widget/image_widget.h +++ b/src/ballistica/ui_v1/widget/image_widget.h @@ -3,6 +3,7 @@ #ifndef BALLISTICA_UI_V1_WIDGET_IMAGE_WIDGET_H_ #define BALLISTICA_UI_V1_WIDGET_IMAGE_WIDGET_H_ +#include #include #include "ballistica/base/assets/mesh_asset.h" diff --git a/src/ballistica/ui_v1/widget/root_widget.cc b/src/ballistica/ui_v1/widget/root_widget.cc index 70c1ef67..fc32be3b 100644 --- a/src/ballistica/ui_v1/widget/root_widget.cc +++ b/src/ballistica/ui_v1/widget/root_widget.cc @@ -2,6 +2,9 @@ #include "ballistica/ui_v1/widget/root_widget.h" +#include +#include + #include "ballistica/base/app_mode/app_mode.h" #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/renderer/render_pass.h" diff --git a/src/ballistica/ui_v1/widget/root_widget.h b/src/ballistica/ui_v1/widget/root_widget.h index 150c7f0b..91defb93 100644 --- a/src/ballistica/ui_v1/widget/root_widget.h +++ b/src/ballistica/ui_v1/widget/root_widget.h @@ -5,6 +5,7 @@ #include #include +#include #include "ballistica/ui_v1/widget/container_widget.h" diff --git a/src/ballistica/ui_v1/widget/row_widget.cc b/src/ballistica/ui_v1/widget/row_widget.cc index 7896de2a..a3d3008d 100644 --- a/src/ballistica/ui_v1/widget/row_widget.cc +++ b/src/ballistica/ui_v1/widget/row_widget.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/widget/row_widget.h" +#include + namespace ballistica::ui_v1 { RowWidget::RowWidget() { diff --git a/src/ballistica/ui_v1/widget/scroll_widget.cc b/src/ballistica/ui_v1/widget/scroll_widget.cc index 2204a235..3703c901 100644 --- a/src/ballistica/ui_v1/widget/scroll_widget.cc +++ b/src/ballistica/ui_v1/widget/scroll_widget.cc @@ -2,6 +2,8 @@ #include "ballistica/ui_v1/widget/scroll_widget.h" +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/graphics/component/empty_component.h" #include "ballistica/base/graphics/component/simple_component.h" diff --git a/src/ballistica/ui_v1/widget/text_widget.cc b/src/ballistica/ui_v1/widget/text_widget.cc index 4d3046d4..435d7e8c 100644 --- a/src/ballistica/ui_v1/widget/text_widget.cc +++ b/src/ballistica/ui_v1/widget/text_widget.cc @@ -2,6 +2,12 @@ #include "ballistica/ui_v1/widget/text_widget.h" +#include + +#include +#include +#include + #include "ballistica/base/assets/assets.h" #include "ballistica/base/audio/audio.h" #include "ballistica/base/graphics/component/empty_component.h" @@ -9,7 +15,7 @@ #include "ballistica/base/graphics/mesh/nine_patch_mesh.h" #include "ballistica/base/graphics/text/text_graphics.h" #include "ballistica/base/graphics/text/text_group.h" -#include "ballistica/base/input/device/keyboard_input.h" +#include "ballistica/base/input/device/keyboard_input.h" // IWYU pragma: keep. #include "ballistica/base/input/input.h" #include "ballistica/base/logic/logic.h" #include "ballistica/base/platform/base_platform.h" @@ -17,7 +23,6 @@ #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/shared/generic/utils.h" #include "ballistica/shared/python/python.h" -#include "ballistica/shared/python/python_sys.h" #include "ballistica/ui_v1/python/ui_v1_python.h" #include "ballistica/ui_v1/widget/container_widget.h" diff --git a/src/ballistica/ui_v1/widget/widget.cc b/src/ballistica/ui_v1/widget/widget.cc index 113b5595..f704be9d 100644 --- a/src/ballistica/ui_v1/widget/widget.cc +++ b/src/ballistica/ui_v1/widget/widget.cc @@ -2,7 +2,8 @@ #include "ballistica/ui_v1/widget/widget.h" -#include "ballistica/base/logic/logic.h" +#include + #include "ballistica/base/python/support/python_context_call.h" #include "ballistica/base/ui/ui.h" #include "ballistica/ui_v1/python/class/python_class_widget.h" diff --git a/tools/efro/call.py b/tools/efro/call.py index 66b0f014..cd594b25 100644 --- a/tools/efro/call.py +++ b/tools/efro/call.py @@ -4,14 +4,32 @@ from __future__ import annotations -import functools -from typing import TYPE_CHECKING +# import functools +from typing import TYPE_CHECKING, TypeVar, Generic + +T = TypeVar('T') if TYPE_CHECKING: pass -# TODO: should deprecate tpartial since it nowadays simply wraps -# functools.partial (mypy added support for functools.partial in 1.11 so -# there's no benefit to rolling our own type-safe version anymore). -# Perhaps we can use Python 13's @warnings.deprecated() stuff for this. -tpartial = functools.partial + +class SimpleCallbackSet(Generic[T]): + """A simple way to manage a set of callbacks.""" + + def __init__(self) -> None: + self._entries: list[SimpleCallbackSetEntry[T]] = [] + + def add(self, call: T) -> None: + """Add a callback.""" + self._entries.append(SimpleCallbackSetEntry(call)) + + def getcalls(self) -> list[T]: + """Return the current set of registered calls.""" + return [e.call for e in self._entries] + + +class SimpleCallbackSetEntry(Generic[T]): + """An entry for a callback set.""" + + def __init__(self, call: T) -> None: + self.call = call diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index 4449a28d..daf498f1 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -161,10 +161,14 @@ def check_cpplint(projroot: Path, full: bool) -> None: ) disabled_filters: list[str] = [ - 'build/include_what_you_use', - 'build/c++11', + # 'build/include_what_you_use', + # 'build/c++11', + 'build/c++17', 'readability/nolint', 'legal/copyright', + # As of cpplint 2.0 (Oct 2024), seeing a bunch of false positives + # for this based on how clang-format formats things. + 'whitespace/indent_namespace', ] filterstr = ','.join(f'-{x}' for x in disabled_filters) @@ -174,8 +178,8 @@ def check_cpplint(projroot: Path, full: bool) -> None: sys.executable, # Currently (May 2023) seeing a bunch of warnings # about 'sre_compile deprecated'. Ignoring them. - '-W', - 'ignore::DeprecationWarning', + # '-W', + # 'ignore::DeprecationWarning', '-m', 'cpplint', '--root=src',