From 35fc122b9b0f106f42ed216a7a5d1b233c3c0dd9 Mon Sep 17 00:00:00 2001 From: Trevor Slocum Date: Sat, 23 Sep 2023 23:16:56 -0700 Subject: [PATCH] Rename module 'openage' as 'engine', output binary 'openage' Resolves #1532. --- .gitignore | 6 +-- CMakeLists.txt | 10 ++--- Makefile | 6 +-- README.md | 4 +- buildsystem/__init__.py | 2 +- buildsystem/codecompliance/__main__.py | 12 +++--- buildsystem/codecompliance/textfiles.py | 2 +- buildsystem/codegen.cmake | 2 +- buildsystem/templates/ExternalFetch.cmake.in | 2 +- doc/build_instructions/macos.md | 2 +- doc/building.md | 2 +- doc/buildsystem.md | 8 ++-- doc/code/pyinterface.md | 18 ++++----- doc/code/testing.md | 20 +++++----- doc/convert/convert_single_file.md | 2 +- doc/convert/nyan.md | 2 +- doc/debug.md | 8 ++-- doc/ide/qt_creator.md | 4 +- doc/media/original-metadata.md | 2 +- doc/media_convert.md | 4 +- doc/project_structure.md | 4 +- doc/running.md | 18 ++++----- {openage => engine}/.gitignore | 0 {openage => engine}/CMakeLists.txt | 0 {openage => engine}/__init__.py | 0 {openage => engine}/__main__.py | 0 {openage => engine}/assets.py | 2 +- {openage => engine}/cabextract/CMakeLists.txt | 0 {openage => engine}/cabextract/__init__.py | 0 {openage => engine}/cabextract/cab.py | 2 +- .../cabextract/cabchecksum.pyx | 0 .../cabextract/gen_test_arc.sh | 0 {openage => engine}/cabextract/lzxd.pyx | 2 +- {openage => engine}/cabextract/lzxdstream.py | 0 {openage => engine}/cabextract/test.py | 0 {openage => engine}/codegen/CMakeLists.txt | 0 {openage => engine}/codegen/__init__.py | 0 {openage => engine}/codegen/codegen.py | 8 ++-- {openage => engine}/codegen/coord.py | 0 {openage => engine}/codegen/cpp_testlist.py | 0 {openage => engine}/codegen/listing.py | 0 {openage => engine}/codegen/main.py | 0 {openage => engine}/config.py.in | 0 {openage => engine}/convert/CMakeLists.txt | 0 {openage => engine}/convert/__init__.py | 0 .../convert/entity_object/CMakeLists.txt | 0 .../convert/entity_object/__init__.py | 0 .../entity_object/conversion/CMakeLists.txt | 0 .../entity_object/conversion/__init__.py | 0 .../conversion/aoc/CMakeLists.txt | 0 .../entity_object/conversion/aoc/__init__.py | 0 .../entity_object/conversion/aoc/genie_civ.py | 10 ++--- .../conversion/aoc/genie_connection.py | 4 +- .../conversion/aoc/genie_effect.py | 4 +- .../conversion/aoc/genie_graphic.py | 4 +- .../conversion/aoc/genie_object_container.py | 34 ++++++++--------- .../conversion/aoc/genie_sound.py | 4 +- .../conversion/aoc/genie_tech.py | 8 ++-- .../conversion/aoc/genie_terrain.py | 4 +- .../conversion/aoc/genie_unit.py | 6 +-- .../conversion/combined_sound.py | 4 +- .../conversion/combined_sprite.py | 6 +-- .../conversion/combined_terrain.py | 6 +-- .../conversion/converter_object.py | 2 +- .../entity_object/conversion/modpack.py | 0 .../conversion/ror/CMakeLists.txt | 0 .../entity_object/conversion/ror/__init__.py | 0 .../conversion/ror/genie_sound.py | 0 .../conversion/ror/genie_tech.py | 2 +- .../conversion/ror/genie_unit.py | 2 +- .../conversion/stringresource.py | 2 +- .../conversion/swgbcc/CMakeLists.txt | 0 .../conversion/swgbcc/__init__.py | 0 .../conversion/swgbcc/genie_tech.py | 2 +- .../conversion/swgbcc/genie_unit.py | 2 +- .../entity_object/export/CMakeLists.txt | 0 .../convert/entity_object/export/__init__.py | 0 .../entity_object/export/data_definition.py | 0 .../export/formats/CMakeLists.txt | 0 .../entity_object/export/formats/__init__.py | 0 .../export/formats/blmask_metadata.py | 0 .../export/formats/bltable_metadata.py | 0 .../export/formats/media_cache.py | 4 +- .../export/formats/modpack_info.py | 0 .../export/formats/modpack_manifest.py | 0 .../entity_object/export/formats/nyan_file.py | 2 +- .../export/formats/palette_metadata.py | 0 .../export/formats/sprite_metadata.py | 0 .../export/formats/terrain_metadata.py | 0 .../export/formats/texture_metadata.py | 0 .../export/media_export_request.py | 2 +- .../entity_object/export/metadata_export.py | 4 +- .../convert/entity_object/export/texture.py | 12 +++--- {openage => engine}/convert/main.py | 2 +- .../convert/processor/CMakeLists.txt | 0 .../convert/processor/__init__.py | 0 .../processor/conversion/CMakeLists.txt | 0 .../convert/processor/conversion/__init__.py | 0 .../processor/conversion/aoc/CMakeLists.txt | 0 .../processor/conversion/aoc/__init__.py | 0 .../conversion/aoc/ability_subprocessor.py | 4 +- .../conversion/aoc/auxiliary_subprocessor.py | 4 +- .../conversion/aoc/civ_subprocessor.py | 4 +- .../conversion/aoc/effect_subprocessor.py | 2 +- .../conversion/aoc/media_subprocessor.py | 4 +- .../conversion/aoc/modifier_subprocessor.py | 2 +- .../conversion/aoc/modpack_subprocessor.py | 4 +- .../conversion/aoc/nyan_subprocessor.py | 10 ++--- .../conversion/aoc/pregen_processor.py | 2 +- .../processor/conversion/aoc/processor.py | 8 ++-- .../conversion/aoc/tech_subprocessor.py | 6 +-- .../aoc/upgrade_ability_subprocessor.py | 4 +- .../aoc/upgrade_attribute_subprocessor.py | 6 +-- .../aoc/upgrade_effect_subprocessor.py | 6 +-- .../aoc/upgrade_resource_subprocessor.py | 4 +- .../processor/conversion/de1/CMakeLists.txt | 0 .../processor/conversion/de1/__init__.py | 0 .../conversion/de1/media_subprocessor.py | 2 +- .../processor/conversion/de1/processor.py | 8 ++-- .../processor/conversion/de2/CMakeLists.txt | 0 .../processor/conversion/de2/__init__.py | 0 .../conversion/de2/ability_subprocessor.py | 2 +- .../conversion/de2/civ_subprocessor.py | 2 +- .../conversion/de2/media_subprocessor.py | 2 +- .../conversion/de2/modpack_subprocessor.py | 2 +- .../conversion/de2/nyan_subprocessor.py | 10 ++--- .../processor/conversion/de2/processor.py | 12 +++--- .../conversion/de2/tech_subprocessor.py | 6 +-- .../de2/upgrade_attribute_subprocessor.py | 8 ++-- .../de2/upgrade_resource_subprocessor.py | 6 +-- .../processor/conversion/hd/CMakeLists.txt | 0 .../processor/conversion/hd/__init__.py | 0 .../conversion/hd/media_subprocessor.py | 2 +- .../conversion/hd/modpack_subprocessor.py | 2 +- .../processor/conversion/hd/processor.py | 8 ++-- .../processor/conversion/ror/CMakeLists.txt | 0 .../processor/conversion/ror/__init__.py | 0 .../conversion/ror/ability_subprocessor.py | 2 +- .../conversion/ror/auxiliary_subprocessor.py | 2 +- .../conversion/ror/civ_subprocessor.py | 2 +- .../conversion/ror/media_subprocessor.py | 4 +- .../conversion/ror/modpack_subprocessor.py | 2 +- .../conversion/ror/nyan_subprocessor.py | 0 .../conversion/ror/pregen_subprocessor.py | 2 +- .../processor/conversion/ror/processor.py | 8 ++-- .../conversion/ror/tech_subprocessor.py | 6 +-- .../ror/upgrade_ability_subprocessor.py | 4 +- .../ror/upgrade_attribute_subprocessor.py | 6 +-- .../ror/upgrade_resource_subprocessor.py | 4 +- .../conversion/swgbcc/CMakeLists.txt | 0 .../processor/conversion/swgbcc/__init__.py | 0 .../conversion/swgbcc/ability_subprocessor.py | 4 +- .../swgbcc/auxiliary_subprocessor.py | 4 +- .../conversion/swgbcc/civ_subprocessor.py | 4 +- .../conversion/swgbcc/modpack_subprocessor.py | 2 +- .../conversion/swgbcc/nyan_subprocessor.py | 8 ++-- .../conversion/swgbcc/pregen_subprocessor.py | 2 +- .../processor/conversion/swgbcc/processor.py | 10 ++--- .../conversion/swgbcc/tech_subprocessor.py | 6 +-- .../swgbcc/upgrade_attribute_subprocessor.py | 6 +-- .../swgbcc/upgrade_resource_subprocessor.py | 4 +- .../convert/processor/export/CMakeLists.txt | 0 .../convert/processor/export/__init__.pxd | 0 .../convert/processor/export/__init__.py | 0 .../convert/processor/export/data_exporter.py | 4 +- .../export/generate_manifest_hashes.py | 8 ++-- .../processor/export/media_exporter.py | 22 +++++------ .../processor/export/modpack_exporter.py | 2 +- .../processor/export/terrain_merge.pyx | 2 +- .../processor/export/texture_merge.pyx | 0 .../convert/service/CMakeLists.txt | 0 .../convert/service/__init__.py | 0 .../convert/service/conversion/CMakeLists.txt | 0 .../convert/service/conversion/__init__.py | 0 .../conversion/internal_name_lookups.py | 18 ++++----- .../convert/service/debug_info.py | 28 +++++++------- .../convert/service/export/CMakeLists.txt | 0 .../convert/service/export/__init__.py | 0 .../service/export/interface/CMakeLists.txt | 0 .../service/export/interface/__init__.py | 0 .../service/export/interface/cutter.py | 0 .../service/export/interface/rename.py | 2 +- .../service/export/interface/visgrep.pyx | 0 .../service/export/load_media_cache.py | 2 +- .../service/export/opus/CMakeLists.txt | 0 .../convert/service/export/opus/__init__.pxd | 0 .../convert/service/export/opus/__init__.py | 0 .../convert/service/export/opus/bytearray.pxd | 0 .../convert/service/export/opus/demo.py | 0 .../convert/service/export/opus/ogg.pxd | 0 .../convert/service/export/opus/opus.pxd | 0 .../convert/service/export/opus/opusenc.pyx | 0 .../convert/service/export/png/CMakeLists.txt | 0 .../convert/service/export/png/__init__.pxd | 0 .../convert/service/export/png/__init__.py | 0 .../convert/service/export/png/binpack.pxd | 0 .../convert/service/export/png/binpack.pyx | 0 .../convert/service/export/png/libpng.pxd | 0 .../convert/service/export/png/png_create.pyx | 0 .../service/export/png/png_tmp_file.pxd | 0 .../convert/service/init/CMakeLists.txt | 0 .../convert/service/init/__init__.py | 0 .../convert/service/init/changelog.py | 0 .../service/init/conversion_required.py | 2 +- .../convert/service/init/mount_asset_dirs.py | 4 +- .../convert/service/init/version_detect.py | 4 +- .../convert/service/read/CMakeLists.txt | 0 .../convert/service/read/__init__.py | 0 .../convert/service/read/gamedata.py | 8 ++-- .../convert/service/read/nyan_api_loader.py | 0 .../convert/service/read/palette.py | 4 +- .../convert/service/read/register_media.py | 0 .../convert/service/read/string_resource.py | 6 +-- .../convert/tool/CMakeLists.txt | 0 {openage => engine}/convert/tool/__init__.py | 0 .../convert/tool/api_export.py | 18 ++++----- {openage => engine}/convert/tool/driver.py | 2 +- .../convert/tool/interactive.py | 8 ++-- .../convert/tool/singlefile.py | 4 +- .../convert/tool/subtool/CMakeLists.txt | 0 .../convert/tool/subtool/__init__.py | 0 .../convert/tool/subtool/acquire_sourcedir.py | 0 .../convert/tool/subtool/version_select.py | 4 +- .../convert/value_object/CMakeLists.txt | 0 .../convert/value_object/__init__.py | 0 .../value_object/conversion/CMakeLists.txt | 0 .../value_object/conversion/__init__.py | 0 .../conversion/aoc/CMakeLists.txt | 0 .../value_object/conversion/aoc/__init__.py | 0 .../conversion/aoc/internal_nyan_names.py | 0 .../conversion/de1/CMakeLists.txt | 0 .../value_object/conversion/de1/__init__.py | 0 .../conversion/de1/internal_nyan_names.py | 0 .../conversion/de2/CMakeLists.txt | 0 .../value_object/conversion/de2/__init__.py | 0 .../conversion/de2/internal_nyan_names.py | 0 .../value_object/conversion/forward_ref.py | 4 +- .../value_object/conversion/hd/CMakeLists.txt | 0 .../value_object/conversion/hd/__init__.py | 0 .../conversion/hd/ak/CMakeLists.txt | 0 .../value_object/conversion/hd/ak/__init__.py | 0 .../conversion/hd/ak/internal_nyan_names.py | 0 .../conversion/hd/fgt/CMakeLists.txt | 0 .../conversion/hd/fgt/__init__.py | 0 .../conversion/hd/fgt/internal_nyan_names.py | 0 .../conversion/hd/raj/CMakeLists.txt | 0 .../conversion/hd/raj/__init__.py | 0 .../conversion/hd/raj/internal_nyan_names.py | 0 .../conversion/ror/CMakeLists.txt | 0 .../value_object/conversion/ror/__init__.py | 0 .../conversion/ror/internal_nyan_names.py | 0 .../conversion/swgb/CMakeLists.txt | 0 .../value_object/conversion/swgb/__init__.py | 0 .../conversion/swgb/internal_nyan_names.py | 0 .../convert/value_object/init/CMakeLists.txt | 0 .../convert/value_object/init/__init__.py | 0 .../value_object/init/game_file_version.py | 0 .../convert/value_object/init/game_version.py | 0 .../convert/value_object/read/CMakeLists.txt | 0 .../convert/value_object/read/__init__.py | 0 .../value_object/read/dynamic_loader.py | 6 +-- .../value_object/read/genie_structure.py | 4 +- .../value_object/read/media/CMakeLists.txt | 0 .../value_object/read/media/__init__.pxd | 0 .../value_object/read/media/__init__.py | 0 .../value_object/read/media/blendomatic.py | 12 +++--- .../value_object/read/media/colortable.py | 10 ++--- .../read/media/datfile/CMakeLists.txt | 0 .../read/media/datfile/__init__.py | 0 .../value_object/read/media/datfile/civ.py | 6 +-- .../read/media/datfile/empiresdat.py | 6 +-- .../read/media/datfile/graphic.py | 6 +-- .../read/media/datfile/lookup_dicts.py | 0 .../value_object/read/media/datfile/maps.py | 6 +-- .../read/media/datfile/playercolor.py | 6 +-- .../read/media/datfile/research.py | 6 +-- .../value_object/read/media/datfile/sound.py | 6 +-- .../value_object/read/media/datfile/tech.py | 6 +-- .../read/media/datfile/terrain.py | 6 +-- .../value_object/read/media/datfile/unit.py | 6 +-- .../convert/value_object/read/media/drs.py | 4 +- .../read/media/hardcoded/CMakeLists.txt | 0 .../read/media/hardcoded/__init__.py | 0 .../read/media/hardcoded/interface.py | 0 .../read/media/hardcoded/termcolors.py | 0 .../read/media/hardcoded/terrain_tile_size.py | 0 .../read/media/hardcoded/texture.py | 0 .../value_object/read/media/langcodes.py | 0 .../convert/value_object/read/media/pefile.py | 4 +- .../value_object/read/media/peresource.py | 4 +- .../convert/value_object/read/media/sld.pyx | 0 .../convert/value_object/read/media/slp.pyx | 0 .../convert/value_object/read/media/smp.pyx | 0 .../convert/value_object/read/media/smx.pyx | 0 .../convert/value_object/read/media_types.py | 0 .../value_object/read/member_access.py | 0 .../convert/value_object/read/read_members.py | 6 +-- .../value_object/read/value_members.py | 0 .../cppinterface/CMakeLists.txt | 0 {openage => engine}/cppinterface/__init__.py | 0 .../cppinterface/exctranslate.pyx | 0 .../cppinterface/exctranslate_tests.pyx | 0 {openage => engine}/cppinterface/pyobject.pyx | 0 {openage => engine}/cppinterface/setup.py | 0 .../cppinterface/setup_checker.pyx | 0 {openage => engine}/cppinterface/typedefs.pxd | 0 {openage => engine}/cvar/CMakeLists.txt | 0 {openage => engine}/cvar/__init__.py | 0 {openage => engine}/cvar/config_file.py | 2 +- {openage => engine}/cvar/cvar.pyx | 2 +- {openage => engine}/cvar/location.py | 0 {openage => engine}/cython_check.pyx | 0 {openage => engine}/default_dirs.py | 0 {openage => engine}/devmode.py | 0 {openage => engine}/event/CMakeLists.txt | 0 {openage => engine}/event/__init__.py | 0 {openage => engine}/event/demo.pyx | 6 +-- {openage => engine}/game/CMakeLists.txt | 0 {openage => engine}/game/__init__.py | 0 {openage => engine}/game/main.py | 0 {openage => engine}/game/main_cpp.pyx | 0 {openage => engine}/log/CMakeLists.txt | 0 {openage => engine}/log/__init__.py | 0 {openage => engine}/log/log_cpp.pyx | 0 {openage => engine}/log/tests.py | 0 {openage => engine}/main/CMakeLists.txt | 0 {openage => engine}/main/__init__.py | 0 {openage => engine}/main/main.py | 0 {openage => engine}/main/main_cpp.pyx | 0 {openage => engine}/main/tests.pyx | 0 {openage => engine}/nyan/CMakeLists.txt | 0 {openage => engine}/nyan/__init__.py | 0 {openage => engine}/nyan/import_tree.py | 4 +- {openage => engine}/nyan/nyan_structs.py | 2 +- {openage => engine}/renderer/CMakeLists.txt | 0 {openage => engine}/renderer/__init__.py | 0 {openage => engine}/renderer/renderer_cpp.pyx | 0 {openage => engine}/renderer/tests.pyx | 0 {openage => engine}/testing/CMakeLists.txt | 0 {openage => engine}/testing/__init__.py | 0 {openage => engine}/testing/benchmark.py | 0 {openage => engine}/testing/cpp_testing.pyx | 0 {openage => engine}/testing/doctest.py | 0 {openage => engine}/testing/list_processor.py | 2 +- {openage => engine}/testing/main.py | 2 +- {openage => engine}/testing/misc_cpp.pyx | 0 {openage => engine}/testing/testing.py | 0 {openage => engine}/testing/testlist.py | 38 +++++++++---------- {openage => engine}/util/CMakeLists.txt | 0 {openage => engine}/util/__init__.py | 0 {openage => engine}/util/bytequeue.py | 0 {openage => engine}/util/context.py | 0 {openage => engine}/util/decorators.py | 0 .../util/filelike/CMakeLists.txt | 0 {openage => engine}/util/filelike/__init__.py | 0 {openage => engine}/util/filelike/abstract.py | 0 {openage => engine}/util/filelike/cpp.pyx | 0 {openage => engine}/util/filelike/fifo.py | 0 {openage => engine}/util/filelike/readonly.py | 0 {openage => engine}/util/filelike/stream.py | 0 {openage => engine}/util/files.py | 2 +- .../util/fslike/CMakeLists.txt | 0 {openage => engine}/util/fslike/__init__.py | 0 {openage => engine}/util/fslike/abstract.py | 0 {openage => engine}/util/fslike/cpp.pxd | 0 {openage => engine}/util/fslike/cpp.pyx | 0 {openage => engine}/util/fslike/directory.py | 0 .../util/fslike/filecollection.py | 0 {openage => engine}/util/fslike/path.py | 0 {openage => engine}/util/fslike/test.py | 2 +- {openage => engine}/util/fslike/union.py | 0 {openage => engine}/util/fslike/wrapper.py | 0 {openage => engine}/util/fsprinting.py | 2 +- {openage => engine}/util/hash.py | 2 +- {openage => engine}/util/iterators.py | 0 {openage => engine}/util/math.py | 0 {openage => engine}/util/observer.py | 0 {openage => engine}/util/ordered_set.py | 0 {openage => engine}/util/profiler.py | 0 {openage => engine}/util/strings.py | 0 {openage => engine}/util/struct.py | 0 {openage => engine}/util/system.py | 0 {openage => engine}/util/threading.py | 0 {openage => engine}/versions/CMakeLists.txt | 0 {openage => engine}/versions/__init__.py | 0 {openage => engine}/versions/versions.pyx | 0 etc/pylintrc | 2 +- etc/valgrind-python.supp | 2 +- libopenage/CMakeLists.txt | 4 +- libopenage/pyinterface/exctranslate.h | 2 +- libopenage/pyinterface/exctranslate_tests.cpp | 4 +- libopenage/pyinterface/pyobject.h | 2 +- libopenage/pyinterface/setup.h | 2 +- libopenage/util/opengl.cpp | 2 +- run.py.in => openage.py.in | 8 ++-- packaging/CPackOptions.cmake | 2 +- 396 files changed, 441 insertions(+), 441 deletions(-) rename {openage => engine}/.gitignore (100%) rename {openage => engine}/CMakeLists.txt (100%) rename {openage => engine}/__init__.py (100%) rename {openage => engine}/__main__.py (100%) rename {openage => engine}/assets.py (97%) rename {openage => engine}/cabextract/CMakeLists.txt (100%) rename {openage => engine}/cabextract/__init__.py (100%) rename {openage => engine}/cabextract/cab.py (99%) rename {openage => engine}/cabextract/cabchecksum.pyx (100%) rename {openage => engine}/cabextract/gen_test_arc.sh (100%) rename {openage => engine}/cabextract/lzxd.pyx (98%) rename {openage => engine}/cabextract/lzxdstream.py (100%) rename {openage => engine}/cabextract/test.py (100%) rename {openage => engine}/codegen/CMakeLists.txt (100%) rename {openage => engine}/codegen/__init__.py (100%) rename {openage => engine}/codegen/codegen.py (98%) rename {openage => engine}/codegen/coord.py (100%) rename {openage => engine}/codegen/cpp_testlist.py (100%) rename {openage => engine}/codegen/listing.py (100%) rename {openage => engine}/codegen/main.py (100%) rename {openage => engine}/config.py.in (100%) rename {openage => engine}/convert/CMakeLists.txt (100%) rename {openage => engine}/convert/__init__.py (100%) rename {openage => engine}/convert/entity_object/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/__init__.py (100%) rename {openage => engine}/convert/entity_object/conversion/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/conversion/__init__.py (100%) rename {openage => engine}/convert/entity_object/conversion/aoc/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/conversion/aoc/__init__.py (100%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_civ.py (91%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_connection.py (96%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_effect.py (95%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_graphic.py (95%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_object_container.py (75%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_sound.py (91%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_tech.py (98%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_terrain.py (94%) rename {openage => engine}/convert/entity_object/conversion/aoc/genie_unit.py (99%) rename {openage => engine}/convert/entity_object/conversion/combined_sound.py (94%) rename {openage => engine}/convert/entity_object/conversion/combined_sprite.py (93%) rename {openage => engine}/convert/entity_object/conversion/combined_terrain.py (91%) rename {openage => engine}/convert/entity_object/conversion/converter_object.py (99%) rename {openage => engine}/convert/entity_object/conversion/modpack.py (100%) rename {openage => engine}/convert/entity_object/conversion/ror/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/conversion/ror/__init__.py (100%) rename {openage => engine}/convert/entity_object/conversion/ror/genie_sound.py (100%) rename {openage => engine}/convert/entity_object/conversion/ror/genie_tech.py (95%) rename {openage => engine}/convert/entity_object/conversion/ror/genie_unit.py (99%) rename {openage => engine}/convert/entity_object/conversion/stringresource.py (94%) rename {openage => engine}/convert/entity_object/conversion/swgbcc/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/conversion/swgbcc/__init__.py (100%) rename {openage => engine}/convert/entity_object/conversion/swgbcc/genie_tech.py (97%) rename {openage => engine}/convert/entity_object/conversion/swgbcc/genie_unit.py (99%) rename {openage => engine}/convert/entity_object/export/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/export/__init__.py (100%) rename {openage => engine}/convert/entity_object/export/data_definition.py (100%) rename {openage => engine}/convert/entity_object/export/formats/CMakeLists.txt (100%) rename {openage => engine}/convert/entity_object/export/formats/__init__.py (100%) rename {openage => engine}/convert/entity_object/export/formats/blmask_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/formats/bltable_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/formats/media_cache.py (94%) rename {openage => engine}/convert/entity_object/export/formats/modpack_info.py (100%) rename {openage => engine}/convert/entity_object/export/formats/modpack_manifest.py (100%) rename {openage => engine}/convert/entity_object/export/formats/nyan_file.py (98%) rename {openage => engine}/convert/entity_object/export/formats/palette_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/formats/sprite_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/formats/terrain_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/formats/texture_metadata.py (100%) rename {openage => engine}/convert/entity_object/export/media_export_request.py (97%) rename {openage => engine}/convert/entity_object/export/metadata_export.py (97%) rename {openage => engine}/convert/entity_object/export/texture.py (93%) rename {openage => engine}/convert/main.py (99%) rename {openage => engine}/convert/processor/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/aoc/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/aoc/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/aoc/ability_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/auxiliary_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/civ_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/effect_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/media_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/aoc/modifier_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/modpack_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/nyan_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/pregen_processor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/processor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/tech_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/de1/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/de1/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/de1/media_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/de1/processor.py (96%) rename {openage => engine}/convert/processor/conversion/de2/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/de2/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/de2/ability_subprocessor.py (97%) rename {openage => engine}/convert/processor/conversion/de2/civ_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/de2/media_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/de2/modpack_subprocessor.py (94%) rename {openage => engine}/convert/processor/conversion/de2/nyan_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/de2/processor.py (96%) rename {openage => engine}/convert/processor/conversion/de2/tech_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py (91%) rename {openage => engine}/convert/processor/conversion/de2/upgrade_resource_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/hd/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/hd/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/hd/media_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/hd/modpack_subprocessor.py (94%) rename {openage => engine}/convert/processor/conversion/hd/processor.py (95%) rename {openage => engine}/convert/processor/conversion/ror/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/ror/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/ror/ability_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/ror/auxiliary_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/ror/civ_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/ror/media_subprocessor.py (81%) rename {openage => engine}/convert/processor/conversion/ror/modpack_subprocessor.py (94%) rename {openage => engine}/convert/processor/conversion/ror/nyan_subprocessor.py (100%) rename {openage => engine}/convert/processor/conversion/ror/pregen_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/ror/processor.py (98%) rename {openage => engine}/convert/processor/conversion/ror/tech_subprocessor.py (97%) rename {openage => engine}/convert/processor/conversion/ror/upgrade_ability_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py (96%) rename {openage => engine}/convert/processor/conversion/ror/upgrade_resource_subprocessor.py (97%) rename {openage => engine}/convert/processor/conversion/swgbcc/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/conversion/swgbcc/__init__.py (100%) rename {openage => engine}/convert/processor/conversion/swgbcc/ability_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/swgbcc/civ_subprocessor.py (97%) rename {openage => engine}/convert/processor/conversion/swgbcc/modpack_subprocessor.py (94%) rename {openage => engine}/convert/processor/conversion/swgbcc/nyan_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/swgbcc/pregen_subprocessor.py (99%) rename {openage => engine}/convert/processor/conversion/swgbcc/processor.py (99%) rename {openage => engine}/convert/processor/conversion/swgbcc/tech_subprocessor.py (97%) rename {openage => engine}/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py (98%) rename {openage => engine}/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py (99%) rename {openage => engine}/convert/processor/export/CMakeLists.txt (100%) rename {openage => engine}/convert/processor/export/__init__.pxd (100%) rename {openage => engine}/convert/processor/export/__init__.py (100%) rename {openage => engine}/convert/processor/export/data_exporter.py (89%) rename {openage => engine}/convert/processor/export/generate_manifest_hashes.py (90%) rename {openage => engine}/convert/processor/export/media_exporter.py (96%) rename {openage => engine}/convert/processor/export/modpack_exporter.py (96%) rename {openage => engine}/convert/processor/export/terrain_merge.pyx (98%) rename {openage => engine}/convert/processor/export/texture_merge.pyx (100%) rename {openage => engine}/convert/service/CMakeLists.txt (100%) rename {openage => engine}/convert/service/__init__.py (100%) rename {openage => engine}/convert/service/conversion/CMakeLists.txt (100%) rename {openage => engine}/convert/service/conversion/__init__.py (100%) rename {openage => engine}/convert/service/conversion/internal_name_lookups.py (95%) rename {openage => engine}/convert/service/debug_info.py (95%) rename {openage => engine}/convert/service/export/CMakeLists.txt (100%) rename {openage => engine}/convert/service/export/__init__.py (100%) rename {openage => engine}/convert/service/export/interface/CMakeLists.txt (100%) rename {openage => engine}/convert/service/export/interface/__init__.py (100%) rename {openage => engine}/convert/service/export/interface/cutter.py (100%) rename {openage => engine}/convert/service/export/interface/rename.py (95%) rename {openage => engine}/convert/service/export/interface/visgrep.pyx (100%) rename {openage => engine}/convert/service/export/load_media_cache.py (95%) rename {openage => engine}/convert/service/export/opus/CMakeLists.txt (100%) rename {openage => engine}/convert/service/export/opus/__init__.pxd (100%) rename {openage => engine}/convert/service/export/opus/__init__.py (100%) rename {openage => engine}/convert/service/export/opus/bytearray.pxd (100%) rename {openage => engine}/convert/service/export/opus/demo.py (100%) rename {openage => engine}/convert/service/export/opus/ogg.pxd (100%) rename {openage => engine}/convert/service/export/opus/opus.pxd (100%) rename {openage => engine}/convert/service/export/opus/opusenc.pyx (100%) rename {openage => engine}/convert/service/export/png/CMakeLists.txt (100%) rename {openage => engine}/convert/service/export/png/__init__.pxd (100%) rename {openage => engine}/convert/service/export/png/__init__.py (100%) rename {openage => engine}/convert/service/export/png/binpack.pxd (100%) rename {openage => engine}/convert/service/export/png/binpack.pyx (100%) rename {openage => engine}/convert/service/export/png/libpng.pxd (100%) rename {openage => engine}/convert/service/export/png/png_create.pyx (100%) rename {openage => engine}/convert/service/export/png/png_tmp_file.pxd (100%) rename {openage => engine}/convert/service/init/CMakeLists.txt (100%) rename {openage => engine}/convert/service/init/__init__.py (100%) rename {openage => engine}/convert/service/init/changelog.py (100%) rename {openage => engine}/convert/service/init/conversion_required.py (97%) rename {openage => engine}/convert/service/init/mount_asset_dirs.py (94%) rename {openage => engine}/convert/service/init/version_detect.py (98%) rename {openage => engine}/convert/service/read/CMakeLists.txt (100%) rename {openage => engine}/convert/service/read/__init__.py (100%) rename {openage => engine}/convert/service/read/gamedata.py (93%) rename {openage => engine}/convert/service/read/nyan_api_loader.py (100%) rename {openage => engine}/convert/service/read/palette.py (95%) rename {openage => engine}/convert/service/read/register_media.py (100%) rename {openage => engine}/convert/service/read/string_resource.py (98%) rename {openage => engine}/convert/tool/CMakeLists.txt (100%) rename {openage => engine}/convert/tool/__init__.py (100%) rename {openage => engine}/convert/tool/api_export.py (82%) rename {openage => engine}/convert/tool/driver.py (98%) rename {openage => engine}/convert/tool/interactive.py (94%) rename {openage => engine}/convert/tool/singlefile.py (98%) rename {openage => engine}/convert/tool/subtool/CMakeLists.txt (100%) rename {openage => engine}/convert/tool/subtool/__init__.py (100%) rename {openage => engine}/convert/tool/subtool/acquire_sourcedir.py (100%) rename {openage => engine}/convert/tool/subtool/version_select.py (94%) rename {openage => engine}/convert/value_object/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/aoc/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/aoc/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/aoc/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/de1/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/de1/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/de1/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/de2/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/de2/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/de2/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/forward_ref.py (91%) rename {openage => engine}/convert/value_object/conversion/hd/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/hd/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/ak/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/hd/ak/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/ak/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/fgt/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/hd/fgt/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/fgt/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/raj/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/hd/raj/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/hd/raj/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/ror/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/ror/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/ror/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/conversion/swgb/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/conversion/swgb/__init__.py (100%) rename {openage => engine}/convert/value_object/conversion/swgb/internal_nyan_names.py (100%) rename {openage => engine}/convert/value_object/init/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/init/__init__.py (100%) rename {openage => engine}/convert/value_object/init/game_file_version.py (100%) rename {openage => engine}/convert/value_object/init/game_version.py (100%) rename {openage => engine}/convert/value_object/read/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/read/__init__.py (100%) rename {openage => engine}/convert/value_object/read/dynamic_loader.py (89%) rename {openage => engine}/convert/value_object/read/genie_structure.py (99%) rename {openage => engine}/convert/value_object/read/media/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/read/media/__init__.pxd (100%) rename {openage => engine}/convert/value_object/read/media/__init__.py (100%) rename {openage => engine}/convert/value_object/read/media/blendomatic.py (95%) rename {openage => engine}/convert/value_object/read/media/colortable.py (95%) rename {openage => engine}/convert/value_object/read/media/datfile/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/read/media/datfile/__init__.py (100%) rename {openage => engine}/convert/value_object/read/media/datfile/civ.py (93%) rename {openage => engine}/convert/value_object/read/media/datfile/empiresdat.py (98%) rename {openage => engine}/convert/value_object/read/media/datfile/graphic.py (97%) rename {openage => engine}/convert/value_object/read/media/datfile/lookup_dicts.py (100%) rename {openage => engine}/convert/value_object/read/media/datfile/maps.py (97%) rename {openage => engine}/convert/value_object/read/media/datfile/playercolor.py (90%) rename {openage => engine}/convert/value_object/read/media/datfile/research.py (96%) rename {openage => engine}/convert/value_object/read/media/datfile/sound.py (93%) rename {openage => engine}/convert/value_object/read/media/datfile/tech.py (98%) rename {openage => engine}/convert/value_object/read/media/datfile/terrain.py (98%) rename {openage => engine}/convert/value_object/read/media/datfile/unit.py (99%) rename {openage => engine}/convert/value_object/read/media/drs.py (97%) rename {openage => engine}/convert/value_object/read/media/hardcoded/CMakeLists.txt (100%) rename {openage => engine}/convert/value_object/read/media/hardcoded/__init__.py (100%) rename {openage => engine}/convert/value_object/read/media/hardcoded/interface.py (100%) rename {openage => engine}/convert/value_object/read/media/hardcoded/termcolors.py (100%) rename {openage => engine}/convert/value_object/read/media/hardcoded/terrain_tile_size.py (100%) rename {openage => engine}/convert/value_object/read/media/hardcoded/texture.py (100%) rename {openage => engine}/convert/value_object/read/media/langcodes.py (100%) rename {openage => engine}/convert/value_object/read/media/pefile.py (98%) rename {openage => engine}/convert/value_object/read/media/peresource.py (98%) rename {openage => engine}/convert/value_object/read/media/sld.pyx (100%) rename {openage => engine}/convert/value_object/read/media/slp.pyx (100%) rename {openage => engine}/convert/value_object/read/media/smp.pyx (100%) rename {openage => engine}/convert/value_object/read/media/smx.pyx (100%) rename {openage => engine}/convert/value_object/read/media_types.py (100%) rename {openage => engine}/convert/value_object/read/member_access.py (100%) rename {openage => engine}/convert/value_object/read/read_members.py (98%) rename {openage => engine}/convert/value_object/read/value_members.py (100%) rename {openage => engine}/cppinterface/CMakeLists.txt (100%) rename {openage => engine}/cppinterface/__init__.py (100%) rename {openage => engine}/cppinterface/exctranslate.pyx (100%) rename {openage => engine}/cppinterface/exctranslate_tests.pyx (100%) rename {openage => engine}/cppinterface/pyobject.pyx (100%) rename {openage => engine}/cppinterface/setup.py (100%) rename {openage => engine}/cppinterface/setup_checker.pyx (100%) rename {openage => engine}/cppinterface/typedefs.pxd (100%) rename {openage => engine}/cvar/CMakeLists.txt (100%) rename {openage => engine}/cvar/__init__.py (100%) rename {openage => engine}/cvar/config_file.py (97%) rename {openage => engine}/cvar/cvar.pyx (94%) rename {openage => engine}/cvar/location.py (100%) rename {openage => engine}/cython_check.pyx (100%) rename {openage => engine}/default_dirs.py (100%) rename {openage => engine}/devmode.py (100%) rename {openage => engine}/event/CMakeLists.txt (100%) rename {openage => engine}/event/__init__.py (100%) rename {openage => engine}/event/demo.pyx (92%) rename {openage => engine}/game/CMakeLists.txt (100%) rename {openage => engine}/game/__init__.py (100%) rename {openage => engine}/game/main.py (100%) rename {openage => engine}/game/main_cpp.pyx (100%) rename {openage => engine}/log/CMakeLists.txt (100%) rename {openage => engine}/log/__init__.py (100%) rename {openage => engine}/log/log_cpp.pyx (100%) rename {openage => engine}/log/tests.py (100%) rename {openage => engine}/main/CMakeLists.txt (100%) rename {openage => engine}/main/__init__.py (100%) rename {openage => engine}/main/main.py (100%) rename {openage => engine}/main/main_cpp.pyx (100%) rename {openage => engine}/main/tests.pyx (100%) rename {openage => engine}/nyan/CMakeLists.txt (100%) rename {openage => engine}/nyan/__init__.py (100%) rename {openage => engine}/nyan/import_tree.py (98%) rename {openage => engine}/nyan/nyan_structs.py (99%) rename {openage => engine}/renderer/CMakeLists.txt (100%) rename {openage => engine}/renderer/__init__.py (100%) rename {openage => engine}/renderer/renderer_cpp.pyx (100%) rename {openage => engine}/renderer/tests.pyx (100%) rename {openage => engine}/testing/CMakeLists.txt (100%) rename {openage => engine}/testing/__init__.py (100%) rename {openage => engine}/testing/benchmark.py (100%) rename {openage => engine}/testing/cpp_testing.pyx (100%) rename {openage => engine}/testing/doctest.py (100%) rename {openage => engine}/testing/list_processor.py (98%) rename {openage => engine}/testing/main.py (99%) rename {openage => engine}/testing/misc_cpp.pyx (100%) rename {openage => engine}/testing/testing.py (100%) rename {openage => engine}/testing/testlist.py (80%) rename {openage => engine}/util/CMakeLists.txt (100%) rename {openage => engine}/util/__init__.py (100%) rename {openage => engine}/util/bytequeue.py (100%) rename {openage => engine}/util/context.py (100%) rename {openage => engine}/util/decorators.py (100%) rename {openage => engine}/util/filelike/CMakeLists.txt (100%) rename {openage => engine}/util/filelike/__init__.py (100%) rename {openage => engine}/util/filelike/abstract.py (100%) rename {openage => engine}/util/filelike/cpp.pyx (100%) rename {openage => engine}/util/filelike/fifo.py (100%) rename {openage => engine}/util/filelike/readonly.py (100%) rename {openage => engine}/util/filelike/stream.py (100%) rename {openage => engine}/util/files.py (96%) rename {openage => engine}/util/fslike/CMakeLists.txt (100%) rename {openage => engine}/util/fslike/__init__.py (100%) rename {openage => engine}/util/fslike/abstract.py (100%) rename {openage => engine}/util/fslike/cpp.pxd (100%) rename {openage => engine}/util/fslike/cpp.pyx (100%) rename {openage => engine}/util/fslike/directory.py (100%) rename {openage => engine}/util/fslike/filecollection.py (100%) rename {openage => engine}/util/fslike/path.py (100%) rename {openage => engine}/util/fslike/test.py (99%) rename {openage => engine}/util/fslike/union.py (100%) rename {openage => engine}/util/fslike/wrapper.py (100%) rename {openage => engine}/util/fsprinting.py (98%) rename {openage => engine}/util/hash.py (94%) rename {openage => engine}/util/iterators.py (100%) rename {openage => engine}/util/math.py (100%) rename {openage => engine}/util/observer.py (100%) rename {openage => engine}/util/ordered_set.py (100%) rename {openage => engine}/util/profiler.py (100%) rename {openage => engine}/util/strings.py (100%) rename {openage => engine}/util/struct.py (100%) rename {openage => engine}/util/system.py (100%) rename {openage => engine}/util/threading.py (100%) rename {openage => engine}/versions/CMakeLists.txt (100%) rename {openage => engine}/versions/__init__.py (100%) rename {openage => engine}/versions/versions.pyx (100%) rename run.py.in => openage.py.in (77%) diff --git a/.gitignore b/.gitignore index 1910b8d6ac..d659276e17 100644 --- a/.gitignore +++ b/.gitignore @@ -35,9 +35,9 @@ __pycache__ /.cache # root dir run script -/run -/run.cpp -/run.html +/openage +/openage.cpp +/openage.html # CMake in-source builds /DartConfiguration.tcl diff --git a/CMakeLists.txt b/CMakeLists.txt index 47484acb06..136b699af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,7 +218,7 @@ endif() # documentation generation # create documentation -doxygen_configure(libopenage/ openage/ doc/ README.md) +doxygen_configure(libopenage/ engine/ doc/ README.md) ################################################## @@ -251,10 +251,10 @@ target_compile_options(pyext_libopenage INTERFACE target_link_libraries(pyext_libopenage INTERFACE libopenage) set(PYEXT_LINK_LIBRARY pyext_libopenage) -configure_file(run.py.in run.py) -add_cython_modules(EMBED NOINSTALL ${CMAKE_CURRENT_BINARY_DIR}/run.py) -add_py_modules(BININSTALL ${CMAKE_CURRENT_BINARY_DIR}/run.py AS openage) -add_subdirectory(openage/) +configure_file(openage.py.in openage.py) +add_cython_modules(EMBED NOINSTALL ${CMAKE_CURRENT_BINARY_DIR}/openage.py) +add_py_modules(BININSTALL ${CMAKE_CURRENT_BINARY_DIR}/openage.py AS openage) +add_subdirectory(engine/) python_finalize() diff --git a/Makefile b/Makefile index da6c6a2ae9..45809c65d1 100644 --- a/Makefile +++ b/Makefile @@ -22,14 +22,14 @@ install: $(BUILDDIR) .PHONY: run run: build - cd $(BUILDDIR) && ./run game + cd $(BUILDDIR) && ./openage game .PHONY: test test: tests checkfast .PHONY: tests tests: build - cd $(BUILDDIR) && ./run test -a + cd $(BUILDDIR) && ./openage test -a .PHONY: build build: $(BUILDDIR) @@ -109,7 +109,7 @@ cleanbuilddirs: cleaninsourcebuild @echo cleaning build directories rm -rf .bin @echo cleaning cmake-time generated code - rm -f Doxyfile py/openage/config.py libopenage/config.h libopenage/config.cpp + rm -f Doxyfile py/engine/config.py libopenage/config.h libopenage/config.cpp .PHONY: mrproper mrproper: cleanbuilddirs diff --git a/README.md b/README.md index f40bd91d3f..b71289bac0 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Quickstart ``` * **I compiled everything. Now how do I run it?** - * Execute `./bin/run`. + * Execute `./bin/openage`. * [The convert script](/doc/media_convert.md) will transform original assets into openage formats, which are a lot saner and more moddable. * Use your brain and react to the things you'll see. @@ -139,7 +139,7 @@ Quickstart All of those are features, not bugs. -To turn them off, use `./bin/run --dont-segfault --no-errors --dont-eat-dog`. +To turn them off, use `./bin/openage --dont-segfault --no-errors --dont-eat-dog`. If this still does not help, try our [troubleshooting guide](/doc/troubleshooting.md), the [contact section](#contact) diff --git a/buildsystem/__init__.py b/buildsystem/__init__.py index 58b8a082a8..798b3811d2 100644 --- a/buildsystem/__init__.py +++ b/buildsystem/__init__.py @@ -5,5 +5,5 @@ Modules in the 'buildsystem' package are not intended to be installed with openage, or used from outside the build process; otherwise, they -would be in the 'openage' package. +would be in the 'engine' package. """ diff --git a/buildsystem/codecompliance/__main__.py b/buildsystem/codecompliance/__main__.py index dded8dd0a9..3532c6782a 100644 --- a/buildsystem/codecompliance/__main__.py +++ b/buildsystem/codecompliance/__main__.py @@ -231,11 +231,11 @@ def find_all_issues(args, check_files=None): if args.pystyle: from .pystyle import find_issues - yield from find_issues(check_files, ('openage', 'buildsystem')) + yield from find_issues(check_files, ('engine', 'buildsystem')) if args.cython: from buildsystem.codecompliance.cython import find_issues - yield from find_issues(check_files, ('openage',)) + yield from find_issues(check_files, ('engine',)) if args.cppstyle: from .cppstyle import find_issues @@ -243,12 +243,12 @@ def find_all_issues(args, check_files=None): if args.pylint: from .pylint import find_issues - yield from find_issues(check_files, ('openage', 'buildsystem')) + yield from find_issues(check_files, ('engine', 'buildsystem')) if args.textfiles: from .textfiles import find_issues yield from find_issues( - ('openage', 'libopenage', 'buildsystem', 'doc', 'legal'), + ('engine', 'libopenage', 'buildsystem', 'doc', 'legal'), ('.pxd', '.pyx', '.pxi', '.py', '.h', '.cpp', '.template', '', '.txt', '.md', '.conf', @@ -257,12 +257,12 @@ def find_all_issues(args, check_files=None): if args.legal: from .legal import find_issues yield from find_issues(check_files, - ('openage', 'buildsystem', 'libopenage'), + ('engine', 'buildsystem', 'libopenage'), args.test_git_change_years) if args.filemodes: from .modes import find_issues - yield from find_issues(check_files, ('openage', 'buildsystem', + yield from find_issues(check_files, ('engine', 'buildsystem', 'libopenage')) diff --git a/buildsystem/codecompliance/textfiles.py b/buildsystem/codecompliance/textfiles.py index 911cd6036e..3ef1251f77 100644 --- a/buildsystem/codecompliance/textfiles.py +++ b/buildsystem/codecompliance/textfiles.py @@ -31,7 +31,7 @@ def find_issues(dirnames, exts): # TODO all this for now, until someone fixes the codegen. continue - if filename.startswith('openage/') and filename.endswith('.cpp'): + if filename.startswith('engine/') and filename.endswith('.cpp'): # allow issues for Cython-generated files. continue diff --git a/buildsystem/codegen.cmake b/buildsystem/codegen.cmake index 068078bf6d..7232b9a880 100644 --- a/buildsystem/codegen.cmake +++ b/buildsystem/codegen.cmake @@ -49,7 +49,7 @@ function(codegen_run) COMMAND "${CMAKE_COMMAND}" -E touch "${CODEGEN_TIMEFILE}" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" DEPENDS ${CODEGEN_DEPENDS} - COMMENT "openage.codegen: generating c++ code" + COMMENT "engine.codegen: generating c++ code" ) add_custom_target(codegen diff --git a/buildsystem/templates/ExternalFetch.cmake.in b/buildsystem/templates/ExternalFetch.cmake.in index 492f89b8d4..2364b16aaf 100644 --- a/buildsystem/templates/ExternalFetch.cmake.in +++ b/buildsystem/templates/ExternalFetch.cmake.in @@ -6,7 +6,7 @@ # in the configure phase. # -> in the configure phase, run cmake again to download the project. # -# this is the file used to tell the nested cmake run what to do. +# this is the file used to tell the nested cmake openage what to do. cmake_minimum_required(VERSION 3.6) diff --git a/doc/build_instructions/macos.md b/doc/build_instructions/macos.md index ffe6e64f67..1ab8601a60 100644 --- a/doc/build_instructions/macos.md +++ b/doc/build_instructions/macos.md @@ -40,7 +40,7 @@ make -j$(sysctl -n hw.ncpu) ## Running -`make run` or `./bin/run` launches the game. Try `./bin/run --help`! +`make openage` or `./bin/openage` launches the game. Try `./bin/openage --help`! ## To create the documentation diff --git a/doc/building.md b/doc/building.md index 81d075eebb..e366700add 100644 --- a/doc/building.md +++ b/doc/building.md @@ -130,7 +130,7 @@ Make sure you have all the dependencies installed. - configure: `CC=/path/to/downloaded-llvm/bin/clang CXX=/path/to/downloaded-llvm/bin/clang++ LD=/path/to/downloaded-llvm/bin/ld64.lld ./configure --download-nyan` - a small build hint for later: use your freaking cores with the -j option later `make -j$(sysctl -n hw.ncpu)` - `make` generates and builds everything -- `make run` or `bin/run` launches the game. Try `bin/run --help`! +- `make openage` or `bin/openage` launches the game. Try `bin/openage --help`! - `make test` runs the built-in tests. diff --git a/doc/buildsystem.md b/doc/buildsystem.md index 57dcdaf1d7..9101c02f2a 100644 --- a/doc/buildsystem.md +++ b/doc/buildsystem.md @@ -20,7 +20,7 @@ Components The buildsystem is pretty sophisticated because *openage* consists of C++ code, generated C++ code, generated Cython code and Python code. All C++ parts are packed in `libopenage`, the Python stuff is in the `openage` -python package. We generate code with the `openage.codegen` Python +python package. We generate code with the `engine.codegen` Python package. @@ -29,8 +29,8 @@ Procedure Steps in building openage: - - generate `openage/config.py` and `libopenage/config.{h, cpp}` from their `*.in` template files, which contain install prefix and version info - - run `openage.codegen` (Python module) to generate C++ source files (recipe: `codegen`) + - generate `engine/config.py` and `libopenage/config.{h, cpp}` from their `*.in` template files, which contain install prefix and version info + - run `engine.codegen` (Python module) to generate C++ source files (recipe: `codegen`) - generate `.pxd` Cython extension declaration files from annotated `.h` files (recipe: `pxdgen`) - build and link `libopenage.so` (recipe: `openage`) - build Cython extension modules (generate cpp files and compile them, via `buildsystem.cythonize`) (recipe: `cython`); those link against libopenage. @@ -116,7 +116,7 @@ codegen Provides the function `codegen_run`, which - - at cmake-time, runs the openage.codegen python module to obtain a list of sources it will generate + - at cmake-time, runs the engine.codegen python module to obtain a list of sources it will generate - at build time, actually generates the sources and writes them to the source directory where necessary It sets the variable `CODEGEN_TARGET_TUS`, containing a list of created `cpp` files. That variable is designed to be used in a call to `add_sources(openage GENERATED ${CODEGEN_TARGET_TUS})`. diff --git a/doc/code/pyinterface.md b/doc/code/pyinterface.md index 25c2a66b1b..becc68ce18 100644 --- a/doc/code/pyinterface.md +++ b/doc/code/pyinterface.md @@ -162,7 +162,7 @@ pxdgen(example.h) The function is now available from Cython. To make it available for pure-python modules, write a wrapper: -`openage/foo.pyx` +`engine/foo.pyx` ``` cython from libopenage.foo cimport foo as c_foo @@ -172,10 +172,10 @@ def foo(int arg0, str arg1): return c_foo(arg0, arg1) ``` -`openage/bar.py` +`engine/bar.py` ``` python -from openage.foo import foo +from engine.foo import foo print(foo(10, "test")) ``` @@ -278,7 +278,7 @@ it allows *binding arguments* and makes sure that the pointer is properly initia We will call this pure-Python function from C++: -`openage/bar.py` +`engine/bar.py` ``` python def bar(arg0, arg1): @@ -314,7 +314,7 @@ extern OAAPI PyIfFunc bar; Wrap the python function in a `cdef` function, and define a method `setup()`, which binds the `cdef` function to the PyIfFunc object. -`openage/foo.pyx` +`engine/foo.pyx` ``` cython from libopenage.foo cimport bar as c_bar @@ -333,13 +333,13 @@ arguments are bound (this is needed because Cython currently doesn't support var Add a call to `openage.foo.setup()` to `openage.cppinterface.setup.setup`. -`openage/pyinterface/setup.pyx` +`engine/pyinterface/setup.pyx` ``` python def setup(): # (...) - from openage.foo import setup + from engine.foo import setup setup() # (...) @@ -363,11 +363,11 @@ Real-life examples ------------------ * For code that wraps a C++ class for Python, see: - * `openage/cabextract/lzxd.pyx` + * `engine/cabextract/lzxd.pyx` * `libopenage/util/lzxd.h` * For code that wraps a Python class for C++, see: * `libopenage/util/fslike/path.h` - * `openage/util/fslike/cpp.pyx` + * `engine/util/fslike/cpp.pyx` * Search for `.pyx` files in the repo diff --git a/doc/code/testing.md b/doc/code/testing.md index b64b51d9bb..8761a735c4 100644 --- a/doc/code/testing.md +++ b/doc/code/testing.md @@ -15,9 +15,9 @@ Tests run without user interaction to check for errors automatically. All tests are run automatically by [Kevin](https://github.com/SFTtech/kevin/) for pullrequests. -You can invoke them with `bin/run test -a` or `make test` +You can invoke them with `bin/openage test -a` or `make test` -Have a look at `bin/run test --help` for further options. +Have a look at `bin/openage test --help` for further options. You are encouraged to write tests for all your contributions, as well as other components that currently lack testing. @@ -33,9 +33,9 @@ In addition to testing, openage supports _demos_: As opposed to tests, demos are run manually and individually by the user. They usually produce lots of output on stdout or may even be interactive. Python demos even accept an `argv` parameter. -All tests must be registered in `openage/testing/testlist.py` (else the game won't know about them). +All tests must be registered in `engine/testing/testlist.py` (else the game won't know about them). -Also see `bin/run test --help`. +Also see `bin/openage test --help`. ## Adding new tests @@ -45,7 +45,7 @@ C++ tests are simple `void()` functions somewhere in the `openage` namespace. They shall return on success, and raise `openage::testing::TestError` on failure. -They shall not be declared in a header file; instead, add them to `openage/testing/testlist.py`. +They shall not be declared in a header file; instead, add them to `engine/testing/testlist.py`. The header `libopenage/testing/testing.h` provides `TestError` and some convenience macros: @@ -77,7 +77,7 @@ Python tests are simple argument-less functions somewhere in the `openage` packa They shall return `None` on success, and raise `openage.testing.testing.TestError` on failure. -Add their names to `openage/testing/testlist.py`. +Add their names to `engine/testing/testlist.py`. The module `openage.testing.testing` provides `TestError` and some convenience functions: @@ -85,7 +85,7 @@ The module `openage.testing.testing` provides `TestError` and some convenience f checks whether expr == expected, and raises `TestError` if not. - `assert_raises(expected_exception_type)` a context guard that verifies that the named exception occurs inside; - consult the example in `openage/testing/testing.py`. + consult the example in `engine/testing/testing.py`. You may define tests in `.pyx` files. @@ -107,7 +107,7 @@ def test_prime(): They defined in function and module docstrings, are extremely lightweight and also serve as documentation. -Simply add the name of a Python module to `openage/testing/testlist.py`, and all doctests in that module will run. +Simply add the name of a Python module to `engine/testing/testlist.py`, and all doctests in that module will run. Example doctest for a function: @@ -126,7 +126,7 @@ def is_prime(p): ### C++ demos -Technically, those are very much like `C++` tests. In fact, the only difference to tests is the section in `openage/testing/testlist.py` where they are declared. +Technically, those are very much like `C++` tests. In fact, the only difference to tests is the section in `engine/testing/testlist.py` where they are declared. C++ demos don't support `argv`; if you want that, make it a Python demo in a `.pyx` file and do the argparsing in Python; the Python demo function can then easily call any C++ function using the Python interface. @@ -135,7 +135,7 @@ C++ demos don't support `argv`; if you want that, make it a Python demo in a `.p Similar to Python tests, but have one argument, `argv`. Pass arguments in the invocation: - bin/run test -d prime_demo 100 + bin/openage test -d prime_demo 100 Example demo: diff --git a/doc/convert/convert_single_file.md b/doc/convert/convert_single_file.md index f8c7f16d31..df76957085 100644 --- a/doc/convert/convert_single_file.md +++ b/doc/convert/convert_single_file.md @@ -40,7 +40,7 @@ Standalone WAVs (Age of Empires 2: HD Edition): python3 -m openage convert-file ~/games/aoe2/resources/123.wav /tmp/rofl.opus ``` -Have a look at `openage/convert/singlefile.py`, this is also a simple API demo +Have a look at `engine/convert/singlefile.py`, this is also a simple API demo for how to interact with the aoe files. diff --git a/doc/convert/nyan.md b/doc/convert/nyan.md index 5d28947c6a..e7638911ca 100644 --- a/doc/convert/nyan.md +++ b/doc/convert/nyan.md @@ -6,4 +6,4 @@ by parsing the original data. ## Gamedata conversion -`openage/convert/value_object/read/media/datfile/` specifies the format of the `.dat` from various games. +`engine/convert/value_object/read/media/datfile/` specifies the format of the `.dat` from various games. diff --git a/doc/debug.md b/doc/debug.md index e8f838e0b2..f3274d0f69 100644 --- a/doc/debug.md +++ b/doc/debug.md @@ -22,8 +22,8 @@ gdb -ex 'set breakpoint pending on' -ex 'b openage::run_game' -ex run --args run The game will be paused at the start of the function run_game() located in `libopenage/main.cpp` #### Note: -The `run` executable is a compiled version of `run.py` that also embeds the interpreter. -The game is intended to be run by `run.py` but it is much easier to debug the `./run` file +The `openage` executable is a compiled version of `openage.py` that also embeds the interpreter. +The game is intended to be run by `openage.py` but it is much easier to debug the `./openage` file ### GDBGUI @@ -36,7 +36,7 @@ sudo pip3 install gdbgui --upgrade ``` Then ``` -gdbgui ./run +gdbgui ./openage ``` The gdbgui web page will be at `http://127.0.0.1:5000` -Use the command `run` in the GDB prompt to start debugging +Use the command `openage` in the GDB prompt to start debugging diff --git a/doc/ide/qt_creator.md b/doc/ide/qt_creator.md index eeca5757d1..60a7a833e3 100644 --- a/doc/ide/qt_creator.md +++ b/doc/ide/qt_creator.md @@ -25,9 +25,9 @@ Go to **Projects** -> **openage** -> **Build & Run** -> **Build** -> **Build Ste ## Run & Debug 1. To set the correct executable, first go to **Projects** -> **openage** -> **Build & Run** -> **Run** page. -1. In the **Run configuration** combo-box select **Custom Executable** and set **Executable** to `/run`. +1. In the **Run configuration** combo-box select **Custom Executable** and set **Executable** to `/openage`. 1. Set **Working directory** to ``. `` is the directory where the sources of the openage are (the directory of the root `CMakeLists.txt` file). -The `/run` binary has no executable bit set when first built, set it manually with `chmod`. +The `/openage` binary has no executable bit set when first built, set it manually with `chmod`. diff --git a/doc/media/original-metadata.md b/doc/media/original-metadata.md index 5e5540fe44..04b52777cd 100644 --- a/doc/media/original-metadata.md +++ b/doc/media/original-metadata.md @@ -5,7 +5,7 @@ All data relevant for the game (e.g. how much costs building the castle? What cultures exist? Can my priest overclock his "Wololo?") are stored in a binary format in the file `empires2_x1_p1.dat`. -The format is described in the [huge struct definition](/openage/convert/value_object/read/media/datfile/empiresdat.py). +The format is described in the [huge struct definition](/engine/convert/value_object/read/media/datfile/empiresdat.py). These data files are basically a huge tree structure. diff --git a/doc/media_convert.md b/doc/media_convert.md index a6526de99e..c70043e56f 100644 --- a/doc/media_convert.md +++ b/doc/media_convert.md @@ -31,8 +31,8 @@ The game version vs Game_ID table such as below: ## Conversion -The original AoC game asset formats are, lets say, "special", so they need to be converted in order to be usable from openage. -That conversion is performed by the `openage.convert` python module when the game is run for the first time. +The original AoC game asset formats are, lets say, "special", so they need to be converted in order to be usable from engine. +That conversion is performed by the `engine.convert` python module when the game is run for the first time. The game will ask for your AoE II installation folder; examples include: diff --git a/doc/project_structure.md b/doc/project_structure.md index 4b2498aae8..0e6e6a523e 100644 --- a/doc/project_structure.md +++ b/doc/project_structure.md @@ -18,7 +18,7 @@ This file explains the modular structure of the project. 6. [etc/](#etc) 7. [legal/](#legal) 8. [libopenage/](#libopenage) - 9. [openage/](#openage) + 9. [engine/](#openage) 10. [packaging/](#packaging) @@ -99,7 +99,7 @@ All engine components, data structures and C++ tests are located in this folder, each subsystem resides in its own subfolder. -### openage/ +### engine/ Contains the Python3 auxiliary components of openage. Python3 is used for non-data-crunching tasks, like converting original assets, diff --git a/doc/running.md b/doc/running.md index ffcdf15e76..ac002b42a0 100644 --- a/doc/running.md +++ b/doc/running.md @@ -25,7 +25,7 @@ make you can execute ``` -bin/run +bin/openage ``` from the same subfolder. This automatically selects the [`game` mode](#game) as default @@ -37,12 +37,12 @@ almost idiot-proof! ## Modes -Modes can be selected manually by appending the `bin/run` prompt with the mode name. +Modes can be selected manually by appending the `bin/openage` prompt with the mode name. ### `game` ``` -bin/run game +bin/openage game ``` Start the engine and immediately create a new game instance. This run mode is supposed @@ -57,7 +57,7 @@ It's the default run mode. ### `main` ``` -bin/run main +bin/openage main ``` This run mode is supposed to start a main menu or launcher which allows configuring a @@ -68,7 +68,7 @@ thing as `game`. ### `test` ``` -bin/run test +bin/openage test ``` Used for running [tests and engine demos](code/testing.md). These show off selected @@ -78,7 +78,7 @@ subsystems of the engine. ### `convert` ``` -bin/run convert +bin/openage convert ``` Runs the [asset conversion](media_convert.md) subsystem which creates openage modpacks @@ -88,7 +88,7 @@ from original game installations. ### `convert-file` ``` -bin/run convert-file +bin/openage convert-file ``` Allows converting single media files using the original game formats to open formats @@ -98,7 +98,7 @@ Allows converting single media files using the original game formats to open for ### `convert-export-api` ``` -bin/run convert-export-api +bin/openage convert-export-api ``` Exports the [openage modding API](nyan/README.md) nyan objects to a modpack that can @@ -113,7 +113,7 @@ the converter subsystem as a single source of truth. ### `codegen` ``` -bin/run codegen +bin/openage codegen ``` Runs the code generation logic for the build process. In particular, this generates code diff --git a/openage/.gitignore b/engine/.gitignore similarity index 100% rename from openage/.gitignore rename to engine/.gitignore diff --git a/openage/CMakeLists.txt b/engine/CMakeLists.txt similarity index 100% rename from openage/CMakeLists.txt rename to engine/CMakeLists.txt diff --git a/openage/__init__.py b/engine/__init__.py similarity index 100% rename from openage/__init__.py rename to engine/__init__.py diff --git a/openage/__main__.py b/engine/__main__.py similarity index 100% rename from openage/__main__.py rename to engine/__main__.py diff --git a/openage/assets.py b/engine/assets.py similarity index 97% rename from openage/assets.py rename to engine/assets.py index 8ffb06e484..abe6d890dd 100644 --- a/openage/assets.py +++ b/engine/assets.py @@ -18,7 +18,7 @@ from . import default_dirs if typing.TYPE_CHECKING: - from openage.util.fslike.directory import Directory + from engine.util.fslike.directory import Directory def get_asset_path(custom_asset_dir: str = None) -> Directory: diff --git a/openage/cabextract/CMakeLists.txt b/engine/cabextract/CMakeLists.txt similarity index 100% rename from openage/cabextract/CMakeLists.txt rename to engine/cabextract/CMakeLists.txt diff --git a/openage/cabextract/__init__.py b/engine/cabextract/__init__.py similarity index 100% rename from openage/cabextract/__init__.py rename to engine/cabextract/__init__.py diff --git a/openage/cabextract/cab.py b/engine/cabextract/cab.py similarity index 99% rename from openage/cabextract/cab.py rename to engine/cabextract/cab.py index f8b55ce53c..33b590bb77 100644 --- a/openage/cabextract/cab.py +++ b/engine/cabextract/cab.py @@ -25,7 +25,7 @@ from .cabchecksum import mscab_csum if typing.TYPE_CHECKING: - from openage.util.filelike.abstract import FileLikeObject + from engine.util.filelike.abstract import FileLikeObject class CFHeaderFlags(Flags): diff --git a/openage/cabextract/cabchecksum.pyx b/engine/cabextract/cabchecksum.pyx similarity index 100% rename from openage/cabextract/cabchecksum.pyx rename to engine/cabextract/cabchecksum.pyx diff --git a/openage/cabextract/gen_test_arc.sh b/engine/cabextract/gen_test_arc.sh similarity index 100% rename from openage/cabextract/gen_test_arc.sh rename to engine/cabextract/gen_test_arc.sh diff --git a/openage/cabextract/lzxd.pyx b/engine/cabextract/lzxd.pyx similarity index 98% rename from openage/cabextract/lzxd.pyx rename to engine/cabextract/lzxd.pyx index 42b5297b90..6ab39ceb8b 100644 --- a/openage/cabextract/lzxd.pyx +++ b/engine/cabextract/lzxd.pyx @@ -13,7 +13,7 @@ from libopenage.util.compress.lzxd cimport ( from libopenage.pyinterface.functional cimport Func2 -from openage.cppinterface.typedefs cimport voidptr +from engine.cppinterface.typedefs cimport voidptr cdef class LZXDecompressor: diff --git a/openage/cabextract/lzxdstream.py b/engine/cabextract/lzxdstream.py similarity index 100% rename from openage/cabextract/lzxdstream.py rename to engine/cabextract/lzxdstream.py diff --git a/openage/cabextract/test.py b/engine/cabextract/test.py similarity index 100% rename from openage/cabextract/test.py rename to engine/cabextract/test.py diff --git a/openage/codegen/CMakeLists.txt b/engine/codegen/CMakeLists.txt similarity index 100% rename from openage/codegen/CMakeLists.txt rename to engine/codegen/CMakeLists.txt diff --git a/openage/codegen/__init__.py b/engine/codegen/__init__.py similarity index 100% rename from openage/codegen/__init__.py rename to engine/codegen/__init__.py diff --git a/openage/codegen/codegen.py b/engine/codegen/codegen.py similarity index 98% rename from openage/codegen/codegen.py rename to engine/codegen/codegen.py index 7696a837b4..09f144cd7c 100644 --- a/openage/codegen/codegen.py +++ b/engine/codegen/codegen.py @@ -178,15 +178,15 @@ def depend_module_blacklist(): # thus, the depends list will change at the second run of codegen, # re-triggering cmake. try: - import openage.config - yield openage.config + import engine.config + yield engine.config except ImportError: pass # devmode is imported by config, so the same reason as above applies. try: - import openage.devmode - yield openage.devmode + import engine.devmode + yield engine.devmode except ImportError: pass diff --git a/openage/codegen/coord.py b/engine/codegen/coord.py similarity index 100% rename from openage/codegen/coord.py rename to engine/codegen/coord.py diff --git a/openage/codegen/cpp_testlist.py b/engine/codegen/cpp_testlist.py similarity index 100% rename from openage/codegen/cpp_testlist.py rename to engine/codegen/cpp_testlist.py diff --git a/openage/codegen/listing.py b/engine/codegen/listing.py similarity index 100% rename from openage/codegen/listing.py rename to engine/codegen/listing.py diff --git a/openage/codegen/main.py b/engine/codegen/main.py similarity index 100% rename from openage/codegen/main.py rename to engine/codegen/main.py diff --git a/openage/config.py.in b/engine/config.py.in similarity index 100% rename from openage/config.py.in rename to engine/config.py.in diff --git a/openage/convert/CMakeLists.txt b/engine/convert/CMakeLists.txt similarity index 100% rename from openage/convert/CMakeLists.txt rename to engine/convert/CMakeLists.txt diff --git a/openage/convert/__init__.py b/engine/convert/__init__.py similarity index 100% rename from openage/convert/__init__.py rename to engine/convert/__init__.py diff --git a/openage/convert/entity_object/CMakeLists.txt b/engine/convert/entity_object/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/CMakeLists.txt rename to engine/convert/entity_object/CMakeLists.txt diff --git a/openage/convert/entity_object/__init__.py b/engine/convert/entity_object/__init__.py similarity index 100% rename from openage/convert/entity_object/__init__.py rename to engine/convert/entity_object/__init__.py diff --git a/openage/convert/entity_object/conversion/CMakeLists.txt b/engine/convert/entity_object/conversion/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/conversion/CMakeLists.txt rename to engine/convert/entity_object/conversion/CMakeLists.txt diff --git a/openage/convert/entity_object/conversion/__init__.py b/engine/convert/entity_object/conversion/__init__.py similarity index 100% rename from openage/convert/entity_object/conversion/__init__.py rename to engine/convert/entity_object/conversion/__init__.py diff --git a/openage/convert/entity_object/conversion/aoc/CMakeLists.txt b/engine/convert/entity_object/conversion/aoc/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/conversion/aoc/CMakeLists.txt rename to engine/convert/entity_object/conversion/aoc/CMakeLists.txt diff --git a/openage/convert/entity_object/conversion/aoc/__init__.py b/engine/convert/entity_object/conversion/aoc/__init__.py similarity index 100% rename from openage/convert/entity_object/conversion/aoc/__init__.py rename to engine/convert/entity_object/conversion/aoc/__init__.py diff --git a/openage/convert/entity_object/conversion/aoc/genie_civ.py b/engine/convert/entity_object/conversion/aoc/genie_civ.py similarity index 91% rename from openage/convert/entity_object/conversion/aoc/genie_civ.py rename to engine/convert/entity_object/conversion/aoc/genie_civ.py index bb0dddb334..4a2a4f9350 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_civ.py +++ b/engine/convert/entity_object/conversion/aoc/genie_civ.py @@ -11,12 +11,12 @@ from .genie_tech import CivTeamBonus, CivTechTree if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_tech import CivBonus, GenieTechObject - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.entity_object.conversion.aoc.genie_tech import CivBonus, GenieTechObject + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.value_object.read.value_members import ValueMember class GenieCivilizationObject(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_connection.py b/engine/convert/entity_object/conversion/aoc/genie_connection.py similarity index 96% rename from openage/convert/entity_object/conversion/aoc/genie_connection.py rename to engine/convert/entity_object/conversion/aoc/genie_connection.py index 5c2289706e..a36eb70e0b 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_connection.py +++ b/engine/convert/entity_object/conversion/aoc/genie_connection.py @@ -11,9 +11,9 @@ from ..converter_object import ConverterObject if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieAgeConnection(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_effect.py b/engine/convert/entity_object/conversion/aoc/genie_effect.py similarity index 95% rename from openage/convert/entity_object/conversion/aoc/genie_effect.py rename to engine/convert/entity_object/conversion/aoc/genie_effect.py index 3a2f3b6014..13ba30c693 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_effect.py +++ b/engine/convert/entity_object/conversion/aoc/genie_effect.py @@ -10,9 +10,9 @@ from ..converter_object import ConverterObject if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieEffectObject(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_graphic.py b/engine/convert/entity_object/conversion/aoc/genie_graphic.py similarity index 95% rename from openage/convert/entity_object/conversion/aoc/genie_graphic.py rename to engine/convert/entity_object/conversion/aoc/genie_graphic.py index b14c215510..0011e1d53c 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_graphic.py +++ b/engine/convert/entity_object/conversion/aoc/genie_graphic.py @@ -9,9 +9,9 @@ from ..converter_object import ConverterObject if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieGraphic(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_object_container.py b/engine/convert/entity_object/conversion/aoc/genie_object_container.py similarity index 75% rename from openage/convert/entity_object/conversion/aoc/genie_object_container.py rename to engine/convert/entity_object/conversion/aoc/genie_object_container.py index 510cb5e8cb..c59ccb546f 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_object_container.py +++ b/engine/convert/entity_object/conversion/aoc/genie_object_container.py @@ -12,31 +12,31 @@ from ..converter_object import ConverterObjectContainer if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import RawAPIObject - from openage.convert.entity_object.conversion.combined_sound import CombinedSound - from openage.convert.entity_object.conversion.combined_sprite import CombinedSprite - from openage.convert.entity_object.conversion.combined_terrain import CombinedTerrain - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationObject, \ + from engine.convert.entity_object.conversion.converter_object import RawAPIObject + from engine.convert.entity_object.conversion.combined_sound import CombinedSound + from engine.convert.entity_object.conversion.combined_sprite import CombinedSprite + from engine.convert.entity_object.conversion.combined_terrain import CombinedTerrain + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationObject, \ GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_connection import GenieAgeConnection, \ + from engine.convert.entity_object.conversion.aoc.genie_connection import GenieAgeConnection, \ GenieBuildingConnection, GenieTechConnection, GenieUnitConnection - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectBundle - from openage.convert.entity_object.conversion.aoc.genie_graphic import GenieGraphic - from openage.convert.entity_object.conversion.aoc.genie_sound import GenieSound - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechObject, \ + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectBundle + from engine.convert.entity_object.conversion.aoc.genie_graphic import GenieGraphic + from engine.convert.entity_object.conversion.aoc.genie_sound import GenieSound + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechObject, \ AgeUpgrade, BuildingLineUpgrade, BuildingUnlock, CivBonus, GenieTechEffectBundleGroup, \ InitiatedTech, StatUpgrade, UnitLineUpgrade, UnitUnlock - from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject, \ + from engine.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject, \ GenieTerrainGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitObject, \ + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieUnitObject, \ GenieAmbientGroup, GenieBuildingLineGroup, GenieMonkGroup, GenieUnitLineGroup, \ GenieUnitTaskGroup, GenieUnitTransformGroup, GenieVariantGroup, GenieVillagerGroup, \ GenieGameEntityGroup - from openage.convert.entity_object.export.media_export_request import MediaExportRequest - from openage.convert.entity_object.export.metadata_export import MetadataExport - from openage.convert.value_object.init.game_version import GameVersion - from openage.nyan.nyan_structs import NyanObject + from engine.convert.entity_object.export.media_export_request import MediaExportRequest + from engine.convert.entity_object.export.metadata_export import MetadataExport + from engine.convert.value_object.init.game_version import GameVersion + from engine.nyan.nyan_structs import NyanObject class GenieObjectContainer(ConverterObjectContainer): diff --git a/openage/convert/entity_object/conversion/aoc/genie_sound.py b/engine/convert/entity_object/conversion/aoc/genie_sound.py similarity index 91% rename from openage/convert/entity_object/conversion/aoc/genie_sound.py rename to engine/convert/entity_object/conversion/aoc/genie_sound.py index e5cf6f8513..b9ff9f9e79 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_sound.py +++ b/engine/convert/entity_object/conversion/aoc/genie_sound.py @@ -9,9 +9,9 @@ from ..converter_object import ConverterObject if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieSound(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_tech.py b/engine/convert/entity_object/conversion/aoc/genie_tech.py similarity index 98% rename from openage/convert/entity_object/conversion/aoc/genie_tech.py rename to engine/convert/entity_object/conversion/aoc/genie_tech.py index cdfdc23f1f..88ee9b7ed7 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_tech.py +++ b/engine/convert/entity_object/conversion/aoc/genie_tech.py @@ -9,13 +9,13 @@ from ..converter_object import ConverterObject, ConverterObjectGroup if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject, \ + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject, \ GenieEffectBundle - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ GenieBuildingLineGroup - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieTechObject(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_terrain.py b/engine/convert/entity_object/conversion/aoc/genie_terrain.py similarity index 94% rename from openage/convert/entity_object/conversion/aoc/genie_terrain.py rename to engine/convert/entity_object/conversion/aoc/genie_terrain.py index a361c754db..9c1a691a8e 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_terrain.py +++ b/engine/convert/entity_object/conversion/aoc/genie_terrain.py @@ -9,9 +9,9 @@ from ..converter_object import ConverterObject, ConverterObjectGroup if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.value_members import ValueMember class GenieTerrainObject(ConverterObject): diff --git a/openage/convert/entity_object/conversion/aoc/genie_unit.py b/engine/convert/entity_object/conversion/aoc/genie_unit.py similarity index 99% rename from openage/convert/entity_object/conversion/aoc/genie_unit.py rename to engine/convert/entity_object/conversion/aoc/genie_unit.py index e719c5f24f..9e14ea5783 100644 --- a/openage/convert/entity_object/conversion/aoc/genie_unit.py +++ b/engine/convert/entity_object/conversion/aoc/genie_unit.py @@ -13,10 +13,10 @@ from ..converter_object import ConverterObject, ConverterObjectGroup if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.value_object.read.value_members import ValueMember class GenieUnitObject(ConverterObject): diff --git a/openage/convert/entity_object/conversion/combined_sound.py b/engine/convert/entity_object/conversion/combined_sound.py similarity index 94% rename from openage/convert/entity_object/conversion/combined_sound.py rename to engine/convert/entity_object/conversion/combined_sound.py index 027df77760..70698ebd89 100644 --- a/openage/convert/entity_object/conversion/combined_sound.py +++ b/engine/convert/entity_object/conversion/combined_sound.py @@ -10,8 +10,8 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectContainer - from openage.convert.entity_object.conversion.converter_object import ConverterObject + from engine.convert.entity_object.conversion.converter_object import ConverterObjectContainer + from engine.convert.entity_object.conversion.converter_object import ConverterObject class CombinedSound: diff --git a/openage/convert/entity_object/conversion/combined_sprite.py b/engine/convert/entity_object/conversion/combined_sprite.py similarity index 93% rename from openage/convert/entity_object/conversion/combined_sprite.py rename to engine/convert/entity_object/conversion/combined_sprite.py index 798c86796d..d05974956d 100644 --- a/openage/convert/entity_object/conversion/combined_sprite.py +++ b/engine/convert/entity_object/conversion/combined_sprite.py @@ -10,9 +10,9 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectContainer - from openage.convert.entity_object.conversion.converter_object import ConverterObject - from openage.convert.entity_object.conversion.aoc.genie_graphic import GenieGraphic + from engine.convert.entity_object.conversion.converter_object import ConverterObjectContainer + from engine.convert.entity_object.conversion.converter_object import ConverterObject + from engine.convert.entity_object.conversion.aoc.genie_graphic import GenieGraphic class CombinedSprite: diff --git a/openage/convert/entity_object/conversion/combined_terrain.py b/engine/convert/entity_object/conversion/combined_terrain.py similarity index 91% rename from openage/convert/entity_object/conversion/combined_terrain.py rename to engine/convert/entity_object/conversion/combined_terrain.py index 84dc56c537..b4fb0bfef7 100644 --- a/openage/convert/entity_object/conversion/combined_terrain.py +++ b/engine/convert/entity_object/conversion/combined_terrain.py @@ -10,9 +10,9 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectContainer - from openage.convert.entity_object.conversion.converter_object import ConverterObject - from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject + from engine.convert.entity_object.conversion.converter_object import ConverterObjectContainer + from engine.convert.entity_object.conversion.converter_object import ConverterObject + from engine.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject class CombinedTerrain: diff --git a/openage/convert/entity_object/conversion/converter_object.py b/engine/convert/entity_object/conversion/converter_object.py similarity index 99% rename from openage/convert/entity_object/conversion/converter_object.py rename to engine/convert/entity_object/conversion/converter_object.py index 91fb6413a8..1185347ae0 100644 --- a/openage/convert/entity_object/conversion/converter_object.py +++ b/engine/convert/entity_object/conversion/converter_object.py @@ -12,7 +12,7 @@ import typing -from openage.convert.value_object.read.dynamic_loader import DynamicLoader +from engine.convert.value_object.read.dynamic_loader import DynamicLoader from ....nyan.nyan_structs import NyanObject, NyanPatch, NyanPatchMember, MemberOperator from ...value_object.conversion.forward_ref import ForwardRef diff --git a/openage/convert/entity_object/conversion/modpack.py b/engine/convert/entity_object/conversion/modpack.py similarity index 100% rename from openage/convert/entity_object/conversion/modpack.py rename to engine/convert/entity_object/conversion/modpack.py diff --git a/openage/convert/entity_object/conversion/ror/CMakeLists.txt b/engine/convert/entity_object/conversion/ror/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/conversion/ror/CMakeLists.txt rename to engine/convert/entity_object/conversion/ror/CMakeLists.txt diff --git a/openage/convert/entity_object/conversion/ror/__init__.py b/engine/convert/entity_object/conversion/ror/__init__.py similarity index 100% rename from openage/convert/entity_object/conversion/ror/__init__.py rename to engine/convert/entity_object/conversion/ror/__init__.py diff --git a/openage/convert/entity_object/conversion/ror/genie_sound.py b/engine/convert/entity_object/conversion/ror/genie_sound.py similarity index 100% rename from openage/convert/entity_object/conversion/ror/genie_sound.py rename to engine/convert/entity_object/conversion/ror/genie_sound.py diff --git a/openage/convert/entity_object/conversion/ror/genie_tech.py b/engine/convert/entity_object/conversion/ror/genie_tech.py similarity index 95% rename from openage/convert/entity_object/conversion/ror/genie_tech.py rename to engine/convert/entity_object/conversion/ror/genie_tech.py index 9584e4e555..8f99d0ec04 100644 --- a/openage/convert/entity_object/conversion/ror/genie_tech.py +++ b/engine/convert/entity_object/conversion/ror/genie_tech.py @@ -12,7 +12,7 @@ BuildingLineUpgrade, UnitUnlock, BuildingUnlock if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.ror.genie_unit import RoRUnitLineGroup + from engine.convert.entity_object.conversion.ror.genie_unit import RoRUnitLineGroup class RoRStatUpgrade(StatUpgrade): diff --git a/openage/convert/entity_object/conversion/ror/genie_unit.py b/engine/convert/entity_object/conversion/ror/genie_unit.py similarity index 99% rename from openage/convert/entity_object/conversion/ror/genie_unit.py rename to engine/convert/entity_object/conversion/ror/genie_unit.py index 86e6b4986c..a51ff8286c 100644 --- a/openage/convert/entity_object/conversion/ror/genie_unit.py +++ b/engine/convert/entity_object/conversion/ror/genie_unit.py @@ -13,7 +13,7 @@ GenieVillagerGroup, GenieGarrisonMode if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/entity_object/conversion/stringresource.py b/engine/convert/entity_object/conversion/stringresource.py similarity index 94% rename from openage/convert/entity_object/conversion/stringresource.py rename to engine/convert/entity_object/conversion/stringresource.py index 70bf5f8a31..8c3c433aa9 100644 --- a/openage/convert/entity_object/conversion/stringresource.py +++ b/engine/convert/entity_object/conversion/stringresource.py @@ -10,7 +10,7 @@ from ...value_object.read.genie_structure import GenieStructure if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.init.game_version import GameVersion class StringResource(GenieStructure): diff --git a/openage/convert/entity_object/conversion/swgbcc/CMakeLists.txt b/engine/convert/entity_object/conversion/swgbcc/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/conversion/swgbcc/CMakeLists.txt rename to engine/convert/entity_object/conversion/swgbcc/CMakeLists.txt diff --git a/openage/convert/entity_object/conversion/swgbcc/__init__.py b/engine/convert/entity_object/conversion/swgbcc/__init__.py similarity index 100% rename from openage/convert/entity_object/conversion/swgbcc/__init__.py rename to engine/convert/entity_object/conversion/swgbcc/__init__.py diff --git a/openage/convert/entity_object/conversion/swgbcc/genie_tech.py b/engine/convert/entity_object/conversion/swgbcc/genie_tech.py similarity index 97% rename from openage/convert/entity_object/conversion/swgbcc/genie_tech.py rename to engine/convert/entity_object/conversion/swgbcc/genie_tech.py index b91ed26ee8..35f847cb90 100644 --- a/openage/convert/entity_object/conversion/swgbcc/genie_tech.py +++ b/engine/convert/entity_object/conversion/swgbcc/genie_tech.py @@ -10,7 +10,7 @@ from ..aoc.genie_tech import UnitUnlock, UnitLineUpgrade if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/entity_object/conversion/swgbcc/genie_unit.py b/engine/convert/entity_object/conversion/swgbcc/genie_unit.py similarity index 99% rename from openage/convert/entity_object/conversion/swgbcc/genie_unit.py rename to engine/convert/entity_object/conversion/swgbcc/genie_unit.py index d5c6ecb83c..891ec17848 100644 --- a/openage/convert/entity_object/conversion/swgbcc/genie_unit.py +++ b/engine/convert/entity_object/conversion/swgbcc/genie_unit.py @@ -11,7 +11,7 @@ GenieMonkGroup, GenieStackBuildingGroup if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/entity_object/export/CMakeLists.txt b/engine/convert/entity_object/export/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/export/CMakeLists.txt rename to engine/convert/entity_object/export/CMakeLists.txt diff --git a/openage/convert/entity_object/export/__init__.py b/engine/convert/entity_object/export/__init__.py similarity index 100% rename from openage/convert/entity_object/export/__init__.py rename to engine/convert/entity_object/export/__init__.py diff --git a/openage/convert/entity_object/export/data_definition.py b/engine/convert/entity_object/export/data_definition.py similarity index 100% rename from openage/convert/entity_object/export/data_definition.py rename to engine/convert/entity_object/export/data_definition.py diff --git a/openage/convert/entity_object/export/formats/CMakeLists.txt b/engine/convert/entity_object/export/formats/CMakeLists.txt similarity index 100% rename from openage/convert/entity_object/export/formats/CMakeLists.txt rename to engine/convert/entity_object/export/formats/CMakeLists.txt diff --git a/openage/convert/entity_object/export/formats/__init__.py b/engine/convert/entity_object/export/formats/__init__.py similarity index 100% rename from openage/convert/entity_object/export/formats/__init__.py rename to engine/convert/entity_object/export/formats/__init__.py diff --git a/openage/convert/entity_object/export/formats/blmask_metadata.py b/engine/convert/entity_object/export/formats/blmask_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/blmask_metadata.py rename to engine/convert/entity_object/export/formats/blmask_metadata.py diff --git a/openage/convert/entity_object/export/formats/bltable_metadata.py b/engine/convert/entity_object/export/formats/bltable_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/bltable_metadata.py rename to engine/convert/entity_object/export/formats/bltable_metadata.py diff --git a/openage/convert/entity_object/export/formats/media_cache.py b/engine/convert/entity_object/export/formats/media_cache.py similarity index 94% rename from openage/convert/entity_object/export/formats/media_cache.py rename to engine/convert/entity_object/export/formats/media_cache.py index 633a936a0c..21af668685 100644 --- a/openage/convert/entity_object/export/formats/media_cache.py +++ b/engine/convert/entity_object/export/formats/media_cache.py @@ -15,8 +15,8 @@ FILE_VERSION = "1.0" if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media_types import MediaType - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.media_types import MediaType + from engine.convert.value_object.init.game_version import GameVersion class MediaCacheFile(DataDefinition): diff --git a/openage/convert/entity_object/export/formats/modpack_info.py b/engine/convert/entity_object/export/formats/modpack_info.py similarity index 100% rename from openage/convert/entity_object/export/formats/modpack_info.py rename to engine/convert/entity_object/export/formats/modpack_info.py diff --git a/openage/convert/entity_object/export/formats/modpack_manifest.py b/engine/convert/entity_object/export/formats/modpack_manifest.py similarity index 100% rename from openage/convert/entity_object/export/formats/modpack_manifest.py rename to engine/convert/entity_object/export/formats/modpack_manifest.py diff --git a/openage/convert/entity_object/export/formats/nyan_file.py b/engine/convert/entity_object/export/formats/nyan_file.py similarity index 98% rename from openage/convert/entity_object/export/formats/nyan_file.py rename to engine/convert/entity_object/export/formats/nyan_file.py index ced197f7fd..11d8dfd81b 100644 --- a/openage/convert/entity_object/export/formats/nyan_file.py +++ b/engine/convert/entity_object/export/formats/nyan_file.py @@ -12,7 +12,7 @@ from ..data_definition import DataDefinition if typing.TYPE_CHECKING: - from openage.nyan.import_tree import ImportTree + from engine.nyan.import_tree import ImportTree FILE_VERSION = "0.2.0" diff --git a/openage/convert/entity_object/export/formats/palette_metadata.py b/engine/convert/entity_object/export/formats/palette_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/palette_metadata.py rename to engine/convert/entity_object/export/formats/palette_metadata.py diff --git a/openage/convert/entity_object/export/formats/sprite_metadata.py b/engine/convert/entity_object/export/formats/sprite_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/sprite_metadata.py rename to engine/convert/entity_object/export/formats/sprite_metadata.py diff --git a/openage/convert/entity_object/export/formats/terrain_metadata.py b/engine/convert/entity_object/export/formats/terrain_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/terrain_metadata.py rename to engine/convert/entity_object/export/formats/terrain_metadata.py diff --git a/openage/convert/entity_object/export/formats/texture_metadata.py b/engine/convert/entity_object/export/formats/texture_metadata.py similarity index 100% rename from openage/convert/entity_object/export/formats/texture_metadata.py rename to engine/convert/entity_object/export/formats/texture_metadata.py diff --git a/openage/convert/entity_object/export/media_export_request.py b/engine/convert/entity_object/export/media_export_request.py similarity index 97% rename from openage/convert/entity_object/export/media_export_request.py rename to engine/convert/entity_object/export/media_export_request.py index 9d0f49b3c5..8deee54d3c 100644 --- a/openage/convert/entity_object/export/media_export_request.py +++ b/engine/convert/entity_object/export/media_export_request.py @@ -11,7 +11,7 @@ from ....util.observer import Observable if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media_types import MediaType + from engine.convert.value_object.read.media_types import MediaType class MediaExportRequest(Observable): diff --git a/openage/convert/entity_object/export/metadata_export.py b/engine/convert/entity_object/export/metadata_export.py similarity index 97% rename from openage/convert/entity_object/export/metadata_export.py rename to engine/convert/entity_object/export/metadata_export.py index 2230395dee..aa1ecfea74 100644 --- a/openage/convert/entity_object/export/metadata_export.py +++ b/engine/convert/entity_object/export/metadata_export.py @@ -13,8 +13,8 @@ from .formats.texture_metadata import TextureMetadata if typing.TYPE_CHECKING: - from openage.util.observer import Observable - from openage.convert.entity_object.export.formats.sprite_metadata import LayerMode + from engine.util.observer import Observable + from engine.convert.entity_object.export.formats.sprite_metadata import LayerMode class MetadataExport(Observer): diff --git a/openage/convert/entity_object/export/texture.py b/engine/convert/entity_object/export/texture.py similarity index 93% rename from openage/convert/entity_object/export/texture.py rename to engine/convert/entity_object/export/texture.py index 5039abfeb3..2ca8226ee6 100644 --- a/openage/convert/entity_object/export/texture.py +++ b/engine/convert/entity_object/export/texture.py @@ -17,12 +17,12 @@ from ...value_object.read.genie_structure import GenieStructure if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media.colortable import ColorTable - from openage.convert.service.export.interface.cutter import InterfaceCutter - from openage.convert.value_object.read.media.slp import SLP, SLPFrame - from openage.convert.value_object.read.media.smp import SMP, SMPLayer - from openage.convert.value_object.read.media.smx import SMX, SMXLayer - from openage.convert.value_object.read.media.sld import SLD, SLDLayer + from engine.convert.value_object.read.media.colortable import ColorTable + from engine.convert.service.export.interface.cutter import InterfaceCutter + from engine.convert.value_object.read.media.slp import SLP, SLPFrame + from engine.convert.value_object.read.media.smp import SMP, SMPLayer + from engine.convert.value_object.read.media.smx import SMX, SMXLayer + from engine.convert.value_object.read.media.sld import SLD, SLDLayer class TextureImage: diff --git a/openage/convert/main.py b/engine/convert/main.py similarity index 99% rename from openage/convert/main.py rename to engine/convert/main.py index e56fad58d9..113d35ac91 100644 --- a/openage/convert/main.py +++ b/engine/convert/main.py @@ -24,7 +24,7 @@ if typing.TYPE_CHECKING: from argparse import ArgumentParser, Namespace - from openage.util.fslike.directory import Directory + from engine.util.fslike.directory import Directory def convert_assets( diff --git a/openage/convert/processor/CMakeLists.txt b/engine/convert/processor/CMakeLists.txt similarity index 100% rename from openage/convert/processor/CMakeLists.txt rename to engine/convert/processor/CMakeLists.txt diff --git a/openage/convert/processor/__init__.py b/engine/convert/processor/__init__.py similarity index 100% rename from openage/convert/processor/__init__.py rename to engine/convert/processor/__init__.py diff --git a/openage/convert/processor/conversion/CMakeLists.txt b/engine/convert/processor/conversion/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/CMakeLists.txt rename to engine/convert/processor/conversion/CMakeLists.txt diff --git a/openage/convert/processor/conversion/__init__.py b/engine/convert/processor/conversion/__init__.py similarity index 100% rename from openage/convert/processor/conversion/__init__.py rename to engine/convert/processor/conversion/__init__.py diff --git a/openage/convert/processor/conversion/aoc/CMakeLists.txt b/engine/convert/processor/conversion/aoc/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/aoc/CMakeLists.txt rename to engine/convert/processor/conversion/aoc/CMakeLists.txt diff --git a/openage/convert/processor/conversion/aoc/__init__.py b/engine/convert/processor/conversion/aoc/__init__.py similarity index 100% rename from openage/convert/processor/conversion/aoc/__init__.py rename to engine/convert/processor/conversion/aoc/__init__.py diff --git a/openage/convert/processor/conversion/aoc/ability_subprocessor.py b/engine/convert/processor/conversion/aoc/ability_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/ability_subprocessor.py rename to engine/convert/processor/conversion/aoc/ability_subprocessor.py index 93620a740f..4563271316 100644 --- a/openage/convert/processor/conversion/aoc/ability_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/ability_subprocessor.py @@ -31,8 +31,8 @@ from .effect_subprocessor import AoCEffectSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup class AoCAbilitySubprocessor: diff --git a/openage/convert/processor/conversion/aoc/auxiliary_subprocessor.py b/engine/convert/processor/conversion/aoc/auxiliary_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/auxiliary_subprocessor.py rename to engine/convert/processor/conversion/aoc/auxiliary_subprocessor.py index 618666d32f..4e3a2a5aa3 100644 --- a/openage/convert/processor/conversion/aoc/auxiliary_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/auxiliary_subprocessor.py @@ -19,8 +19,8 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup class AoCAuxiliarySubprocessor: diff --git a/openage/convert/processor/conversion/aoc/civ_subprocessor.py b/engine/convert/processor/conversion/aoc/civ_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/civ_subprocessor.py rename to engine/convert/processor/conversion/aoc/civ_subprocessor.py index 30eea447f9..5e48bc5e9e 100644 --- a/openage/convert/processor/conversion/aoc/civ_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/civ_subprocessor.py @@ -17,8 +17,8 @@ from .tech_subprocessor import AoCTechSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class AoCCivSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/effect_subprocessor.py b/engine/convert/processor/conversion/aoc/effect_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/effect_subprocessor.py rename to engine/convert/processor/conversion/aoc/effect_subprocessor.py index 1e9256a4d9..95b1c35955 100644 --- a/openage/convert/processor/conversion/aoc/effect_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/effect_subprocessor.py @@ -19,7 +19,7 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class AoCEffectSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/media_subprocessor.py b/engine/convert/processor/conversion/aoc/media_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/aoc/media_subprocessor.py rename to engine/convert/processor/conversion/aoc/media_subprocessor.py index 360a13b4f7..29dd1db8a3 100644 --- a/openage/convert/processor/conversion/aoc/media_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/media_subprocessor.py @@ -8,7 +8,7 @@ from __future__ import annotations import typing -from openage.convert.value_object.read.media_types import MediaType +from engine.convert.value_object.read.media_types import MediaType from ....entity_object.export.formats.sprite_metadata import LayerMode from ....entity_object.export.media_export_request import MediaExportRequest @@ -17,7 +17,7 @@ from ....value_object.read.media_types import MediaType if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/aoc/modifier_subprocessor.py b/engine/convert/processor/conversion/aoc/modifier_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/modifier_subprocessor.py rename to engine/convert/processor/conversion/aoc/modifier_subprocessor.py index 01f095145d..34dfee6697 100644 --- a/openage/convert/processor/conversion/aoc/modifier_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/modifier_subprocessor.py @@ -17,7 +17,7 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.nyan.nyan_structs import NyanObject + from engine.nyan.nyan_structs import NyanObject class AoCModifierSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/modpack_subprocessor.py b/engine/convert/processor/conversion/aoc/modpack_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/modpack_subprocessor.py rename to engine/convert/processor/conversion/aoc/modpack_subprocessor.py index 8d54d68fed..7fce86a633 100644 --- a/openage/convert/processor/conversion/aoc/modpack_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/modpack_subprocessor.py @@ -16,9 +16,9 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer - from openage.convert.entity_object.conversion.converter_object import RawAPIObject + from engine.convert.entity_object.conversion.converter_object import RawAPIObject class AoCModpackSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/nyan_subprocessor.py b/engine/convert/processor/conversion/aoc/nyan_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/nyan_subprocessor.py rename to engine/convert/processor/conversion/aoc/nyan_subprocessor.py index b519412ca3..8c6373e431 100644 --- a/openage/convert/processor/conversion/aoc/nyan_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/nyan_subprocessor.py @@ -28,11 +28,11 @@ from .upgrade_ability_subprocessor import AoCUpgradeAbilitySubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup - from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \ + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \ GenieUnitLineGroup, GenieBuildingLineGroup, GenieAmbientGroup, GenieVariantGroup diff --git a/openage/convert/processor/conversion/aoc/pregen_processor.py b/engine/convert/processor/conversion/aoc/pregen_processor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/pregen_processor.py rename to engine/convert/processor/conversion/aoc/pregen_processor.py index fe6151ea20..0029e26cfc 100644 --- a/openage/convert/processor/conversion/aoc/pregen_processor.py +++ b/engine/convert/processor/conversion/aoc/pregen_processor.py @@ -19,7 +19,7 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer class AoCPregenSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/processor.py b/engine/convert/processor/conversion/aoc/processor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/processor.py rename to engine/convert/processor/conversion/aoc/processor.py index 01863e54c0..7273fd5931 100644 --- a/openage/convert/processor/conversion/aoc/processor.py +++ b/engine/convert/processor/conversion/aoc/processor.py @@ -49,10 +49,10 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.read.value_members import ArrayMember - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.read.value_members import ArrayMember + from engine.convert.value_object.init.game_version import GameVersion class AoCProcessor: diff --git a/openage/convert/processor/conversion/aoc/tech_subprocessor.py b/engine/convert/processor/conversion/aoc/tech_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/tech_subprocessor.py rename to engine/convert/processor/conversion/aoc/tech_subprocessor.py index 3bcd64a55b..937473591c 100644 --- a/openage/convert/processor/conversion/aoc/tech_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/tech_subprocessor.py @@ -12,7 +12,7 @@ import typing -from openage.log import warn +from engine.log import warn from .....nyan.nyan_structs import MemberOperator from ....entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup, \ CivTeamBonus, CivBonus @@ -26,8 +26,8 @@ from .upgrade_resource_subprocessor import AoCUpgradeResourceSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject class AoCTechSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py b/engine/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py rename to engine/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py index f00814db31..2caf86dbaa 100644 --- a/openage/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/upgrade_ability_subprocessor.py @@ -28,9 +28,9 @@ from .upgrade_effect_subprocessor import AoCUpgradeEffectSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObject, \ + from engine.convert.entity_object.conversion.converter_object import ConverterObject, \ ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \ + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \ GenieUnitObject diff --git a/openage/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py b/engine/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py rename to engine/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py index f413f1fc15..45947a8c2b 100644 --- a/openage/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/upgrade_attribute_subprocessor.py @@ -19,9 +19,9 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.nyan.nyan_structs import MemberOperator class AoCUpgradeAttributeSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py b/engine/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py rename to engine/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py index f17b8c26dd..297d204178 100644 --- a/openage/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/upgrade_effect_subprocessor.py @@ -22,9 +22,9 @@ LeftMissingMember, RightMissingMember if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObject - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.converter_object import ConverterObject + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class AoCUpgradeEffectSubprocessor: diff --git a/openage/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py b/engine/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py rename to engine/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py index e470c21cb6..04d2311b5a 100644 --- a/openage/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py +++ b/engine/convert/processor/conversion/aoc/upgrade_resource_subprocessor.py @@ -18,8 +18,8 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.nyan.nyan_structs import MemberOperator class AoCUpgradeResourceSubprocessor: diff --git a/openage/convert/processor/conversion/de1/CMakeLists.txt b/engine/convert/processor/conversion/de1/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/de1/CMakeLists.txt rename to engine/convert/processor/conversion/de1/CMakeLists.txt diff --git a/openage/convert/processor/conversion/de1/__init__.py b/engine/convert/processor/conversion/de1/__init__.py similarity index 100% rename from openage/convert/processor/conversion/de1/__init__.py rename to engine/convert/processor/conversion/de1/__init__.py diff --git a/openage/convert/processor/conversion/de1/media_subprocessor.py b/engine/convert/processor/conversion/de1/media_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/de1/media_subprocessor.py rename to engine/convert/processor/conversion/de1/media_subprocessor.py index de20eeb211..df3a63cf09 100644 --- a/openage/convert/processor/conversion/de1/media_subprocessor.py +++ b/engine/convert/processor/conversion/de1/media_subprocessor.py @@ -16,7 +16,7 @@ from ..aoc.media_subprocessor import AoCMediaSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/de1/processor.py b/engine/convert/processor/conversion/de1/processor.py similarity index 96% rename from openage/convert/processor/conversion/de1/processor.py rename to engine/convert/processor/conversion/de1/processor.py index d6726903e2..b15d26d2b4 100644 --- a/openage/convert/processor/conversion/de1/processor.py +++ b/engine/convert/processor/conversion/de1/processor.py @@ -22,10 +22,10 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.read.value_members import ArrayMember - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.read.value_members import ArrayMember + from engine.convert.value_object.init.game_version import GameVersion class DE1Processor: diff --git a/openage/convert/processor/conversion/de2/CMakeLists.txt b/engine/convert/processor/conversion/de2/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/de2/CMakeLists.txt rename to engine/convert/processor/conversion/de2/CMakeLists.txt diff --git a/openage/convert/processor/conversion/de2/__init__.py b/engine/convert/processor/conversion/de2/__init__.py similarity index 100% rename from openage/convert/processor/conversion/de2/__init__.py rename to engine/convert/processor/conversion/de2/__init__.py diff --git a/openage/convert/processor/conversion/de2/ability_subprocessor.py b/engine/convert/processor/conversion/de2/ability_subprocessor.py similarity index 97% rename from openage/convert/processor/conversion/de2/ability_subprocessor.py rename to engine/convert/processor/conversion/de2/ability_subprocessor.py index 8ee78e01e6..8534aa9c0b 100644 --- a/openage/convert/processor/conversion/de2/ability_subprocessor.py +++ b/engine/convert/processor/conversion/de2/ability_subprocessor.py @@ -15,7 +15,7 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class DE2AbilitySubprocessor: diff --git a/openage/convert/processor/conversion/de2/civ_subprocessor.py b/engine/convert/processor/conversion/de2/civ_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/de2/civ_subprocessor.py rename to engine/convert/processor/conversion/de2/civ_subprocessor.py index 32e6e00fb9..e6809442c4 100644 --- a/openage/convert/processor/conversion/de2/civ_subprocessor.py +++ b/engine/convert/processor/conversion/de2/civ_subprocessor.py @@ -16,7 +16,7 @@ from .tech_subprocessor import DE2TechSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup class DE2CivSubprocessor: diff --git a/openage/convert/processor/conversion/de2/media_subprocessor.py b/engine/convert/processor/conversion/de2/media_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/de2/media_subprocessor.py rename to engine/convert/processor/conversion/de2/media_subprocessor.py index 797590f19d..f3579af579 100644 --- a/openage/convert/processor/conversion/de2/media_subprocessor.py +++ b/engine/convert/processor/conversion/de2/media_subprocessor.py @@ -15,7 +15,7 @@ from ....value_object.read.media_types import MediaType if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/de2/modpack_subprocessor.py b/engine/convert/processor/conversion/de2/modpack_subprocessor.py similarity index 94% rename from openage/convert/processor/conversion/de2/modpack_subprocessor.py rename to engine/convert/processor/conversion/de2/modpack_subprocessor.py index 22d9d220e2..f094879b56 100644 --- a/openage/convert/processor/conversion/de2/modpack_subprocessor.py +++ b/engine/convert/processor/conversion/de2/modpack_subprocessor.py @@ -13,7 +13,7 @@ from ..aoc.modpack_subprocessor import AoCModpackSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/de2/nyan_subprocessor.py b/engine/convert/processor/conversion/de2/nyan_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/de2/nyan_subprocessor.py rename to engine/convert/processor/conversion/de2/nyan_subprocessor.py index b8f40000ef..f32df916d3 100644 --- a/openage/convert/processor/conversion/de2/nyan_subprocessor.py +++ b/engine/convert/processor/conversion/de2/nyan_subprocessor.py @@ -28,11 +28,11 @@ from .tech_subprocessor import DE2TechSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup - from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ GenieBuildingLineGroup diff --git a/openage/convert/processor/conversion/de2/processor.py b/engine/convert/processor/conversion/de2/processor.py similarity index 96% rename from openage/convert/processor/conversion/de2/processor.py rename to engine/convert/processor/conversion/de2/processor.py index eea3ebd346..cce10b4f6a 100644 --- a/openage/convert/processor/conversion/de2/processor.py +++ b/engine/convert/processor/conversion/de2/processor.py @@ -8,9 +8,9 @@ import typing -from openage.convert.value_object.read.value_members import ArrayMember, StorageType -import openage.convert.value_object.conversion.aoc.internal_nyan_names as aoc_internal -import openage.convert.value_object.conversion.de2.internal_nyan_names as de2_internal +from engine.convert.value_object.read.value_members import ArrayMember, StorageType +import engine.convert.value_object.conversion.aoc.internal_nyan_names as aoc_internal +import engine.convert.value_object.conversion.de2.internal_nyan_names as de2_internal from .....log import info from .....util.ordered_set import OrderedSet @@ -29,9 +29,9 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.init.game_version import GameVersion class DE2Processor: diff --git a/openage/convert/processor/conversion/de2/tech_subprocessor.py b/engine/convert/processor/conversion/de2/tech_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/de2/tech_subprocessor.py rename to engine/convert/processor/conversion/de2/tech_subprocessor.py index 025d67b090..cff14b636a 100644 --- a/openage/convert/processor/conversion/de2/tech_subprocessor.py +++ b/engine/convert/processor/conversion/de2/tech_subprocessor.py @@ -18,9 +18,9 @@ from .upgrade_resource_subprocessor import DE2UpgradeResourceSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject - from openage.convert.value_object.conversion.forward_ref import ForwardRef + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject + from engine.convert.value_object.conversion.forward_ref import ForwardRef class DE2TechSubprocessor: diff --git a/openage/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py b/engine/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py similarity index 91% rename from openage/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py rename to engine/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py index c5d7a66ecf..e1bbf11a26 100644 --- a/openage/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py +++ b/engine/convert/processor/conversion/de2/upgrade_attribute_subprocessor.py @@ -13,10 +13,10 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.nyan.nyan_structs import MemberOperator - from openage.convert.value_object.conversion.forward_ref import ForwardRef + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.nyan.nyan_structs import MemberOperator + from engine.convert.value_object.conversion.forward_ref import ForwardRef class DE2UpgradeAttributeSubprocessor: diff --git a/openage/convert/processor/conversion/de2/upgrade_resource_subprocessor.py b/engine/convert/processor/conversion/de2/upgrade_resource_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/de2/upgrade_resource_subprocessor.py rename to engine/convert/processor/conversion/de2/upgrade_resource_subprocessor.py index a5b6a0b4fb..220f4ce3cd 100644 --- a/openage/convert/processor/conversion/de2/upgrade_resource_subprocessor.py +++ b/engine/convert/processor/conversion/de2/upgrade_resource_subprocessor.py @@ -13,9 +13,9 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.nyan.nyan_structs import MemberOperator - from openage.convert.value_object.conversion.forward_ref import ForwardRef + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.nyan.nyan_structs import MemberOperator + from engine.convert.value_object.conversion.forward_ref import ForwardRef class DE2UpgradeResourceSubprocessor: diff --git a/openage/convert/processor/conversion/hd/CMakeLists.txt b/engine/convert/processor/conversion/hd/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/hd/CMakeLists.txt rename to engine/convert/processor/conversion/hd/CMakeLists.txt diff --git a/openage/convert/processor/conversion/hd/__init__.py b/engine/convert/processor/conversion/hd/__init__.py similarity index 100% rename from openage/convert/processor/conversion/hd/__init__.py rename to engine/convert/processor/conversion/hd/__init__.py diff --git a/openage/convert/processor/conversion/hd/media_subprocessor.py b/engine/convert/processor/conversion/hd/media_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/hd/media_subprocessor.py rename to engine/convert/processor/conversion/hd/media_subprocessor.py index 737f698c79..c39b7c97bf 100644 --- a/openage/convert/processor/conversion/hd/media_subprocessor.py +++ b/engine/convert/processor/conversion/hd/media_subprocessor.py @@ -15,7 +15,7 @@ from ....value_object.read.media_types import MediaType if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/hd/modpack_subprocessor.py b/engine/convert/processor/conversion/hd/modpack_subprocessor.py similarity index 94% rename from openage/convert/processor/conversion/hd/modpack_subprocessor.py rename to engine/convert/processor/conversion/hd/modpack_subprocessor.py index 50e77ba711..faadffc5f2 100644 --- a/openage/convert/processor/conversion/hd/modpack_subprocessor.py +++ b/engine/convert/processor/conversion/hd/modpack_subprocessor.py @@ -13,7 +13,7 @@ from ..aoc.modpack_subprocessor import AoCModpackSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/hd/processor.py b/engine/convert/processor/conversion/hd/processor.py similarity index 95% rename from openage/convert/processor/conversion/hd/processor.py rename to engine/convert/processor/conversion/hd/processor.py index 7379309f57..f287e9241d 100644 --- a/openage/convert/processor/conversion/hd/processor.py +++ b/engine/convert/processor/conversion/hd/processor.py @@ -22,10 +22,10 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.read.value_members import ArrayMember - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.read.value_members import ArrayMember + from engine.convert.value_object.init.game_version import GameVersion class HDProcessor: diff --git a/openage/convert/processor/conversion/ror/CMakeLists.txt b/engine/convert/processor/conversion/ror/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/ror/CMakeLists.txt rename to engine/convert/processor/conversion/ror/CMakeLists.txt diff --git a/openage/convert/processor/conversion/ror/__init__.py b/engine/convert/processor/conversion/ror/__init__.py similarity index 100% rename from openage/convert/processor/conversion/ror/__init__.py rename to engine/convert/processor/conversion/ror/__init__.py diff --git a/openage/convert/processor/conversion/ror/ability_subprocessor.py b/engine/convert/processor/conversion/ror/ability_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/ror/ability_subprocessor.py rename to engine/convert/processor/conversion/ror/ability_subprocessor.py index 0fbb17cb17..e9ead3a274 100644 --- a/openage/convert/processor/conversion/ror/ability_subprocessor.py +++ b/engine/convert/processor/conversion/ror/ability_subprocessor.py @@ -23,7 +23,7 @@ from ..aoc.effect_subprocessor import AoCEffectSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class RoRAbilitySubprocessor: diff --git a/openage/convert/processor/conversion/ror/auxiliary_subprocessor.py b/engine/convert/processor/conversion/ror/auxiliary_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/ror/auxiliary_subprocessor.py rename to engine/convert/processor/conversion/ror/auxiliary_subprocessor.py index 652e80fca0..b4775b1e78 100644 --- a/openage/convert/processor/conversion/ror/auxiliary_subprocessor.py +++ b/engine/convert/processor/conversion/ror/auxiliary_subprocessor.py @@ -20,7 +20,7 @@ from ..aoc.auxiliary_subprocessor import AoCAuxiliarySubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class RoRAuxiliarySubprocessor: diff --git a/openage/convert/processor/conversion/ror/civ_subprocessor.py b/engine/convert/processor/conversion/ror/civ_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/ror/civ_subprocessor.py rename to engine/convert/processor/conversion/ror/civ_subprocessor.py index 0e8f5364ac..9c405805fa 100644 --- a/openage/convert/processor/conversion/ror/civ_subprocessor.py +++ b/engine/convert/processor/conversion/ror/civ_subprocessor.py @@ -13,7 +13,7 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup class RoRCivSubprocessor: diff --git a/openage/convert/processor/conversion/ror/media_subprocessor.py b/engine/convert/processor/conversion/ror/media_subprocessor.py similarity index 81% rename from openage/convert/processor/conversion/ror/media_subprocessor.py rename to engine/convert/processor/conversion/ror/media_subprocessor.py index 6094d6f182..25ca50d3f5 100644 --- a/openage/convert/processor/conversion/ror/media_subprocessor.py +++ b/engine/convert/processor/conversion/ror/media_subprocessor.py @@ -8,10 +8,10 @@ from __future__ import annotations import typing -from openage.convert.processor.conversion.aoc.media_subprocessor import AoCMediaSubprocessor +from engine.convert.processor.conversion.aoc.media_subprocessor import AoCMediaSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/ror/modpack_subprocessor.py b/engine/convert/processor/conversion/ror/modpack_subprocessor.py similarity index 94% rename from openage/convert/processor/conversion/ror/modpack_subprocessor.py rename to engine/convert/processor/conversion/ror/modpack_subprocessor.py index dfe485b003..439a1d79dc 100644 --- a/openage/convert/processor/conversion/ror/modpack_subprocessor.py +++ b/engine/convert/processor/conversion/ror/modpack_subprocessor.py @@ -14,7 +14,7 @@ from ..aoc.modpack_subprocessor import AoCModpackSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/ror/nyan_subprocessor.py b/engine/convert/processor/conversion/ror/nyan_subprocessor.py similarity index 100% rename from openage/convert/processor/conversion/ror/nyan_subprocessor.py rename to engine/convert/processor/conversion/ror/nyan_subprocessor.py diff --git a/openage/convert/processor/conversion/ror/pregen_subprocessor.py b/engine/convert/processor/conversion/ror/pregen_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/ror/pregen_subprocessor.py rename to engine/convert/processor/conversion/ror/pregen_subprocessor.py index 4bb4eb0ad1..4596b2b81c 100644 --- a/openage/convert/processor/conversion/ror/pregen_subprocessor.py +++ b/engine/convert/processor/conversion/ror/pregen_subprocessor.py @@ -15,7 +15,7 @@ from ..aoc.pregen_processor import AoCPregenSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/ror/processor.py b/engine/convert/processor/conversion/ror/processor.py similarity index 98% rename from openage/convert/processor/conversion/ror/processor.py rename to engine/convert/processor/conversion/ror/processor.py index e056d934b6..ee727359cf 100644 --- a/openage/convert/processor/conversion/ror/processor.py +++ b/engine/convert/processor/conversion/ror/processor.py @@ -31,10 +31,10 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.read.value_members import ArrayMember - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.read.value_members import ArrayMember + from engine.convert.value_object.init.game_version import GameVersion class RoRProcessor: diff --git a/openage/convert/processor/conversion/ror/tech_subprocessor.py b/engine/convert/processor/conversion/ror/tech_subprocessor.py similarity index 97% rename from openage/convert/processor/conversion/ror/tech_subprocessor.py rename to engine/convert/processor/conversion/ror/tech_subprocessor.py index 224d844cf3..b052230197 100644 --- a/openage/convert/processor/conversion/ror/tech_subprocessor.py +++ b/engine/convert/processor/conversion/ror/tech_subprocessor.py @@ -23,9 +23,9 @@ from .upgrade_resource_subprocessor import RoRUpgradeResourceSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject - from openage.convert.value_object.conversion.forward_ref import ForwardRef + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject + from engine.convert.value_object.conversion.forward_ref import ForwardRef class RoRTechSubprocessor: diff --git a/openage/convert/processor/conversion/ror/upgrade_ability_subprocessor.py b/engine/convert/processor/conversion/ror/upgrade_ability_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/ror/upgrade_ability_subprocessor.py rename to engine/convert/processor/conversion/ror/upgrade_ability_subprocessor.py index 2b00b1ad60..d16333ca1c 100644 --- a/openage/convert/processor/conversion/ror/upgrade_ability_subprocessor.py +++ b/engine/convert/processor/conversion/ror/upgrade_ability_subprocessor.py @@ -21,9 +21,9 @@ from ..aoc.upgrade_ability_subprocessor import AoCUpgradeAbilitySubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObject, \ + from engine.convert.entity_object.conversion.converter_object import ConverterObject, \ ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class RoRUpgradeAbilitySubprocessor: diff --git a/openage/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py b/engine/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py similarity index 96% rename from openage/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py rename to engine/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py index fb2f9b7bb6..deee6168b3 100644 --- a/openage/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py +++ b/engine/convert/processor/conversion/ror/upgrade_attribute_subprocessor.py @@ -17,9 +17,9 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.nyan.nyan_structs import MemberOperator class RoRUpgradeAttributeSubprocessor: diff --git a/openage/convert/processor/conversion/ror/upgrade_resource_subprocessor.py b/engine/convert/processor/conversion/ror/upgrade_resource_subprocessor.py similarity index 97% rename from openage/convert/processor/conversion/ror/upgrade_resource_subprocessor.py rename to engine/convert/processor/conversion/ror/upgrade_resource_subprocessor.py index 98d4843ed7..749a2fb1eb 100644 --- a/openage/convert/processor/conversion/ror/upgrade_resource_subprocessor.py +++ b/engine/convert/processor/conversion/ror/upgrade_resource_subprocessor.py @@ -18,8 +18,8 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.nyan.nyan_structs import MemberOperator class RoRUpgradeResourceSubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/CMakeLists.txt b/engine/convert/processor/conversion/swgbcc/CMakeLists.txt similarity index 100% rename from openage/convert/processor/conversion/swgbcc/CMakeLists.txt rename to engine/convert/processor/conversion/swgbcc/CMakeLists.txt diff --git a/openage/convert/processor/conversion/swgbcc/__init__.py b/engine/convert/processor/conversion/swgbcc/__init__.py similarity index 100% rename from openage/convert/processor/conversion/swgbcc/__init__.py rename to engine/convert/processor/conversion/swgbcc/__init__.py diff --git a/openage/convert/processor/conversion/swgbcc/ability_subprocessor.py b/engine/convert/processor/conversion/swgbcc/ability_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/ability_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/ability_subprocessor.py index aacdf8df6c..564efe52a4 100644 --- a/openage/convert/processor/conversion/swgbcc/ability_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/ability_subprocessor.py @@ -28,8 +28,8 @@ from ..aoc.effect_subprocessor import AoCEffectSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup class SWGBCCAbilitySubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py b/engine/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py index 3dc27666aa..928f381ea4 100644 --- a/openage/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/auxiliary_subprocessor.py @@ -22,8 +22,8 @@ from ..aoc.auxiliary_subprocessor import AoCAuxiliarySubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup class SWGBCCAuxiliarySubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/civ_subprocessor.py b/engine/convert/processor/conversion/swgbcc/civ_subprocessor.py similarity index 97% rename from openage/convert/processor/conversion/swgbcc/civ_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/civ_subprocessor.py index 320351d662..6ad5673382 100644 --- a/openage/convert/processor/conversion/swgbcc/civ_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/civ_subprocessor.py @@ -15,8 +15,8 @@ from .tech_subprocessor import SWGBCCTechSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup class SWGBCCCivSubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/modpack_subprocessor.py b/engine/convert/processor/conversion/swgbcc/modpack_subprocessor.py similarity index 94% rename from openage/convert/processor/conversion/swgbcc/modpack_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/modpack_subprocessor.py index cef278f9eb..b586463e6a 100644 --- a/openage/convert/processor/conversion/swgbcc/modpack_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/modpack_subprocessor.py @@ -13,7 +13,7 @@ from ..aoc.modpack_subprocessor import AoCModpackSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container\ + from engine.convert.entity_object.conversion.aoc.genie_object_container\ import GenieObjectContainer diff --git a/openage/convert/processor/conversion/swgbcc/nyan_subprocessor.py b/engine/convert/processor/conversion/swgbcc/nyan_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/nyan_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/nyan_subprocessor.py index b48b15d309..9f00c10f02 100644 --- a/openage/convert/processor/conversion/swgbcc/nyan_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/nyan_subprocessor.py @@ -26,10 +26,10 @@ from .tech_subprocessor import SWGBCCTechSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer - from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ + from engine.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ GenieBuildingLineGroup, GenieAmbientGroup diff --git a/openage/convert/processor/conversion/swgbcc/pregen_subprocessor.py b/engine/convert/processor/conversion/swgbcc/pregen_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/pregen_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/pregen_subprocessor.py index be0d20e705..730ba92e3b 100644 --- a/openage/convert/processor/conversion/swgbcc/pregen_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/pregen_subprocessor.py @@ -21,7 +21,7 @@ from ..aoc.pregen_processor import AoCPregenSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer class SWGBCCPregenSubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/processor.py b/engine/convert/processor/conversion/swgbcc/processor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/processor.py rename to engine/convert/processor/conversion/swgbcc/processor.py index 2fef37ffa2..0d0a85c074 100644 --- a/openage/convert/processor/conversion/swgbcc/processor.py +++ b/engine/convert/processor/conversion/swgbcc/processor.py @@ -11,7 +11,7 @@ import typing -from openage.convert.entity_object.conversion.aoc.genie_tech import BuildingUnlock +from engine.convert.entity_object.conversion.aoc.genie_tech import BuildingUnlock from .....log import info from ....entity_object.conversion.aoc.genie_object_container import GenieObjectContainer from ....entity_object.conversion.aoc.genie_tech import BuildingLineUpgrade, \ @@ -37,10 +37,10 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.value_object.read.value_members import ArrayMember - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.value_object.read.value_members import ArrayMember + from engine.convert.value_object.init.game_version import GameVersion class SWGBCCProcessor: diff --git a/openage/convert/processor/conversion/swgbcc/tech_subprocessor.py b/engine/convert/processor/conversion/swgbcc/tech_subprocessor.py similarity index 97% rename from openage/convert/processor/conversion/swgbcc/tech_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/tech_subprocessor.py index d6e7f25a2a..2be1005480 100644 --- a/openage/convert/processor/conversion/swgbcc/tech_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/tech_subprocessor.py @@ -20,9 +20,9 @@ from .upgrade_resource_subprocessor import SWGBCCUpgradeResourceSubprocessor if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject - from openage.convert.value_object.conversion.forward_ref import ForwardRef + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject + from engine.convert.value_object.conversion.forward_ref import ForwardRef class SWGBCCTechSubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py b/engine/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py similarity index 98% rename from openage/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py index f65b0eb4b2..b10bd683c6 100644 --- a/openage/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/upgrade_attribute_subprocessor.py @@ -17,9 +17,9 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup + from engine.nyan.nyan_structs import MemberOperator class SWGBCCUpgradeAttributeSubprocessor: diff --git a/openage/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py b/engine/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py similarity index 99% rename from openage/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py rename to engine/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py index 8da0ec95ef..c7ec91f369 100644 --- a/openage/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py +++ b/engine/convert/processor/conversion/swgbcc/upgrade_resource_subprocessor.py @@ -18,8 +18,8 @@ from ....value_object.conversion.forward_ref import ForwardRef if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup - from openage.nyan.nyan_structs import MemberOperator + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup + from engine.nyan.nyan_structs import MemberOperator class SWGBCCUpgradeResourceSubprocessor: diff --git a/openage/convert/processor/export/CMakeLists.txt b/engine/convert/processor/export/CMakeLists.txt similarity index 100% rename from openage/convert/processor/export/CMakeLists.txt rename to engine/convert/processor/export/CMakeLists.txt diff --git a/openage/convert/processor/export/__init__.pxd b/engine/convert/processor/export/__init__.pxd similarity index 100% rename from openage/convert/processor/export/__init__.pxd rename to engine/convert/processor/export/__init__.pxd diff --git a/openage/convert/processor/export/__init__.py b/engine/convert/processor/export/__init__.py similarity index 100% rename from openage/convert/processor/export/__init__.py rename to engine/convert/processor/export/__init__.py diff --git a/openage/convert/processor/export/data_exporter.py b/engine/convert/processor/export/data_exporter.py similarity index 89% rename from openage/convert/processor/export/data_exporter.py rename to engine/convert/processor/export/data_exporter.py index 35c74b062d..56babb702b 100644 --- a/openage/convert/processor/export/data_exporter.py +++ b/engine/convert/processor/export/data_exporter.py @@ -10,8 +10,8 @@ if typing.TYPE_CHECKING: - from openage.util.fslike.directory import Directory - from openage.convert.entity_object.export.data_definition import DataDefinition + from engine.util.fslike.directory import Directory + from engine.convert.entity_object.export.data_definition import DataDefinition class DataExporter: diff --git a/openage/convert/processor/export/generate_manifest_hashes.py b/engine/convert/processor/export/generate_manifest_hashes.py similarity index 90% rename from openage/convert/processor/export/generate_manifest_hashes.py rename to engine/convert/processor/export/generate_manifest_hashes.py index badc1b3f6e..46ed05a605 100644 --- a/openage/convert/processor/export/generate_manifest_hashes.py +++ b/engine/convert/processor/export/generate_manifest_hashes.py @@ -10,12 +10,12 @@ import os -from openage.util.hash import hash_file +from engine.util.hash import hash_file if typing.TYPE_CHECKING: - from openage.util.fslike.directory import Directory - from openage.util.fslike.path import Path - from openage.convert.entity_object.conversion.modpack import Modpack + from engine.util.fslike.directory import Directory + from engine.util.fslike.path import Path + from engine.convert.entity_object.conversion.modpack import Modpack def bfs_directory(root: Path) -> typing.Generator[Path, None, None]: diff --git a/openage/convert/processor/export/media_exporter.py b/engine/convert/processor/export/media_exporter.py similarity index 96% rename from openage/convert/processor/export/media_exporter.py rename to engine/convert/processor/export/media_exporter.py index 8984cbd4bf..d6ec5aad72 100644 --- a/openage/convert/processor/export/media_exporter.py +++ b/engine/convert/processor/export/media_exporter.py @@ -11,21 +11,21 @@ import os -from openage.convert.entity_object.export.texture import Texture -from openage.convert.service import debug_info -from openage.convert.service.export.load_media_cache import load_media_cache -from openage.convert.value_object.read.media.blendomatic import Blendomatic -from openage.convert.value_object.read.media_types import MediaType -from openage.log import dbg, info, get_loglevel -from openage.util.strings import format_progress +from engine.convert.entity_object.export.texture import Texture +from engine.convert.service import debug_info +from engine.convert.service.export.load_media_cache import load_media_cache +from engine.convert.value_object.read.media.blendomatic import Blendomatic +from engine.convert.value_object.read.media_types import MediaType +from engine.log import dbg, info, get_loglevel +from engine.util.strings import format_progress if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.export.media_export_request import MediaExportRequest - from openage.convert.value_object.read.media.colortable import ColorTable - from openage.convert.value_object.init.game_version import GameVersion - from openage.util.fslike.path import Path + from engine.convert.entity_object.export.media_export_request import MediaExportRequest + from engine.convert.value_object.read.media.colortable import ColorTable + from engine.convert.value_object.init.game_version import GameVersion + from engine.util.fslike.path import Path class MediaExporter: diff --git a/openage/convert/processor/export/modpack_exporter.py b/engine/convert/processor/export/modpack_exporter.py similarity index 96% rename from openage/convert/processor/export/modpack_exporter.py rename to engine/convert/processor/export/modpack_exporter.py index e0977f8a52..afc73e7e06 100644 --- a/openage/convert/processor/export/modpack_exporter.py +++ b/engine/convert/processor/export/modpack_exporter.py @@ -16,7 +16,7 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.modpack import Modpack + from engine.convert.entity_object.conversion.modpack import Modpack class ModpackExporter: diff --git a/openage/convert/processor/export/terrain_merge.pyx b/engine/convert/processor/export/terrain_merge.pyx similarity index 98% rename from openage/convert/processor/export/terrain_merge.pyx rename to engine/convert/processor/export/terrain_merge.pyx index fb5c8cd189..a385772df6 100644 --- a/openage/convert/processor/export/terrain_merge.pyx +++ b/engine/convert/processor/export/terrain_merge.pyx @@ -9,7 +9,7 @@ terrain texture. import numpy -from openage.convert.entity_object.export.texture import TextureImage +from engine.convert.entity_object.export.texture import TextureImage cimport cython cimport numpy diff --git a/openage/convert/processor/export/texture_merge.pyx b/engine/convert/processor/export/texture_merge.pyx similarity index 100% rename from openage/convert/processor/export/texture_merge.pyx rename to engine/convert/processor/export/texture_merge.pyx diff --git a/openage/convert/service/CMakeLists.txt b/engine/convert/service/CMakeLists.txt similarity index 100% rename from openage/convert/service/CMakeLists.txt rename to engine/convert/service/CMakeLists.txt diff --git a/openage/convert/service/__init__.py b/engine/convert/service/__init__.py similarity index 100% rename from openage/convert/service/__init__.py rename to engine/convert/service/__init__.py diff --git a/openage/convert/service/conversion/CMakeLists.txt b/engine/convert/service/conversion/CMakeLists.txt similarity index 100% rename from openage/convert/service/conversion/CMakeLists.txt rename to engine/convert/service/conversion/CMakeLists.txt diff --git a/openage/convert/service/conversion/__init__.py b/engine/convert/service/conversion/__init__.py similarity index 100% rename from openage/convert/service/conversion/__init__.py rename to engine/convert/service/conversion/__init__.py diff --git a/openage/convert/service/conversion/internal_name_lookups.py b/engine/convert/service/conversion/internal_name_lookups.py similarity index 95% rename from openage/convert/service/conversion/internal_name_lookups.py rename to engine/convert/service/conversion/internal_name_lookups.py index 65c85674b9..c8a301779c 100644 --- a/openage/convert/service/conversion/internal_name_lookups.py +++ b/engine/convert/service/conversion/internal_name_lookups.py @@ -9,17 +9,17 @@ from functools import cache -import openage.convert.value_object.conversion.aoc.internal_nyan_names as aoc_internal -import openage.convert.value_object.conversion.de1.internal_nyan_names as de1_internal -import openage.convert.value_object.conversion.de2.internal_nyan_names as de2_internal -import openage.convert.value_object.conversion.hd.ak.internal_nyan_names as ak_internal -import openage.convert.value_object.conversion.hd.fgt.internal_nyan_names as fgt_internal -import openage.convert.value_object.conversion.hd.raj.internal_nyan_names as raj_internal -import openage.convert.value_object.conversion.ror.internal_nyan_names as ror_internal -import openage.convert.value_object.conversion.swgb.internal_nyan_names as swgb_internal +import engine.convert.value_object.conversion.aoc.internal_nyan_names as aoc_internal +import engine.convert.value_object.conversion.de1.internal_nyan_names as de1_internal +import engine.convert.value_object.conversion.de2.internal_nyan_names as de2_internal +import engine.convert.value_object.conversion.hd.ak.internal_nyan_names as ak_internal +import engine.convert.value_object.conversion.hd.fgt.internal_nyan_names as fgt_internal +import engine.convert.value_object.conversion.hd.raj.internal_nyan_names as raj_internal +import engine.convert.value_object.conversion.ror.internal_nyan_names as ror_internal +import engine.convert.value_object.conversion.swgb.internal_nyan_names as swgb_internal if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.init.game_version import GameVersion @cache diff --git a/openage/convert/service/debug_info.py b/engine/convert/service/debug_info.py similarity index 95% rename from openage/convert/service/debug_info.py rename to engine/convert/service/debug_info.py index 50ffd72bc1..8fd192ff78 100644 --- a/openage/convert/service/debug_info.py +++ b/engine/convert/service/debug_info.py @@ -9,28 +9,28 @@ import typing -from openage.convert.entity_object.conversion.aoc.genie_tech import AgeUpgrade, \ +from engine.convert.entity_object.conversion.aoc.genie_tech import AgeUpgrade, \ UnitLineUpgrade, BuildingLineUpgrade, UnitUnlock, BuildingUnlock -from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ +from engine.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \ GenieBuildingLineGroup, GenieStackBuildingGroup, GenieUnitTransformGroup, \ GenieMonkGroup -from openage.convert.entity_object.export.formats.media_cache import MediaCacheFile -from openage.convert.service.conversion.internal_name_lookups import get_entity_lookups, \ +from engine.convert.entity_object.export.formats.media_cache import MediaCacheFile +from engine.convert.service.conversion.internal_name_lookups import get_entity_lookups, \ get_tech_lookups, get_civ_lookups, get_terrain_lookups -from openage.convert.value_object.read.media.datfile.empiresdat import EmpiresDatWrapper -from openage.convert.value_object.read.read_members import IncludeMembers, MultisubtypeMember -from openage.util.fslike.filecollection import FileCollectionPath -from openage.util.fslike.path import Path -from openage.util.hash import hash_file +from engine.convert.value_object.read.media.datfile.empiresdat import EmpiresDatWrapper +from engine.convert.value_object.read.read_members import IncludeMembers, MultisubtypeMember +from engine.util.fslike.filecollection import FileCollectionPath +from engine.util.fslike.path import Path +from engine.util.hash import hash_file if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.entity_object.conversion.modpack import Modpack - from openage.convert.entity_object.conversion.stringresource import StringResource - from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer - from openage.convert.value_object.init.game_version import GameVersion - from openage.util.fslike.directory import Directory + from engine.convert.entity_object.conversion.modpack import Modpack + from engine.convert.entity_object.conversion.stringresource import StringResource + from engine.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer + from engine.convert.value_object.init.game_version import GameVersion + from engine.util.fslike.directory import Directory def debug_cli_args(debugdir: Directory, loglevel: int, args: Namespace) -> None: diff --git a/openage/convert/service/export/CMakeLists.txt b/engine/convert/service/export/CMakeLists.txt similarity index 100% rename from openage/convert/service/export/CMakeLists.txt rename to engine/convert/service/export/CMakeLists.txt diff --git a/openage/convert/service/export/__init__.py b/engine/convert/service/export/__init__.py similarity index 100% rename from openage/convert/service/export/__init__.py rename to engine/convert/service/export/__init__.py diff --git a/openage/convert/service/export/interface/CMakeLists.txt b/engine/convert/service/export/interface/CMakeLists.txt similarity index 100% rename from openage/convert/service/export/interface/CMakeLists.txt rename to engine/convert/service/export/interface/CMakeLists.txt diff --git a/openage/convert/service/export/interface/__init__.py b/engine/convert/service/export/interface/__init__.py similarity index 100% rename from openage/convert/service/export/interface/__init__.py rename to engine/convert/service/export/interface/__init__.py diff --git a/openage/convert/service/export/interface/cutter.py b/engine/convert/service/export/interface/cutter.py similarity index 100% rename from openage/convert/service/export/interface/cutter.py rename to engine/convert/service/export/interface/cutter.py diff --git a/openage/convert/service/export/interface/rename.py b/engine/convert/service/export/interface/rename.py similarity index 95% rename from openage/convert/service/export/interface/rename.py rename to engine/convert/service/export/interface/rename.py index b8beb723ef..2f6de55f34 100644 --- a/openage/convert/service/export/interface/rename.py +++ b/engine/convert/service/export/interface/rename.py @@ -11,7 +11,7 @@ from .cutter import ingame_hud_background_index if typing.TYPE_CHECKING: - from openage.util.fslike.path import Path + from engine.util.fslike.path import Path def hud_rename(filepath: Path) -> Path: diff --git a/openage/convert/service/export/interface/visgrep.pyx b/engine/convert/service/export/interface/visgrep.pyx similarity index 100% rename from openage/convert/service/export/interface/visgrep.pyx rename to engine/convert/service/export/interface/visgrep.pyx diff --git a/openage/convert/service/export/load_media_cache.py b/engine/convert/service/export/load_media_cache.py similarity index 95% rename from openage/convert/service/export/load_media_cache.py rename to engine/convert/service/export/load_media_cache.py index ba1d517d8b..828d3208a3 100644 --- a/openage/convert/service/export/load_media_cache.py +++ b/engine/convert/service/export/load_media_cache.py @@ -9,7 +9,7 @@ import toml if typing.TYPE_CHECKING: - from openage.util.fslike.path import Path + from engine.util.fslike.path import Path def load_media_cache(filepath: Path) -> dict[str, dict[str, tuple]]: diff --git a/openage/convert/service/export/opus/CMakeLists.txt b/engine/convert/service/export/opus/CMakeLists.txt similarity index 100% rename from openage/convert/service/export/opus/CMakeLists.txt rename to engine/convert/service/export/opus/CMakeLists.txt diff --git a/openage/convert/service/export/opus/__init__.pxd b/engine/convert/service/export/opus/__init__.pxd similarity index 100% rename from openage/convert/service/export/opus/__init__.pxd rename to engine/convert/service/export/opus/__init__.pxd diff --git a/openage/convert/service/export/opus/__init__.py b/engine/convert/service/export/opus/__init__.py similarity index 100% rename from openage/convert/service/export/opus/__init__.py rename to engine/convert/service/export/opus/__init__.py diff --git a/openage/convert/service/export/opus/bytearray.pxd b/engine/convert/service/export/opus/bytearray.pxd similarity index 100% rename from openage/convert/service/export/opus/bytearray.pxd rename to engine/convert/service/export/opus/bytearray.pxd diff --git a/openage/convert/service/export/opus/demo.py b/engine/convert/service/export/opus/demo.py similarity index 100% rename from openage/convert/service/export/opus/demo.py rename to engine/convert/service/export/opus/demo.py diff --git a/openage/convert/service/export/opus/ogg.pxd b/engine/convert/service/export/opus/ogg.pxd similarity index 100% rename from openage/convert/service/export/opus/ogg.pxd rename to engine/convert/service/export/opus/ogg.pxd diff --git a/openage/convert/service/export/opus/opus.pxd b/engine/convert/service/export/opus/opus.pxd similarity index 100% rename from openage/convert/service/export/opus/opus.pxd rename to engine/convert/service/export/opus/opus.pxd diff --git a/openage/convert/service/export/opus/opusenc.pyx b/engine/convert/service/export/opus/opusenc.pyx similarity index 100% rename from openage/convert/service/export/opus/opusenc.pyx rename to engine/convert/service/export/opus/opusenc.pyx diff --git a/openage/convert/service/export/png/CMakeLists.txt b/engine/convert/service/export/png/CMakeLists.txt similarity index 100% rename from openage/convert/service/export/png/CMakeLists.txt rename to engine/convert/service/export/png/CMakeLists.txt diff --git a/openage/convert/service/export/png/__init__.pxd b/engine/convert/service/export/png/__init__.pxd similarity index 100% rename from openage/convert/service/export/png/__init__.pxd rename to engine/convert/service/export/png/__init__.pxd diff --git a/openage/convert/service/export/png/__init__.py b/engine/convert/service/export/png/__init__.py similarity index 100% rename from openage/convert/service/export/png/__init__.py rename to engine/convert/service/export/png/__init__.py diff --git a/openage/convert/service/export/png/binpack.pxd b/engine/convert/service/export/png/binpack.pxd similarity index 100% rename from openage/convert/service/export/png/binpack.pxd rename to engine/convert/service/export/png/binpack.pxd diff --git a/openage/convert/service/export/png/binpack.pyx b/engine/convert/service/export/png/binpack.pyx similarity index 100% rename from openage/convert/service/export/png/binpack.pyx rename to engine/convert/service/export/png/binpack.pyx diff --git a/openage/convert/service/export/png/libpng.pxd b/engine/convert/service/export/png/libpng.pxd similarity index 100% rename from openage/convert/service/export/png/libpng.pxd rename to engine/convert/service/export/png/libpng.pxd diff --git a/openage/convert/service/export/png/png_create.pyx b/engine/convert/service/export/png/png_create.pyx similarity index 100% rename from openage/convert/service/export/png/png_create.pyx rename to engine/convert/service/export/png/png_create.pyx diff --git a/openage/convert/service/export/png/png_tmp_file.pxd b/engine/convert/service/export/png/png_tmp_file.pxd similarity index 100% rename from openage/convert/service/export/png/png_tmp_file.pxd rename to engine/convert/service/export/png/png_tmp_file.pxd diff --git a/openage/convert/service/init/CMakeLists.txt b/engine/convert/service/init/CMakeLists.txt similarity index 100% rename from openage/convert/service/init/CMakeLists.txt rename to engine/convert/service/init/CMakeLists.txt diff --git a/openage/convert/service/init/__init__.py b/engine/convert/service/init/__init__.py similarity index 100% rename from openage/convert/service/init/__init__.py rename to engine/convert/service/init/__init__.py diff --git a/openage/convert/service/init/changelog.py b/engine/convert/service/init/changelog.py similarity index 100% rename from openage/convert/service/init/changelog.py rename to engine/convert/service/init/changelog.py diff --git a/openage/convert/service/init/conversion_required.py b/engine/convert/service/init/conversion_required.py similarity index 97% rename from openage/convert/service/init/conversion_required.py rename to engine/convert/service/init/conversion_required.py index 7f144bd834..3611d75a6c 100644 --- a/openage/convert/service/init/conversion_required.py +++ b/engine/convert/service/init/conversion_required.py @@ -12,7 +12,7 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.util.fslike.directory import Directory + from engine.util.fslike.directory import Directory def conversion_required(asset_dir: Directory, args: Namespace) -> bool: diff --git a/openage/convert/service/init/mount_asset_dirs.py b/engine/convert/service/init/mount_asset_dirs.py similarity index 94% rename from openage/convert/service/init/mount_asset_dirs.py rename to engine/convert/service/init/mount_asset_dirs.py index d39ac2577b..6c6735556e 100644 --- a/openage/convert/service/init/mount_asset_dirs.py +++ b/engine/convert/service/init/mount_asset_dirs.py @@ -12,8 +12,8 @@ from ...value_object.read.media.drs import DRS if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.util.fslike.directory import Directory + from engine.convert.value_object.init.game_version import GameVersion + from engine.util.fslike.directory import Directory def mount_asset_dirs( diff --git a/openage/convert/service/init/version_detect.py b/engine/convert/service/init/version_detect.py similarity index 98% rename from openage/convert/service/init/version_detect.py rename to engine/convert/service/init/version_detect.py index 70d157d979..f40ad587bd 100644 --- a/openage/convert/service/init/version_detect.py +++ b/engine/convert/service/init/version_detect.py @@ -17,8 +17,8 @@ from ...value_object.init.game_version import GameEdition, GameExpansion, GameVersion, Support if typing.TYPE_CHECKING: - from openage.util.fslike.directory import Directory - from openage.util.fslike.path import Path + from engine.util.fslike.directory import Directory + from engine.util.fslike.path import Path def iterate_game_versions( diff --git a/openage/convert/service/read/CMakeLists.txt b/engine/convert/service/read/CMakeLists.txt similarity index 100% rename from openage/convert/service/read/CMakeLists.txt rename to engine/convert/service/read/CMakeLists.txt diff --git a/openage/convert/service/read/__init__.py b/engine/convert/service/read/__init__.py similarity index 100% rename from openage/convert/service/read/__init__.py rename to engine/convert/service/read/__init__.py diff --git a/openage/convert/service/read/gamedata.py b/engine/convert/service/read/gamedata.py similarity index 93% rename from openage/convert/service/read/gamedata.py rename to engine/convert/service/read/gamedata.py index 522d959b8e..1cbdac8e2e 100644 --- a/openage/convert/service/read/gamedata.py +++ b/engine/convert/service/read/gamedata.py @@ -16,10 +16,10 @@ from ...value_object.read.media_types import MediaType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.read_members import ArrayMember - from openage.util.fslike.directory import Directory - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.read_members import ArrayMember + from engine.util.fslike.directory import Directory + from engine.util.fslike.wrapper import GuardedFile def get_gamespec(srcdir: Directory, game_version: GameVersion, pickle_cache: bool) -> ArrayMember: diff --git a/openage/convert/service/read/nyan_api_loader.py b/engine/convert/service/read/nyan_api_loader.py similarity index 100% rename from openage/convert/service/read/nyan_api_loader.py rename to engine/convert/service/read/nyan_api_loader.py diff --git a/openage/convert/service/read/palette.py b/engine/convert/service/read/palette.py similarity index 95% rename from openage/convert/service/read/palette.py rename to engine/convert/service/read/palette.py index 303e63e8f0..adbb0fae31 100644 --- a/openage/convert/service/read/palette.py +++ b/engine/convert/service/read/palette.py @@ -10,8 +10,8 @@ from ...value_object.read.media_types import MediaType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.util.fslike.directory import Directory + from engine.convert.value_object.init.game_version import GameVersion + from engine.util.fslike.directory import Directory def get_palettes( diff --git a/openage/convert/service/read/register_media.py b/engine/convert/service/read/register_media.py similarity index 100% rename from openage/convert/service/read/register_media.py rename to engine/convert/service/read/register_media.py diff --git a/openage/convert/service/read/string_resource.py b/engine/convert/service/read/string_resource.py similarity index 98% rename from openage/convert/service/read/string_resource.py rename to engine/convert/service/read/string_resource.py index fc23f82cee..9387b4b7d1 100644 --- a/openage/convert/service/read/string_resource.py +++ b/engine/convert/service/read/string_resource.py @@ -19,9 +19,9 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.util.fslike.directory import Directory - from openage.util.fslike.path import Path - from openage.util.fslike.wrapper import GuardedFile + from engine.util.fslike.directory import Directory + from engine.util.fslike.path import Path + from engine.util.fslike.wrapper import GuardedFile def get_string_resources(args: Namespace) -> StringResource: diff --git a/openage/convert/tool/CMakeLists.txt b/engine/convert/tool/CMakeLists.txt similarity index 100% rename from openage/convert/tool/CMakeLists.txt rename to engine/convert/tool/CMakeLists.txt diff --git a/openage/convert/tool/__init__.py b/engine/convert/tool/__init__.py similarity index 100% rename from openage/convert/tool/__init__.py rename to engine/convert/tool/__init__.py diff --git a/openage/convert/tool/api_export.py b/engine/convert/tool/api_export.py similarity index 82% rename from openage/convert/tool/api_export.py rename to engine/convert/tool/api_export.py index 3972195153..0466f932b6 100644 --- a/openage/convert/tool/api_export.py +++ b/engine/convert/tool/api_export.py @@ -4,15 +4,15 @@ Export tool for dumping the nyan API of the engine from the converter. """ -from openage.convert.entity_object.conversion.modpack import Modpack -from openage.convert.entity_object.export.formats.nyan_file import NyanFile -from openage.convert.processor.export.data_exporter import DataExporter -from openage.convert.processor.export.generate_manifest_hashes import generate_hashes -from openage.convert.service.read.nyan_api_loader import load_api -from openage.nyan.import_tree import ImportTree -from openage.util.fslike.directory import Directory -from openage.util.fslike.union import Union -from openage.util.fslike.wrapper import (DirectoryCreator, +from engine.convert.entity_object.conversion.modpack import Modpack +from engine.convert.entity_object.export.formats.nyan_file import NyanFile +from engine.convert.processor.export.data_exporter import DataExporter +from engine.convert.processor.export.generate_manifest_hashes import generate_hashes +from engine.convert.service.read.nyan_api_loader import load_api +from engine.nyan.import_tree import ImportTree +from engine.util.fslike.directory import Directory +from engine.util.fslike.union import Union +from engine.util.fslike.wrapper import (DirectoryCreator, Synchronizer as AccessSynchronizer) from ...log import info diff --git a/openage/convert/tool/driver.py b/engine/convert/tool/driver.py similarity index 98% rename from openage/convert/tool/driver.py rename to engine/convert/tool/driver.py index c056f8c3b1..6060fc45bc 100644 --- a/openage/convert/tool/driver.py +++ b/engine/convert/tool/driver.py @@ -22,7 +22,7 @@ if typing.TYPE_CHECKING: from argparse import Namespace - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.init.game_version import GameVersion def convert(args: Namespace) -> typing.Generator[str, None, None]: diff --git a/openage/convert/tool/interactive.py b/engine/convert/tool/interactive.py similarity index 94% rename from openage/convert/tool/interactive.py rename to engine/convert/tool/interactive.py index 744fa30b42..dfd7a5ff34 100644 --- a/openage/convert/tool/interactive.py +++ b/engine/convert/tool/interactive.py @@ -10,7 +10,7 @@ import os import readline # pylint: disable=unused-import -from openage.convert.processor.export.media_exporter import MediaExporter +from engine.convert.processor.export.media_exporter import MediaExporter from ...log import warn, info from ...util.fslike.directory import Directory @@ -19,9 +19,9 @@ from .subtool.version_select import get_game_version if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media.colortable import ColorTable - from openage.util.fslike.directory import Directory - from openage.util.fslike.path import Path + from engine.convert.value_object.read.media.colortable import ColorTable + from engine.util.fslike.directory import Directory + from engine.util.fslike.path import Path def interactive_browser(cfg: Path, srcdir: Directory = None) -> typing.NoReturn: diff --git a/openage/convert/tool/singlefile.py b/engine/convert/tool/singlefile.py similarity index 98% rename from openage/convert/tool/singlefile.py rename to engine/convert/tool/singlefile.py index 57935ff6ff..8402165bed 100644 --- a/openage/convert/tool/singlefile.py +++ b/engine/convert/tool/singlefile.py @@ -8,8 +8,8 @@ from pathlib import Path -from openage.convert.processor.export.media_exporter import MediaExporter -from openage.convert.value_object.init.game_version import GameEdition, GameVersion +from engine.convert.processor.export.media_exporter import MediaExporter +from engine.convert.value_object.init.game_version import GameEdition, GameVersion from ...log import info from ...util.fslike.directory import Directory diff --git a/openage/convert/tool/subtool/CMakeLists.txt b/engine/convert/tool/subtool/CMakeLists.txt similarity index 100% rename from openage/convert/tool/subtool/CMakeLists.txt rename to engine/convert/tool/subtool/CMakeLists.txt diff --git a/openage/convert/tool/subtool/__init__.py b/engine/convert/tool/subtool/__init__.py similarity index 100% rename from openage/convert/tool/subtool/__init__.py rename to engine/convert/tool/subtool/__init__.py diff --git a/openage/convert/tool/subtool/acquire_sourcedir.py b/engine/convert/tool/subtool/acquire_sourcedir.py similarity index 100% rename from openage/convert/tool/subtool/acquire_sourcedir.py rename to engine/convert/tool/subtool/acquire_sourcedir.py diff --git a/openage/convert/tool/subtool/version_select.py b/engine/convert/tool/subtool/version_select.py similarity index 94% rename from openage/convert/tool/subtool/version_select.py rename to engine/convert/tool/subtool/version_select.py index 37ad65a685..941a246a7e 100644 --- a/openage/convert/tool/subtool/version_select.py +++ b/engine/convert/tool/subtool/version_select.py @@ -13,9 +13,9 @@ from ...value_object.init.game_version import Support if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameEdition, \ + from engine.convert.value_object.init.game_version import GameEdition, \ GameExpansion, GameVersion - from openage.util.fslike.directory import Directory + from engine.util.fslike.directory import Directory def get_game_version( diff --git a/openage/convert/value_object/CMakeLists.txt b/engine/convert/value_object/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/CMakeLists.txt rename to engine/convert/value_object/CMakeLists.txt diff --git a/openage/convert/value_object/__init__.py b/engine/convert/value_object/__init__.py similarity index 100% rename from openage/convert/value_object/__init__.py rename to engine/convert/value_object/__init__.py diff --git a/openage/convert/value_object/conversion/CMakeLists.txt b/engine/convert/value_object/conversion/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/CMakeLists.txt rename to engine/convert/value_object/conversion/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/__init__.py b/engine/convert/value_object/conversion/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/__init__.py rename to engine/convert/value_object/conversion/__init__.py diff --git a/openage/convert/value_object/conversion/aoc/CMakeLists.txt b/engine/convert/value_object/conversion/aoc/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/aoc/CMakeLists.txt rename to engine/convert/value_object/conversion/aoc/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/aoc/__init__.py b/engine/convert/value_object/conversion/aoc/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/aoc/__init__.py rename to engine/convert/value_object/conversion/aoc/__init__.py diff --git a/openage/convert/value_object/conversion/aoc/internal_nyan_names.py b/engine/convert/value_object/conversion/aoc/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/aoc/internal_nyan_names.py rename to engine/convert/value_object/conversion/aoc/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/de1/CMakeLists.txt b/engine/convert/value_object/conversion/de1/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/de1/CMakeLists.txt rename to engine/convert/value_object/conversion/de1/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/de1/__init__.py b/engine/convert/value_object/conversion/de1/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/de1/__init__.py rename to engine/convert/value_object/conversion/de1/__init__.py diff --git a/openage/convert/value_object/conversion/de1/internal_nyan_names.py b/engine/convert/value_object/conversion/de1/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/de1/internal_nyan_names.py rename to engine/convert/value_object/conversion/de1/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/de2/CMakeLists.txt b/engine/convert/value_object/conversion/de2/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/de2/CMakeLists.txt rename to engine/convert/value_object/conversion/de2/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/de2/__init__.py b/engine/convert/value_object/conversion/de2/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/de2/__init__.py rename to engine/convert/value_object/conversion/de2/__init__.py diff --git a/openage/convert/value_object/conversion/de2/internal_nyan_names.py b/engine/convert/value_object/conversion/de2/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/de2/internal_nyan_names.py rename to engine/convert/value_object/conversion/de2/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/forward_ref.py b/engine/convert/value_object/conversion/forward_ref.py similarity index 91% rename from openage/convert/value_object/conversion/forward_ref.py rename to engine/convert/value_object/conversion/forward_ref.py index 41a4262c62..41ae2d1f4f 100644 --- a/openage/convert/value_object/conversion/forward_ref.py +++ b/engine/convert/value_object/conversion/forward_ref.py @@ -12,9 +12,9 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.conversion.converter_object import ConverterObjectGroup, \ + from engine.convert.entity_object.conversion.converter_object import ConverterObjectGroup, \ RawAPIObject - from openage.nyan.nyan_structs import NyanObject + from engine.nyan.nyan_structs import NyanObject class ForwardRef: diff --git a/openage/convert/value_object/conversion/hd/CMakeLists.txt b/engine/convert/value_object/conversion/hd/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/hd/CMakeLists.txt rename to engine/convert/value_object/conversion/hd/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/hd/__init__.py b/engine/convert/value_object/conversion/hd/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/hd/__init__.py rename to engine/convert/value_object/conversion/hd/__init__.py diff --git a/openage/convert/value_object/conversion/hd/ak/CMakeLists.txt b/engine/convert/value_object/conversion/hd/ak/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/hd/ak/CMakeLists.txt rename to engine/convert/value_object/conversion/hd/ak/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/hd/ak/__init__.py b/engine/convert/value_object/conversion/hd/ak/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/hd/ak/__init__.py rename to engine/convert/value_object/conversion/hd/ak/__init__.py diff --git a/openage/convert/value_object/conversion/hd/ak/internal_nyan_names.py b/engine/convert/value_object/conversion/hd/ak/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/hd/ak/internal_nyan_names.py rename to engine/convert/value_object/conversion/hd/ak/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/hd/fgt/CMakeLists.txt b/engine/convert/value_object/conversion/hd/fgt/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/hd/fgt/CMakeLists.txt rename to engine/convert/value_object/conversion/hd/fgt/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/hd/fgt/__init__.py b/engine/convert/value_object/conversion/hd/fgt/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/hd/fgt/__init__.py rename to engine/convert/value_object/conversion/hd/fgt/__init__.py diff --git a/openage/convert/value_object/conversion/hd/fgt/internal_nyan_names.py b/engine/convert/value_object/conversion/hd/fgt/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/hd/fgt/internal_nyan_names.py rename to engine/convert/value_object/conversion/hd/fgt/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/hd/raj/CMakeLists.txt b/engine/convert/value_object/conversion/hd/raj/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/hd/raj/CMakeLists.txt rename to engine/convert/value_object/conversion/hd/raj/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/hd/raj/__init__.py b/engine/convert/value_object/conversion/hd/raj/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/hd/raj/__init__.py rename to engine/convert/value_object/conversion/hd/raj/__init__.py diff --git a/openage/convert/value_object/conversion/hd/raj/internal_nyan_names.py b/engine/convert/value_object/conversion/hd/raj/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/hd/raj/internal_nyan_names.py rename to engine/convert/value_object/conversion/hd/raj/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/ror/CMakeLists.txt b/engine/convert/value_object/conversion/ror/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/ror/CMakeLists.txt rename to engine/convert/value_object/conversion/ror/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/ror/__init__.py b/engine/convert/value_object/conversion/ror/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/ror/__init__.py rename to engine/convert/value_object/conversion/ror/__init__.py diff --git a/openage/convert/value_object/conversion/ror/internal_nyan_names.py b/engine/convert/value_object/conversion/ror/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/ror/internal_nyan_names.py rename to engine/convert/value_object/conversion/ror/internal_nyan_names.py diff --git a/openage/convert/value_object/conversion/swgb/CMakeLists.txt b/engine/convert/value_object/conversion/swgb/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/conversion/swgb/CMakeLists.txt rename to engine/convert/value_object/conversion/swgb/CMakeLists.txt diff --git a/openage/convert/value_object/conversion/swgb/__init__.py b/engine/convert/value_object/conversion/swgb/__init__.py similarity index 100% rename from openage/convert/value_object/conversion/swgb/__init__.py rename to engine/convert/value_object/conversion/swgb/__init__.py diff --git a/openage/convert/value_object/conversion/swgb/internal_nyan_names.py b/engine/convert/value_object/conversion/swgb/internal_nyan_names.py similarity index 100% rename from openage/convert/value_object/conversion/swgb/internal_nyan_names.py rename to engine/convert/value_object/conversion/swgb/internal_nyan_names.py diff --git a/openage/convert/value_object/init/CMakeLists.txt b/engine/convert/value_object/init/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/init/CMakeLists.txt rename to engine/convert/value_object/init/CMakeLists.txt diff --git a/openage/convert/value_object/init/__init__.py b/engine/convert/value_object/init/__init__.py similarity index 100% rename from openage/convert/value_object/init/__init__.py rename to engine/convert/value_object/init/__init__.py diff --git a/openage/convert/value_object/init/game_file_version.py b/engine/convert/value_object/init/game_file_version.py similarity index 100% rename from openage/convert/value_object/init/game_file_version.py rename to engine/convert/value_object/init/game_file_version.py diff --git a/openage/convert/value_object/init/game_version.py b/engine/convert/value_object/init/game_version.py similarity index 100% rename from openage/convert/value_object/init/game_version.py rename to engine/convert/value_object/init/game_version.py diff --git a/openage/convert/value_object/read/CMakeLists.txt b/engine/convert/value_object/read/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/read/CMakeLists.txt rename to engine/convert/value_object/read/CMakeLists.txt diff --git a/openage/convert/value_object/read/__init__.py b/engine/convert/value_object/read/__init__.py similarity index 100% rename from openage/convert/value_object/read/__init__.py rename to engine/convert/value_object/read/__init__.py diff --git a/openage/convert/value_object/read/dynamic_loader.py b/engine/convert/value_object/read/dynamic_loader.py similarity index 89% rename from openage/convert/value_object/read/dynamic_loader.py rename to engine/convert/value_object/read/dynamic_loader.py index e97de52894..e7f1714ee8 100644 --- a/openage/convert/value_object/read/dynamic_loader.py +++ b/engine/convert/value_object/read/dynamic_loader.py @@ -10,9 +10,9 @@ import typing if typing.TYPE_CHECKING: - from openage.convert.value_object.read.genie_structure import GenieStructure - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.value_members import ValueMember + from engine.convert.value_object.read.genie_structure import GenieStructure + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.value_members import ValueMember class DynamicLoader: diff --git a/openage/convert/value_object/read/genie_structure.py b/engine/convert/value_object/read/genie_structure.py similarity index 99% rename from openage/convert/value_object/read/genie_structure.py rename to engine/convert/value_object/read/genie_structure.py index bfc6324f1c..dfe468d660 100644 --- a/openage/convert/value_object/read/genie_structure.py +++ b/engine/convert/value_object/read/genie_structure.py @@ -9,7 +9,7 @@ import re import struct -from openage.convert.value_object.read.dynamic_loader import DynamicLoader +from engine.convert.value_object.read.dynamic_loader import DynamicLoader from ....util.strings import decode_until_null from .member_access import READ, READ_GEN, READ_UNKNOWN, SKIP, MemberAccess @@ -22,7 +22,7 @@ from .value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.init.game_version import GameVersion # regex for matching type array definitions like int[1337] diff --git a/openage/convert/value_object/read/media/CMakeLists.txt b/engine/convert/value_object/read/media/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/read/media/CMakeLists.txt rename to engine/convert/value_object/read/media/CMakeLists.txt diff --git a/openage/convert/value_object/read/media/__init__.pxd b/engine/convert/value_object/read/media/__init__.pxd similarity index 100% rename from openage/convert/value_object/read/media/__init__.pxd rename to engine/convert/value_object/read/media/__init__.pxd diff --git a/openage/convert/value_object/read/media/__init__.py b/engine/convert/value_object/read/media/__init__.py similarity index 100% rename from openage/convert/value_object/read/media/__init__.py rename to engine/convert/value_object/read/media/__init__.py diff --git a/openage/convert/value_object/read/media/blendomatic.py b/engine/convert/value_object/read/media/blendomatic.py similarity index 95% rename from openage/convert/value_object/read/media/blendomatic.py rename to engine/convert/value_object/read/media/blendomatic.py index 1ce04ef86b..fe503fd937 100644 --- a/openage/convert/value_object/read/media/blendomatic.py +++ b/engine/convert/value_object/read/media/blendomatic.py @@ -22,12 +22,12 @@ if typing.TYPE_CHECKING: - from openage.convert.entity_object.export.texture import Texture - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember - from openage.convert.value_object.read.value_members import StorageType - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.entity_object.export.texture import Texture + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.read.value_members import StorageType + from engine.util.fslike.wrapper import GuardedFile class BlendingTile: diff --git a/openage/convert/value_object/read/media/colortable.py b/engine/convert/value_object/read/media/colortable.py similarity index 95% rename from openage/convert/value_object/read/media/colortable.py rename to engine/convert/value_object/read/media/colortable.py index f69a1c4f65..7a80aabe68 100644 --- a/openage/convert/value_object/read/media/colortable.py +++ b/engine/convert/value_object/read/media/colortable.py @@ -15,11 +15,11 @@ if typing.TYPE_CHECKING: from PIL import Image - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember - from openage.convert.value_object.read.value_members import StorageType - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.read.value_members import StorageType + from engine.util.fslike.wrapper import GuardedFile class ColorTable(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/CMakeLists.txt b/engine/convert/value_object/read/media/datfile/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/read/media/datfile/CMakeLists.txt rename to engine/convert/value_object/read/media/datfile/CMakeLists.txt diff --git a/openage/convert/value_object/read/media/datfile/__init__.py b/engine/convert/value_object/read/media/datfile/__init__.py similarity index 100% rename from openage/convert/value_object/read/media/datfile/__init__.py rename to engine/convert/value_object/read/media/datfile/__init__.py diff --git a/openage/convert/value_object/read/media/datfile/civ.py b/engine/convert/value_object/read/media/datfile/civ.py similarity index 93% rename from openage/convert/value_object/read/media/datfile/civ.py rename to engine/convert/value_object/read/media/datfile/civ.py index fa460cc633..ae2b7ff2e5 100644 --- a/openage/convert/value_object/read/media/datfile/civ.py +++ b/engine/convert/value_object/read/media/datfile/civ.py @@ -13,9 +13,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class Civ(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/empiresdat.py b/engine/convert/value_object/read/media/datfile/empiresdat.py similarity index 98% rename from openage/convert/value_object/read/media/datfile/empiresdat.py rename to engine/convert/value_object/read/media/datfile/empiresdat.py index 6722002d89..f515d5c9a9 100644 --- a/openage/convert/value_object/read/media/datfile/empiresdat.py +++ b/engine/convert/value_object/read/media/datfile/empiresdat.py @@ -21,9 +21,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember # this file can parse and represent the empires2_x1_p1.dat file. diff --git a/openage/convert/value_object/read/media/datfile/graphic.py b/engine/convert/value_object/read/media/datfile/graphic.py similarity index 97% rename from openage/convert/value_object/read/media/datfile/graphic.py rename to engine/convert/value_object/read/media/datfile/graphic.py index 30bfc9d97c..9fc77fa54a 100644 --- a/openage/convert/value_object/read/media/datfile/graphic.py +++ b/engine/convert/value_object/read/media/datfile/graphic.py @@ -13,9 +13,9 @@ from .lookup_dicts import GRAPHICS_LAYER if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class GraphicDelta(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/lookup_dicts.py b/engine/convert/value_object/read/media/datfile/lookup_dicts.py similarity index 100% rename from openage/convert/value_object/read/media/datfile/lookup_dicts.py rename to engine/convert/value_object/read/media/datfile/lookup_dicts.py diff --git a/openage/convert/value_object/read/media/datfile/maps.py b/engine/convert/value_object/read/media/datfile/maps.py similarity index 97% rename from openage/convert/value_object/read/media/datfile/maps.py rename to engine/convert/value_object/read/media/datfile/maps.py index 2ab06f78fb..0bf00d8908 100644 --- a/openage/convert/value_object/read/media/datfile/maps.py +++ b/engine/convert/value_object/read/media/datfile/maps.py @@ -12,9 +12,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class MapInfo(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/playercolor.py b/engine/convert/value_object/read/media/datfile/playercolor.py similarity index 90% rename from openage/convert/value_object/read/media/datfile/playercolor.py rename to engine/convert/value_object/read/media/datfile/playercolor.py index 62c477f4f2..3e8a8d3c85 100644 --- a/openage/convert/value_object/read/media/datfile/playercolor.py +++ b/engine/convert/value_object/read/media/datfile/playercolor.py @@ -11,9 +11,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class PlayerColor(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/research.py b/engine/convert/value_object/read/media/datfile/research.py similarity index 96% rename from openage/convert/value_object/read/media/datfile/research.py rename to engine/convert/value_object/read/media/datfile/research.py index c1169dfbed..61ae260ad6 100644 --- a/openage/convert/value_object/read/media/datfile/research.py +++ b/engine/convert/value_object/read/media/datfile/research.py @@ -13,9 +13,9 @@ from .lookup_dicts import RESOURCE_TYPES if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class TechResourceCost(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/sound.py b/engine/convert/value_object/read/media/datfile/sound.py similarity index 93% rename from openage/convert/value_object/read/media/datfile/sound.py rename to engine/convert/value_object/read/media/datfile/sound.py index 51f6eff2f3..88ee303d75 100644 --- a/openage/convert/value_object/read/media/datfile/sound.py +++ b/engine/convert/value_object/read/media/datfile/sound.py @@ -12,9 +12,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class SoundItem(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/tech.py b/engine/convert/value_object/read/media/datfile/tech.py similarity index 98% rename from openage/convert/value_object/read/media/datfile/tech.py rename to engine/convert/value_object/read/media/datfile/tech.py index a6720d3c25..53f7253ae4 100644 --- a/openage/convert/value_object/read/media/datfile/tech.py +++ b/engine/convert/value_object/read/media/datfile/tech.py @@ -13,9 +13,9 @@ from .lookup_dicts import EFFECT_APPLY_TYPE, CONNECTION_MODE if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class Effect(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/terrain.py b/engine/convert/value_object/read/media/datfile/terrain.py similarity index 98% rename from openage/convert/value_object/read/media/datfile/terrain.py rename to engine/convert/value_object/read/media/datfile/terrain.py index a9f74f36be..68ef02d1e3 100644 --- a/openage/convert/value_object/read/media/datfile/terrain.py +++ b/engine/convert/value_object/read/media/datfile/terrain.py @@ -12,9 +12,9 @@ from ....read.value_members import StorageType if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class FrameData(GenieStructure): diff --git a/openage/convert/value_object/read/media/datfile/unit.py b/engine/convert/value_object/read/media/datfile/unit.py similarity index 99% rename from openage/convert/value_object/read/media/datfile/unit.py rename to engine/convert/value_object/read/media/datfile/unit.py index eda53f9cf5..cc683b147e 100644 --- a/openage/convert/value_object/read/media/datfile/unit.py +++ b/engine/convert/value_object/read/media/datfile/unit.py @@ -18,9 +18,9 @@ GARRISON_TYPES if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.read_members import ReadMember + from engine.convert.value_object.init.game_version import GameVersion + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.read_members import ReadMember class UnitCommand(GenieStructure): diff --git a/openage/convert/value_object/read/media/drs.py b/engine/convert/value_object/read/media/drs.py similarity index 97% rename from openage/convert/value_object/read/media/drs.py rename to engine/convert/value_object/read/media/drs.py index 72bf6a0679..31af2250f9 100644 --- a/openage/convert/value_object/read/media/drs.py +++ b/engine/convert/value_object/read/media/drs.py @@ -17,8 +17,8 @@ from .....util.struct import NamedStruct if typing.TYPE_CHECKING: - from openage.convert.value_object.init.game_version import GameVersion - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.value_object.init.game_version import GameVersion + from engine.util.fslike.wrapper import GuardedFile # version of the drs files, hardcoded for now diff --git a/openage/convert/value_object/read/media/hardcoded/CMakeLists.txt b/engine/convert/value_object/read/media/hardcoded/CMakeLists.txt similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/CMakeLists.txt rename to engine/convert/value_object/read/media/hardcoded/CMakeLists.txt diff --git a/openage/convert/value_object/read/media/hardcoded/__init__.py b/engine/convert/value_object/read/media/hardcoded/__init__.py similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/__init__.py rename to engine/convert/value_object/read/media/hardcoded/__init__.py diff --git a/openage/convert/value_object/read/media/hardcoded/interface.py b/engine/convert/value_object/read/media/hardcoded/interface.py similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/interface.py rename to engine/convert/value_object/read/media/hardcoded/interface.py diff --git a/openage/convert/value_object/read/media/hardcoded/termcolors.py b/engine/convert/value_object/read/media/hardcoded/termcolors.py similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/termcolors.py rename to engine/convert/value_object/read/media/hardcoded/termcolors.py diff --git a/openage/convert/value_object/read/media/hardcoded/terrain_tile_size.py b/engine/convert/value_object/read/media/hardcoded/terrain_tile_size.py similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/terrain_tile_size.py rename to engine/convert/value_object/read/media/hardcoded/terrain_tile_size.py diff --git a/openage/convert/value_object/read/media/hardcoded/texture.py b/engine/convert/value_object/read/media/hardcoded/texture.py similarity index 100% rename from openage/convert/value_object/read/media/hardcoded/texture.py rename to engine/convert/value_object/read/media/hardcoded/texture.py diff --git a/openage/convert/value_object/read/media/langcodes.py b/engine/convert/value_object/read/media/langcodes.py similarity index 100% rename from openage/convert/value_object/read/media/langcodes.py rename to engine/convert/value_object/read/media/langcodes.py diff --git a/openage/convert/value_object/read/media/pefile.py b/engine/convert/value_object/read/media/pefile.py similarity index 98% rename from openage/convert/value_object/read/media/pefile.py rename to engine/convert/value_object/read/media/pefile.py index da05d66671..7d95948f44 100644 --- a/openage/convert/value_object/read/media/pefile.py +++ b/engine/convert/value_object/read/media/pefile.py @@ -15,8 +15,8 @@ from .....util.struct import NamedStruct if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media.peresource import PEResources - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.value_object.read.media.peresource import PEResources + from engine.util.fslike.wrapper import GuardedFile class PEDOSHeader(NamedStruct): diff --git a/openage/convert/value_object/read/media/peresource.py b/engine/convert/value_object/read/media/peresource.py similarity index 98% rename from openage/convert/value_object/read/media/peresource.py rename to engine/convert/value_object/read/media/peresource.py index 2145d66981..3502928f2c 100644 --- a/openage/convert/value_object/read/media/peresource.py +++ b/engine/convert/value_object/read/media/peresource.py @@ -15,8 +15,8 @@ from .langcodes import LANGCODES_AOC if typing.TYPE_CHECKING: - from openage.convert.value_object.read.media.pefile import PEFile - from openage.util.fslike.wrapper import GuardedFile + from engine.convert.value_object.read.media.pefile import PEFile + from engine.util.fslike.wrapper import GuardedFile # types for id in resource directory root node diff --git a/openage/convert/value_object/read/media/sld.pyx b/engine/convert/value_object/read/media/sld.pyx similarity index 100% rename from openage/convert/value_object/read/media/sld.pyx rename to engine/convert/value_object/read/media/sld.pyx diff --git a/openage/convert/value_object/read/media/slp.pyx b/engine/convert/value_object/read/media/slp.pyx similarity index 100% rename from openage/convert/value_object/read/media/slp.pyx rename to engine/convert/value_object/read/media/slp.pyx diff --git a/openage/convert/value_object/read/media/smp.pyx b/engine/convert/value_object/read/media/smp.pyx similarity index 100% rename from openage/convert/value_object/read/media/smp.pyx rename to engine/convert/value_object/read/media/smp.pyx diff --git a/openage/convert/value_object/read/media/smx.pyx b/engine/convert/value_object/read/media/smx.pyx similarity index 100% rename from openage/convert/value_object/read/media/smx.pyx rename to engine/convert/value_object/read/media/smx.pyx diff --git a/openage/convert/value_object/read/media_types.py b/engine/convert/value_object/read/media_types.py similarity index 100% rename from openage/convert/value_object/read/media_types.py rename to engine/convert/value_object/read/media_types.py diff --git a/openage/convert/value_object/read/member_access.py b/engine/convert/value_object/read/member_access.py similarity index 100% rename from openage/convert/value_object/read/member_access.py rename to engine/convert/value_object/read/member_access.py diff --git a/openage/convert/value_object/read/read_members.py b/engine/convert/value_object/read/read_members.py similarity index 98% rename from openage/convert/value_object/read/read_members.py rename to engine/convert/value_object/read/read_members.py index 6e07e471b2..42c50557af 100644 --- a/openage/convert/value_object/read/read_members.py +++ b/engine/convert/value_object/read/read_members.py @@ -9,9 +9,9 @@ if typing.TYPE_CHECKING: - from openage.convert.value_object.read.genie_structure import GenieStructure - from openage.convert.value_object.read.member_access import MemberAccess - from openage.convert.value_object.read.value_members import StorageType + from engine.convert.value_object.read.genie_structure import GenieStructure + from engine.convert.value_object.read.member_access import MemberAccess + from engine.convert.value_object.read.value_members import StorageType class ReadMember: diff --git a/openage/convert/value_object/read/value_members.py b/engine/convert/value_object/read/value_members.py similarity index 100% rename from openage/convert/value_object/read/value_members.py rename to engine/convert/value_object/read/value_members.py diff --git a/openage/cppinterface/CMakeLists.txt b/engine/cppinterface/CMakeLists.txt similarity index 100% rename from openage/cppinterface/CMakeLists.txt rename to engine/cppinterface/CMakeLists.txt diff --git a/openage/cppinterface/__init__.py b/engine/cppinterface/__init__.py similarity index 100% rename from openage/cppinterface/__init__.py rename to engine/cppinterface/__init__.py diff --git a/openage/cppinterface/exctranslate.pyx b/engine/cppinterface/exctranslate.pyx similarity index 100% rename from openage/cppinterface/exctranslate.pyx rename to engine/cppinterface/exctranslate.pyx diff --git a/openage/cppinterface/exctranslate_tests.pyx b/engine/cppinterface/exctranslate_tests.pyx similarity index 100% rename from openage/cppinterface/exctranslate_tests.pyx rename to engine/cppinterface/exctranslate_tests.pyx diff --git a/openage/cppinterface/pyobject.pyx b/engine/cppinterface/pyobject.pyx similarity index 100% rename from openage/cppinterface/pyobject.pyx rename to engine/cppinterface/pyobject.pyx diff --git a/openage/cppinterface/setup.py b/engine/cppinterface/setup.py similarity index 100% rename from openage/cppinterface/setup.py rename to engine/cppinterface/setup.py diff --git a/openage/cppinterface/setup_checker.pyx b/engine/cppinterface/setup_checker.pyx similarity index 100% rename from openage/cppinterface/setup_checker.pyx rename to engine/cppinterface/setup_checker.pyx diff --git a/openage/cppinterface/typedefs.pxd b/engine/cppinterface/typedefs.pxd similarity index 100% rename from openage/cppinterface/typedefs.pxd rename to engine/cppinterface/typedefs.pxd diff --git a/openage/cvar/CMakeLists.txt b/engine/cvar/CMakeLists.txt similarity index 100% rename from openage/cvar/CMakeLists.txt rename to engine/cvar/CMakeLists.txt diff --git a/openage/cvar/__init__.py b/engine/cvar/__init__.py similarity index 100% rename from openage/cvar/__init__.py rename to engine/cvar/__init__.py diff --git a/openage/cvar/config_file.py b/engine/cvar/config_file.py similarity index 97% rename from openage/cvar/config_file.py rename to engine/cvar/config_file.py index ed17221f81..54cdf0e18a 100644 --- a/openage/cvar/config_file.py +++ b/engine/cvar/config_file.py @@ -11,7 +11,7 @@ if typing.TYPE_CHECKING: - from openage.util.fslike.path import Path + from engine.util.fslike.path import Path def load_config_file(path: Path, set_cvar_func: typing.Callable, loaded_files: set = None) -> None: diff --git a/openage/cvar/cvar.pyx b/engine/cvar/cvar.pyx similarity index 94% rename from openage/cvar/cvar.pyx rename to engine/cvar/cvar.pyx index 29e8742195..33db2023ce 100644 --- a/openage/cvar/cvar.pyx +++ b/engine/cvar/cvar.pyx @@ -10,7 +10,7 @@ from libopenage.cvar.cvar cimport ( pyx_load_config_file ) from libopenage.util.path cimport Path as Path -from openage.util.fslike.cpp cimport cpppath_to_pypath +from engine.util.fslike.cpp cimport cpppath_to_pypath from .config_file import load_config_file from .. import default_dirs diff --git a/openage/cvar/location.py b/engine/cvar/location.py similarity index 100% rename from openage/cvar/location.py rename to engine/cvar/location.py diff --git a/openage/cython_check.pyx b/engine/cython_check.pyx similarity index 100% rename from openage/cython_check.pyx rename to engine/cython_check.pyx diff --git a/openage/default_dirs.py b/engine/default_dirs.py similarity index 100% rename from openage/default_dirs.py rename to engine/default_dirs.py diff --git a/openage/devmode.py b/engine/devmode.py similarity index 100% rename from openage/devmode.py rename to engine/devmode.py diff --git a/openage/event/CMakeLists.txt b/engine/event/CMakeLists.txt similarity index 100% rename from openage/event/CMakeLists.txt rename to engine/event/CMakeLists.txt diff --git a/openage/event/__init__.py b/engine/event/__init__.py similarity index 100% rename from openage/event/__init__.py rename to engine/event/__init__.py diff --git a/openage/event/demo.pyx b/engine/event/demo.pyx similarity index 92% rename from openage/event/demo.pyx rename to engine/event/demo.pyx index 40649019f7..1e9562a079 100644 --- a/openage/event/demo.pyx +++ b/engine/event/demo.pyx @@ -7,9 +7,9 @@ demo for the event system. import argparse from libcpp cimport bool -import openage.config as config -from openage.util.math import clamp -from openage.log import set_loglevel +import engine.config as config +from engine.util.math import clamp +from engine.log import set_loglevel from libopenage.event.demo.main cimport curvepong as curvepong_c diff --git a/openage/game/CMakeLists.txt b/engine/game/CMakeLists.txt similarity index 100% rename from openage/game/CMakeLists.txt rename to engine/game/CMakeLists.txt diff --git a/openage/game/__init__.py b/engine/game/__init__.py similarity index 100% rename from openage/game/__init__.py rename to engine/game/__init__.py diff --git a/openage/game/main.py b/engine/game/main.py similarity index 100% rename from openage/game/main.py rename to engine/game/main.py diff --git a/openage/game/main_cpp.pyx b/engine/game/main_cpp.pyx similarity index 100% rename from openage/game/main_cpp.pyx rename to engine/game/main_cpp.pyx diff --git a/openage/log/CMakeLists.txt b/engine/log/CMakeLists.txt similarity index 100% rename from openage/log/CMakeLists.txt rename to engine/log/CMakeLists.txt diff --git a/openage/log/__init__.py b/engine/log/__init__.py similarity index 100% rename from openage/log/__init__.py rename to engine/log/__init__.py diff --git a/openage/log/log_cpp.pyx b/engine/log/log_cpp.pyx similarity index 100% rename from openage/log/log_cpp.pyx rename to engine/log/log_cpp.pyx diff --git a/openage/log/tests.py b/engine/log/tests.py similarity index 100% rename from openage/log/tests.py rename to engine/log/tests.py diff --git a/openage/main/CMakeLists.txt b/engine/main/CMakeLists.txt similarity index 100% rename from openage/main/CMakeLists.txt rename to engine/main/CMakeLists.txt diff --git a/openage/main/__init__.py b/engine/main/__init__.py similarity index 100% rename from openage/main/__init__.py rename to engine/main/__init__.py diff --git a/openage/main/main.py b/engine/main/main.py similarity index 100% rename from openage/main/main.py rename to engine/main/main.py diff --git a/openage/main/main_cpp.pyx b/engine/main/main_cpp.pyx similarity index 100% rename from openage/main/main_cpp.pyx rename to engine/main/main_cpp.pyx diff --git a/openage/main/tests.pyx b/engine/main/tests.pyx similarity index 100% rename from openage/main/tests.pyx rename to engine/main/tests.pyx diff --git a/openage/nyan/CMakeLists.txt b/engine/nyan/CMakeLists.txt similarity index 100% rename from openage/nyan/CMakeLists.txt rename to engine/nyan/CMakeLists.txt diff --git a/openage/nyan/__init__.py b/engine/nyan/__init__.py similarity index 100% rename from openage/nyan/__init__.py rename to engine/nyan/__init__.py diff --git a/openage/nyan/import_tree.py b/engine/nyan/import_tree.py similarity index 98% rename from openage/nyan/import_tree.py rename to engine/nyan/import_tree.py index 8a3880ff8d..eb009d1916 100644 --- a/openage/nyan/import_tree.py +++ b/engine/nyan/import_tree.py @@ -8,8 +8,8 @@ import typing if typing.TYPE_CHECKING: - from openage.convert.entity_object.export.formats.nyan_file import NyanFile - from openage.nyan.nyan_structs import NyanObject + from engine.convert.entity_object.export.formats.nyan_file import NyanFile + from engine.nyan.nyan_structs import NyanObject class NodeType(Enum): diff --git a/openage/nyan/nyan_structs.py b/engine/nyan/nyan_structs.py similarity index 99% rename from openage/nyan/nyan_structs.py rename to engine/nyan/nyan_structs.py index 07393ad4e8..1a16e45178 100644 --- a/openage/nyan/nyan_structs.py +++ b/engine/nyan/nyan_structs.py @@ -23,7 +23,7 @@ from ..util.ordered_set import OrderedSet if typing.TYPE_CHECKING: - from openage.nyan.import_tree import ImportTree + from engine.nyan.import_tree import ImportTree INDENT = " " diff --git a/openage/renderer/CMakeLists.txt b/engine/renderer/CMakeLists.txt similarity index 100% rename from openage/renderer/CMakeLists.txt rename to engine/renderer/CMakeLists.txt diff --git a/openage/renderer/__init__.py b/engine/renderer/__init__.py similarity index 100% rename from openage/renderer/__init__.py rename to engine/renderer/__init__.py diff --git a/openage/renderer/renderer_cpp.pyx b/engine/renderer/renderer_cpp.pyx similarity index 100% rename from openage/renderer/renderer_cpp.pyx rename to engine/renderer/renderer_cpp.pyx diff --git a/openage/renderer/tests.pyx b/engine/renderer/tests.pyx similarity index 100% rename from openage/renderer/tests.pyx rename to engine/renderer/tests.pyx diff --git a/openage/testing/CMakeLists.txt b/engine/testing/CMakeLists.txt similarity index 100% rename from openage/testing/CMakeLists.txt rename to engine/testing/CMakeLists.txt diff --git a/openage/testing/__init__.py b/engine/testing/__init__.py similarity index 100% rename from openage/testing/__init__.py rename to engine/testing/__init__.py diff --git a/openage/testing/benchmark.py b/engine/testing/benchmark.py similarity index 100% rename from openage/testing/benchmark.py rename to engine/testing/benchmark.py diff --git a/openage/testing/cpp_testing.pyx b/engine/testing/cpp_testing.pyx similarity index 100% rename from openage/testing/cpp_testing.pyx rename to engine/testing/cpp_testing.pyx diff --git a/openage/testing/doctest.py b/engine/testing/doctest.py similarity index 100% rename from openage/testing/doctest.py rename to engine/testing/doctest.py diff --git a/openage/testing/list_processor.py b/engine/testing/list_processor.py similarity index 98% rename from openage/testing/list_processor.py rename to engine/testing/list_processor.py index 28a43b50b9..3c13c8a578 100644 --- a/openage/testing/list_processor.py +++ b/engine/testing/list_processor.py @@ -94,7 +94,7 @@ def get_all_targets() -> OrderedDict: raise ValueError("no such function: " + name) from exc try: - name = lstrip_once(name, 'openage.') + name = lstrip_once(name, 'engine.') except ValueError as exc: raise ValueError("Unexpected Python test/demo name") from exc diff --git a/openage/testing/main.py b/engine/testing/main.py similarity index 99% rename from openage/testing/main.py rename to engine/testing/main.py index cbe9a41938..8880157826 100644 --- a/openage/testing/main.py +++ b/engine/testing/main.py @@ -72,7 +72,7 @@ def process_args(args: Namespace, error): error("can only run one of demo, benchmarks or tests") # link python and c++ so it hopefully works when testing - from openage.cppinterface.setup import setup + from engine.cppinterface.setup import setup setup(args) test_list = get_all_targets() diff --git a/openage/testing/misc_cpp.pyx b/engine/testing/misc_cpp.pyx similarity index 100% rename from openage/testing/misc_cpp.pyx rename to engine/testing/misc_cpp.pyx diff --git a/openage/testing/testing.py b/engine/testing/testing.py similarity index 100% rename from openage/testing/testing.py rename to engine/testing/testing.py diff --git a/openage/testing/testlist.py b/engine/testing/testlist.py similarity index 80% rename from openage/testing/testlist.py rename to engine/testing/testlist.py index 5ce6f11dbd..abd473c519 100644 --- a/openage/testing/testlist.py +++ b/engine/testing/testlist.py @@ -8,9 +8,9 @@ def doctest_modules(): Yields the names of all Python modules that shall be tested during doctest. """ - yield "openage.util.math" - yield "openage.util.strings" - yield "openage.util.system" + yield "engine.util.math" + yield "engine.util.strings" + yield "engine.util.system" def tests_py(): @@ -21,20 +21,20 @@ def tests_py(): If no description is required, just the name may be yielded. """ - yield ("openage.testing.doctest.test", + yield ("engine.testing.doctest.test", "doctest on all modules from DOCTEST_MODULES") - yield "openage.assets.test" - yield ("openage.cabextract.test.test", "test CAB archive extraction", + yield "engine.assets.test" + yield ("engine.cabextract.test.test", "test CAB archive extraction", lambda env: env["has_assets"]) - yield "openage.convert.service.init.changelog.test" - yield "openage.cppinterface.exctranslate_tests.cpp_to_py" - yield ("openage.cppinterface.exctranslate_tests.cpp_to_py_bounce", + yield "engine.convert.service.init.changelog.test" + yield "engine.cppinterface.exctranslate_tests.cpp_to_py" + yield ("engine.cppinterface.exctranslate_tests.cpp_to_py_bounce", "translates the exception back and forth a few times") - yield ("openage.testing.misc_cpp.enum", + yield ("engine.testing.misc_cpp.enum", "tests the interface for C++'s util::Enum class") - yield ("openage.util.fslike.test.test", + yield ("engine.util.fslike.test.test", "test the filesystem abstraction subsystem") - yield "openage.util.threading.test_concurrent_chain" + yield "engine.util.threading.test_concurrent_chain" def demos_py(): @@ -42,17 +42,17 @@ def demos_py(): Yields tuples of (name, description) for all Python demo methods. """ - yield ("openage.cppinterface.exctranslate_tests.cpp_to_py_demo", + yield ("engine.cppinterface.exctranslate_tests.cpp_to_py_demo", "translates a C++ exception and its causes to python") - yield ("openage.log.tests.demo", + yield ("engine.log.tests.demo", "demonstrates the translation of Python log messages") - yield ("openage.convert.service.export.opus.demo.convert", + yield ("engine.convert.service.export.opus.demo.convert", "encodes an opus file from a wave file") - yield ("openage.event.demo.curvepong", + yield ("engine.event.demo.curvepong", "play pong on steroids through future prediction") - yield ("openage.renderer.tests.renderer_demo", + yield ("engine.renderer.tests.renderer_demo", "showcases the new renderer") - yield ("openage.main.tests.engine_demo", + yield ("engine.main.tests.engine_demo", "showcases the engine features") @@ -63,7 +63,7 @@ def benchmark_py(): """ # TODO Add a real benchmark here, and remove this one - yield ("openage.testing.benchmark.benchmark_test_function", + yield ("engine.testing.benchmark.benchmark_test_function", "Benchmark yourself") diff --git a/openage/util/CMakeLists.txt b/engine/util/CMakeLists.txt similarity index 100% rename from openage/util/CMakeLists.txt rename to engine/util/CMakeLists.txt diff --git a/openage/util/__init__.py b/engine/util/__init__.py similarity index 100% rename from openage/util/__init__.py rename to engine/util/__init__.py diff --git a/openage/util/bytequeue.py b/engine/util/bytequeue.py similarity index 100% rename from openage/util/bytequeue.py rename to engine/util/bytequeue.py diff --git a/openage/util/context.py b/engine/util/context.py similarity index 100% rename from openage/util/context.py rename to engine/util/context.py diff --git a/openage/util/decorators.py b/engine/util/decorators.py similarity index 100% rename from openage/util/decorators.py rename to engine/util/decorators.py diff --git a/openage/util/filelike/CMakeLists.txt b/engine/util/filelike/CMakeLists.txt similarity index 100% rename from openage/util/filelike/CMakeLists.txt rename to engine/util/filelike/CMakeLists.txt diff --git a/openage/util/filelike/__init__.py b/engine/util/filelike/__init__.py similarity index 100% rename from openage/util/filelike/__init__.py rename to engine/util/filelike/__init__.py diff --git a/openage/util/filelike/abstract.py b/engine/util/filelike/abstract.py similarity index 100% rename from openage/util/filelike/abstract.py rename to engine/util/filelike/abstract.py diff --git a/openage/util/filelike/cpp.pyx b/engine/util/filelike/cpp.pyx similarity index 100% rename from openage/util/filelike/cpp.pyx rename to engine/util/filelike/cpp.pyx diff --git a/openage/util/filelike/fifo.py b/engine/util/filelike/fifo.py similarity index 100% rename from openage/util/filelike/fifo.py rename to engine/util/filelike/fifo.py diff --git a/openage/util/filelike/readonly.py b/engine/util/filelike/readonly.py similarity index 100% rename from openage/util/filelike/readonly.py rename to engine/util/filelike/readonly.py diff --git a/openage/util/filelike/stream.py b/engine/util/filelike/stream.py similarity index 100% rename from openage/util/filelike/stream.py rename to engine/util/filelike/stream.py diff --git a/openage/util/files.py b/engine/util/files.py similarity index 96% rename from openage/util/files.py rename to engine/util/files.py index 5387037d0c..d697a85657 100644 --- a/openage/util/files.py +++ b/engine/util/files.py @@ -10,7 +10,7 @@ from typing import Union if typing.TYPE_CHECKING: - from openage.util.fslike.abstract import FSLikeObject + from engine.util.fslike.abstract import FSLikeObject def read_guaranteed(fileobj: FSLikeObject, size: int) -> bytes: diff --git a/openage/util/fslike/CMakeLists.txt b/engine/util/fslike/CMakeLists.txt similarity index 100% rename from openage/util/fslike/CMakeLists.txt rename to engine/util/fslike/CMakeLists.txt diff --git a/openage/util/fslike/__init__.py b/engine/util/fslike/__init__.py similarity index 100% rename from openage/util/fslike/__init__.py rename to engine/util/fslike/__init__.py diff --git a/openage/util/fslike/abstract.py b/engine/util/fslike/abstract.py similarity index 100% rename from openage/util/fslike/abstract.py rename to engine/util/fslike/abstract.py diff --git a/openage/util/fslike/cpp.pxd b/engine/util/fslike/cpp.pxd similarity index 100% rename from openage/util/fslike/cpp.pxd rename to engine/util/fslike/cpp.pxd diff --git a/openage/util/fslike/cpp.pyx b/engine/util/fslike/cpp.pyx similarity index 100% rename from openage/util/fslike/cpp.pyx rename to engine/util/fslike/cpp.pyx diff --git a/openage/util/fslike/directory.py b/engine/util/fslike/directory.py similarity index 100% rename from openage/util/fslike/directory.py rename to engine/util/fslike/directory.py diff --git a/openage/util/fslike/filecollection.py b/engine/util/fslike/filecollection.py similarity index 100% rename from openage/util/fslike/filecollection.py rename to engine/util/fslike/filecollection.py diff --git a/openage/util/fslike/path.py b/engine/util/fslike/path.py similarity index 100% rename from openage/util/fslike/path.py rename to engine/util/fslike/path.py diff --git a/openage/util/fslike/test.py b/engine/util/fslike/test.py similarity index 99% rename from openage/util/fslike/test.py rename to engine/util/fslike/test.py index fc79d0af0e..bdaadc196a 100644 --- a/openage/util/fslike/test.py +++ b/engine/util/fslike/test.py @@ -8,7 +8,7 @@ from io import UnsupportedOperation from tempfile import gettempdir, NamedTemporaryFile -from openage.testing.testing import assert_value, assert_raises, result +from engine.testing.testing import assert_value, assert_raises, result from .directory import Directory, CaseIgnoringDirectory from .union import Union diff --git a/openage/util/fslike/union.py b/engine/util/fslike/union.py similarity index 100% rename from openage/util/fslike/union.py rename to engine/util/fslike/union.py diff --git a/openage/util/fslike/wrapper.py b/engine/util/fslike/wrapper.py similarity index 100% rename from openage/util/fslike/wrapper.py rename to engine/util/fslike/wrapper.py diff --git a/openage/util/fsprinting.py b/engine/util/fsprinting.py similarity index 98% rename from openage/util/fsprinting.py rename to engine/util/fsprinting.py index b4fbabf3c8..4d017d0e48 100644 --- a/openage/util/fsprinting.py +++ b/engine/util/fsprinting.py @@ -15,7 +15,7 @@ RULE_CACHE = OrderedDict() if typing.TYPE_CHECKING: - from openage.util.fslike.abstract import FSLikeObject + from engine.util.fslike.abstract import FSLikeObject def get_color_rules() -> OrderedDict[str, str]: diff --git a/openage/util/hash.py b/engine/util/hash.py similarity index 94% rename from openage/util/hash.py rename to engine/util/hash.py index eb1db746de..c332339fd3 100644 --- a/openage/util/hash.py +++ b/engine/util/hash.py @@ -9,7 +9,7 @@ import hashlib if typing.TYPE_CHECKING: - from openage.util.fslike.path import Path + from engine.util.fslike.path import Path def hash_file( diff --git a/openage/util/iterators.py b/engine/util/iterators.py similarity index 100% rename from openage/util/iterators.py rename to engine/util/iterators.py diff --git a/openage/util/math.py b/engine/util/math.py similarity index 100% rename from openage/util/math.py rename to engine/util/math.py diff --git a/openage/util/observer.py b/engine/util/observer.py similarity index 100% rename from openage/util/observer.py rename to engine/util/observer.py diff --git a/openage/util/ordered_set.py b/engine/util/ordered_set.py similarity index 100% rename from openage/util/ordered_set.py rename to engine/util/ordered_set.py diff --git a/openage/util/profiler.py b/engine/util/profiler.py similarity index 100% rename from openage/util/profiler.py rename to engine/util/profiler.py diff --git a/openage/util/strings.py b/engine/util/strings.py similarity index 100% rename from openage/util/strings.py rename to engine/util/strings.py diff --git a/openage/util/struct.py b/engine/util/struct.py similarity index 100% rename from openage/util/struct.py rename to engine/util/struct.py diff --git a/openage/util/system.py b/engine/util/system.py similarity index 100% rename from openage/util/system.py rename to engine/util/system.py diff --git a/openage/util/threading.py b/engine/util/threading.py similarity index 100% rename from openage/util/threading.py rename to engine/util/threading.py diff --git a/openage/versions/CMakeLists.txt b/engine/versions/CMakeLists.txt similarity index 100% rename from openage/versions/CMakeLists.txt rename to engine/versions/CMakeLists.txt diff --git a/openage/versions/__init__.py b/engine/versions/__init__.py similarity index 100% rename from openage/versions/__init__.py rename to engine/versions/__init__.py diff --git a/openage/versions/versions.pyx b/engine/versions/versions.pyx similarity index 100% rename from openage/versions/versions.pyx rename to engine/versions/versions.pyx diff --git a/etc/pylintrc b/etc/pylintrc index 717d1c0cbb..1ea5c527af 100644 --- a/etc/pylintrc +++ b/etc/pylintrc @@ -28,7 +28,7 @@ unsafe-load-any-extension=no # A comma-separated list of package or module names from where C extensions may # be loaded. Extensions are loading into the active Python interpreter and may # run arbitrary code -extension-pkg-whitelist=openage.convert.opus.opusenc +extension-pkg-whitelist=engine.convert.opus.opusenc [REPORTS] diff --git a/etc/valgrind-python.supp b/etc/valgrind-python.supp index c723f91da4..a827fc0493 100644 --- a/etc/valgrind-python.supp +++ b/etc/valgrind-python.supp @@ -7,7 +7,7 @@ # # Here's an example of running valgrind: # -# cd openage/bin/ +# cd engine/bin/ # PYTHONMALLOC=malloc valgrind --tool=memcheck --suppressions=../etc/valgrind-python.supp \ # python3 -m openage test -a # diff --git a/libopenage/CMakeLists.txt b/libopenage/CMakeLists.txt index f1772bfc36..1a8e44d49a 100644 --- a/libopenage/CMakeLists.txt +++ b/libopenage/CMakeLists.txt @@ -253,8 +253,8 @@ configure_file(version.h.in version.h) configure_file(version.cpp.in version.cpp) configure_file( - "${CMAKE_SOURCE_DIR}/openage/config.py.in" - "${CMAKE_BINARY_DIR}/openage/config.py" + "${CMAKE_SOURCE_DIR}/engine/config.py.in" + "${CMAKE_BINARY_DIR}/engine/config.py" ) ################################################## diff --git a/libopenage/pyinterface/exctranslate.h b/libopenage/pyinterface/exctranslate.h index 92124d3968..39ec739d73 100644 --- a/libopenage/pyinterface/exctranslate.h +++ b/libopenage/pyinterface/exctranslate.h @@ -90,7 +90,7 @@ OAAPI void init_exc_message(log::message *msg, const std::string &filename, unsi * - immediate back-conversion of raised Python CPPException objects * * Thus, we instead offer this setter function, to be called during - * openage.cppinterface.exctranslate.setup(). + * engine.cppinterface.exctranslate.setup(). * * @param raise_cpp_error: * diff --git a/libopenage/pyinterface/exctranslate_tests.cpp b/libopenage/pyinterface/exctranslate_tests.cpp index c5701dec0a..d6f2422c1b 100644 --- a/libopenage/pyinterface/exctranslate_tests.cpp +++ b/libopenage/pyinterface/exctranslate_tests.cpp @@ -53,7 +53,7 @@ void err_py_to_cpp() { } catch (PyException &exc) { // this is what we expected. // now let's see whether the object contains the expected data. - if (exc.type_name() != "openage.cppinterface.exctranslate_tests.Bar") { + if (exc.type_name() != "engine.cppinterface.exctranslate_tests.Bar") { return "unexpected exc typename: " + exc.type_name(); } @@ -67,7 +67,7 @@ void err_py_to_cpp() { return "exc had no cause"; } catch (PyException &cause) { - if (cause.type_name() != "openage.testing.testing.TestError") { + if (cause.type_name() != "engine.testing.testing.TestError") { return "unexpected cause typename: " + cause.type_name(); } diff --git a/libopenage/pyinterface/pyobject.h b/libopenage/pyinterface/pyobject.h index 0e90717e88..8be2a26d80 100644 --- a/libopenage/pyinterface/pyobject.h +++ b/libopenage/pyinterface/pyobject.h @@ -289,7 +289,7 @@ std::ostream &operator <<(std::ostream &os, const PyObjectRef &ref); // now follow the various Python callbacks that implement all of the above, -// and need to be installed by openage.cppinterface.pyobject.setup(). +// and need to be installed by engine.cppinterface.pyobject.setup(). // for use by the reference-counting constructors diff --git a/libopenage/pyinterface/setup.h b/libopenage/pyinterface/setup.h index 2aa387c8d9..f1d4f0863e 100644 --- a/libopenage/pyinterface/setup.h +++ b/libopenage/pyinterface/setup.h @@ -11,7 +11,7 @@ * properly initialized. * * A "Python interface component" is a global object that is supposed to - * be initialized externally by openage.cppinterface.setup.setup(). + * be initialized externally by engine.cppinterface.setup.setup(). * Examples include PyIfFunc and PyIfObjRef objects. */ diff --git a/libopenage/util/opengl.cpp b/libopenage/util/opengl.cpp index 1cc8b31ee3..8efa5d416c 100644 --- a/libopenage/util/opengl.cpp +++ b/libopenage/util/opengl.cpp @@ -66,7 +66,7 @@ void gl_check_error() { throw Error(MSG(err) << "OpenGL error state after running draw method: " << glerrorstate << "\n" "\t" << errormsg << "\n" - << "Run the game with --gl-debug to get more information: './run game --gl-debug'."); + << "Run the game with --gl-debug to get more information: './openage game --gl-debug'."); } } diff --git a/run.py.in b/openage.py.in similarity index 77% rename from run.py.in rename to openage.py.in index 20f05a9d95..ce4febc5d1 100755 --- a/run.py.in +++ b/openage.py.in @@ -6,8 +6,8 @@ Openage can, and should, be launched via python3 -m openage. However, for dynamic analysis using LLVM's sanitizer, a self-compiled executable is needed. -This file is Cythonized with an embedded interpreter, producing ./run, -which satisifies that requirement. +This file is Cythonized with an embedded interpreter, producing ./openage, +which satisfies that requirement. """ if __name__ == '__main__@SOME_UNDEFINED_VARIABLE_CMAKE_WILL_REMOVE@': @@ -16,8 +16,8 @@ if __name__ == '__main__@SOME_UNDEFINED_VARIABLE_CMAKE_WILL_REMOVE@': import sys sys.path.append(os.getcwd()) - from openage.__main__ import main + from engine.__main__ import main main() else: print("Running this in the source directory is not supported.", - "Please use `make run` or `bin/run.py` to start instead.") + "Please use `make openage` or `bin/openage.py` to start instead.") diff --git a/packaging/CPackOptions.cmake b/packaging/CPackOptions.cmake index c8360b2dd9..27fe1129d8 100644 --- a/packaging/CPackOptions.cmake +++ b/packaging/CPackOptions.cmake @@ -41,7 +41,7 @@ if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_NAME} v${CPACK_PACKAGE_VERSION}") set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} v${CPACK_PACKAGE_VERSION}") set(CPACK_NSIS_URL_INFO_ABOUT "https://github.com/SFTtech/openage") - set(CPACK_NSIS_HELP_LINK "https://github.com/SFTtech/openage/blob/master/doc/troubleshooting.md") + set(CPACK_NSIS_HELP_LINK "https://github.com/SFTtech/engine/blob/master/doc/troubleshooting.md") # TODO: create welcome page #set(CPACK_RESOURCE_FILE_WELCOME "")