From e265fb43d27ce29d8d2675b002c229ceb919d795 Mon Sep 17 00:00:00 2001 From: Vsevolod Kremianskii Date: Fri, 11 Jun 2021 00:39:34 +0700 Subject: [PATCH] Use precompiled headers to improve compilation time --- CMakeLists.txt | 14 ++++ src/engine/audio/files.h | 2 - src/engine/audio/format/mp3reader.h | 7 +- src/engine/audio/format/wavreader.cpp | 2 - src/engine/audio/player.cpp | 8 --- src/engine/audio/player.h | 14 ---- src/engine/audio/services.h | 4 -- src/engine/audio/soundhandle.h | 6 -- src/engine/audio/soundinstance.cpp | 5 -- src/engine/audio/soundinstance.h | 7 -- src/engine/audio/stream.cpp | 5 -- src/engine/common/cache.h | 7 -- src/engine/common/collectionutil.h | 5 -- src/engine/common/guardutil.h | 3 - src/engine/common/log.cpp | 5 -- src/engine/common/log.h | 5 -- src/engine/common/mediastream.h | 8 --- src/engine/common/pathutil.cpp | 3 - src/engine/common/pathutil.h | 2 - src/engine/common/random.cpp | 3 - src/engine/common/stopwatch.cpp | 2 - src/engine/common/stopwatch.h | 2 - src/engine/common/streamreader.cpp | 3 - src/engine/common/streamreader.h | 9 --- src/engine/common/streamutil.cpp | 2 - src/engine/common/streamwriter.cpp | 2 - src/engine/common/streamwriter.h | 9 --- src/engine/common/timer.cpp | 2 - src/engine/common/types.h | 2 - src/engine/engine.h | 3 - src/engine/game/action/action.h | 2 - src/engine/game/action/locationaction.h | 2 - src/engine/game/action/movetopoint.h | 2 - src/engine/game/action/objectaction.h | 3 - src/engine/game/action/waitaction.h | 2 - src/engine/game/actionexecutor.cpp | 4 -- src/engine/game/camera/animatedcamera.cpp | 4 -- src/engine/game/camera/animatedcamera.h | 2 - src/engine/game/camera/camera.h | 6 -- src/engine/game/camera/dialogcamera.cpp | 2 - src/engine/game/camera/dialogcamera.h | 2 - src/engine/game/camera/firstperson.cpp | 2 - src/engine/game/camera/staticcamera.cpp | 2 - src/engine/game/camera/thirdperson.cpp | 2 - src/engine/game/camera/thirdperson.h | 2 - src/engine/game/combat/combat.h | 6 -- src/engine/game/combat/combat_attack.cpp | 2 - src/engine/game/combat/combat_projectiles.cpp | 3 - src/engine/game/console.cpp | 7 -- src/engine/game/console.h | 11 --- src/engine/game/cursors.cpp | 2 - src/engine/game/cursors.h | 6 -- src/engine/game/d20/attributes.h | 4 -- src/engine/game/d20/attributes_classes.cpp | 2 - src/engine/game/d20/class.cpp | 4 -- src/engine/game/d20/class.h | 4 -- src/engine/game/d20/feat.h | 4 -- src/engine/game/d20/feats.cpp | 3 - src/engine/game/d20/feats.h | 4 -- src/engine/game/d20/skill.h | 3 - src/engine/game/d20/skills.h | 4 -- src/engine/game/d20/spell.h | 4 -- src/engine/game/d20/spells.h | 4 -- src/engine/game/dialog.cpp | 4 -- src/engine/game/dialog.h | 5 -- src/engine/game/enginetype/effect.h | 4 -- src/engine/game/enginetype/location.h | 2 - src/engine/game/footstepsounds.cpp | 2 - src/engine/game/footstepsounds.h | 3 - src/engine/game/game.cpp | 4 -- src/engine/game/game.h | 7 -- src/engine/game/game_save.cpp | 2 - src/engine/game/gameidutil.h | 2 - src/engine/game/gui/chargen/abilities.cpp | 6 -- src/engine/game/gui/chargen/chargen.cpp | 2 - src/engine/game/gui/chargen/custom.cpp | 2 - src/engine/game/gui/chargen/levelup.cpp | 2 - src/engine/game/gui/chargen/quick.cpp | 2 - src/engine/game/gui/chargen/skills.cpp | 4 -- src/engine/game/gui/colorutil.h | 2 - src/engine/game/gui/dialog.cpp | 7 -- src/engine/game/gui/gui.cpp | 2 - src/engine/game/gui/ingame/character.cpp | 2 - src/engine/game/gui/ingame/character.h | 3 +- src/engine/game/gui/ingame/equip.cpp | 3 - src/engine/game/gui/ingame/ingame.cpp | 2 - src/engine/game/gui/ingame/ingame.h | 1 - src/engine/game/gui/ingame/map.cpp | 2 - src/engine/game/gui/mainmenu.cpp | 2 - src/engine/game/gui/partyselect.cpp | 2 - src/engine/game/gui/profileoverlay.cpp | 7 -- src/engine/game/gui/profileoverlay.h | 6 -- src/engine/game/gui/saveload.cpp | 5 -- src/engine/game/gui/saveload.h | 2 - src/engine/game/gui/selectoverlay.cpp | 2 - src/engine/game/gui/selectoverlay.h | 9 --- src/engine/game/gui/sounds.h | 4 -- src/engine/game/map.cpp | 8 --- src/engine/game/map.h | 6 -- src/engine/game/object/area.cpp | 9 --- src/engine/game/object/area.h | 7 -- src/engine/game/object/area_are.cpp | 2 - src/engine/game/object/area_perception.cpp | 3 - src/engine/game/object/area_selection.cpp | 2 - src/engine/game/object/creature.cpp | 5 -- src/engine/game/object/creature.h | 4 -- .../game/object/creature_animations.cpp | 2 - .../game/object/creature_appearance.cpp | 3 - src/engine/game/object/creature_blueprint.cpp | 2 - src/engine/game/object/door.cpp | 2 - src/engine/game/object/door_blueprint.cpp | 2 - src/engine/game/object/encounter.cpp | 2 - .../game/object/encounter_blueprint.cpp | 2 - src/engine/game/object/item.cpp | 2 - src/engine/game/object/item.h | 2 - src/engine/game/object/item_blueprint.cpp | 3 - src/engine/game/object/module.h | 6 -- src/engine/game/object/object.cpp | 2 - src/engine/game/object/object.h | 8 --- src/engine/game/object/object_actions.cpp | 2 - src/engine/game/object/objectfactory.h | 6 -- src/engine/game/object/placeable.cpp | 2 - src/engine/game/object/placeable.h | 2 - .../game/object/placeable_blueprint.cpp | 2 - src/engine/game/object/placeablecamera.cpp | 2 - src/engine/game/object/sound.cpp | 4 -- src/engine/game/object/sound_blueprint.cpp | 2 - src/engine/game/object/spatial.h | 8 --- src/engine/game/object/trigger.cpp | 4 -- src/engine/game/object/trigger.h | 2 - src/engine/game/object/trigger_blueprint.cpp | 2 - src/engine/game/object/waypoint.cpp | 4 -- src/engine/game/object/waypoint_blueprint.cpp | 2 - src/engine/game/objectconverter.h | 2 - src/engine/game/options.h | 2 - src/engine/game/party.cpp | 2 - src/engine/game/party.h | 7 -- src/engine/game/path.h | 6 -- src/engine/game/pathfinder.cpp | 2 - src/engine/game/pathfinder.h | 11 --- src/engine/game/player.cpp | 2 - src/engine/game/player.h | 4 -- src/engine/game/portrait.h | 3 - src/engine/game/portraits.cpp | 2 - src/engine/game/portraits.h | 6 -- src/engine/game/reputes.cpp | 5 -- src/engine/game/reputes.h | 2 - src/engine/game/room.h | 5 -- src/engine/game/savedgame.h | 2 - src/engine/game/script/objectutil.h | 2 - src/engine/game/script/routines.h | 7 -- src/engine/game/script/routines_common.cpp | 3 - src/engine/game/script/routines_items.cpp | 2 - src/engine/game/script/routines_locations.cpp | 2 - src/engine/game/script/routines_math.cpp | 2 - src/engine/game/script/routines_objects.cpp | 2 - src/engine/game/script/routines_party.cpp | 3 - src/engine/game/script/routines_strings.cpp | 2 - src/engine/game/script/runner.cpp | 2 - src/engine/game/script/runner.h | 3 - src/engine/game/services.h | 4 -- src/engine/game/soundsets.cpp | 2 - src/engine/game/soundsets.h | 2 - src/engine/game/surface.h | 2 - src/engine/game/surfaces.cpp | 4 -- src/engine/game/surfaces.h | 7 -- src/engine/game/types.h | 3 - src/engine/graphics/aabb.cpp | 5 -- src/engine/graphics/aabb.h | 3 - src/engine/graphics/baryutil.h | 4 -- src/engine/graphics/beziercurve.h | 2 - src/engine/graphics/context.cpp | 3 - src/engine/graphics/context.h | 7 -- src/engine/graphics/cursor.cpp | 5 -- src/engine/graphics/cursor.h | 6 -- src/engine/graphics/eventhandler.h | 2 - src/engine/graphics/features.h | 4 -- src/engine/graphics/font.cpp | 5 -- src/engine/graphics/font.h | 6 -- src/engine/graphics/fonts.h | 2 - src/engine/graphics/framebuffer.cpp | 5 -- src/engine/graphics/framebuffer.h | 4 -- src/engine/graphics/lip/animation.cpp | 2 - src/engine/graphics/lip/animation.h | 3 - src/engine/graphics/lip/lips.cpp | 2 - src/engine/graphics/lip/lips.h | 2 - src/engine/graphics/lip/lipwriter.cpp | 2 - src/engine/graphics/lip/lipwriter.h | 4 -- src/engine/graphics/materials.cpp | 4 -- src/engine/graphics/materials.h | 6 -- src/engine/graphics/mesh/mesh.cpp | 8 --- src/engine/graphics/mesh/mesh.h | 5 -- src/engine/graphics/mesh/meshes.cpp | 2 - src/engine/graphics/mesh/meshes.h | 4 -- src/engine/graphics/mesh/vertexattributes.h | 2 - src/engine/graphics/model/animatedproperty.h | 6 -- src/engine/graphics/model/animation.cpp | 2 - src/engine/graphics/model/animation.h | 7 -- src/engine/graphics/model/mdlreader.cpp | 4 -- src/engine/graphics/model/mdlreader.h | 4 -- .../graphics/model/mdlreader_controllers.cpp | 5 -- src/engine/graphics/model/model.cpp | 2 - src/engine/graphics/model/model.h | 8 --- src/engine/graphics/model/modelnode.cpp | 2 - src/engine/graphics/model/modelnode.h | 7 -- src/engine/graphics/model/models.h | 6 -- src/engine/graphics/pbribl.cpp | 5 -- src/engine/graphics/pbribl.h | 7 -- src/engine/graphics/pixelutil.cpp | 6 -- src/engine/graphics/pixelutil.h | 2 - src/engine/graphics/renderbuffer.cpp | 3 - src/engine/graphics/renderbuffer.h | 4 -- src/engine/graphics/services.h | 4 -- src/engine/graphics/shader/shaders.cpp | 10 --- src/engine/graphics/shader/shaders.h | 11 --- src/engine/graphics/texture/texture.cpp | 6 -- src/engine/graphics/texture/texture.h | 7 -- src/engine/graphics/texture/textures.cpp | 2 - src/engine/graphics/texture/textures.h | 6 -- src/engine/graphics/texture/textureutil.cpp | 5 -- src/engine/graphics/texture/tgareader.cpp | 2 - src/engine/graphics/texture/tgareader.h | 2 - src/engine/graphics/texture/tgawriter.cpp | 4 -- src/engine/graphics/texture/tgawriter.h | 5 -- src/engine/graphics/texture/tpcreader.cpp | 2 - src/engine/graphics/texture/txireader.cpp | 4 -- src/engine/graphics/texture/txireader.h | 3 - src/engine/graphics/textutil.cpp | 4 -- src/engine/graphics/textutil.h | 3 - src/engine/graphics/walkmesh/bwmreader.cpp | 2 - src/engine/graphics/walkmesh/bwmreader.h | 2 - src/engine/graphics/walkmesh/walkmesh.h | 5 -- src/engine/graphics/walkmesh/walkmeshes.h | 7 -- src/engine/graphics/window.cpp | 7 -- src/engine/graphics/window.h | 7 -- src/engine/gui/control/control.cpp | 4 -- src/engine/gui/control/control.h | 9 --- src/engine/gui/control/listbox.h | 2 - src/engine/gui/gui.cpp | 2 - src/engine/gui/gui.h | 9 --- src/engine/gui/scenebuilder.cpp | 2 - src/engine/gui/scenebuilder.h | 7 -- src/engine/gui/textinput.h | 4 -- src/engine/main.cpp | 2 - src/engine/pch.h | 71 +++++++++++++++++++ src/engine/program.cpp | 4 -- src/engine/program.h | 2 - src/engine/resource/2da.h | 6 -- src/engine/resource/folder.h | 5 -- src/engine/resource/format/2dawriter.h | 4 -- src/engine/resource/format/binreader.h | 9 --- src/engine/resource/format/erfwriter.h | 5 -- src/engine/resource/format/gffwriter.h | 4 -- src/engine/resource/format/lytreader.h | 5 -- src/engine/resource/format/pereader.h | 3 - src/engine/resource/format/rimwriter.h | 5 -- src/engine/resource/format/tlkreader.h | 2 - src/engine/resource/format/tlkwriter.h | 6 -- src/engine/resource/format/visreader.h | 5 -- src/engine/resource/gffstruct.h | 9 --- src/engine/resource/keybifprovider.h | 2 - src/engine/resource/resourceprovider.h | 3 - src/engine/resource/resources.h | 9 --- src/engine/resource/services.h | 5 -- src/engine/resource/strings.h | 2 - src/engine/resource/talktable.h | 5 -- src/engine/resource/types.h | 5 -- src/engine/resource/typeutil.h | 2 - src/engine/scene/animeventlistener.h | 2 - src/engine/scene/node/cameranode.cpp | 2 - src/engine/scene/node/emitternode.cpp | 6 -- src/engine/scene/node/emitternode.h | 2 - src/engine/scene/node/grassnode.cpp | 2 - src/engine/scene/node/lightnode.cpp | 4 -- src/engine/scene/node/meshnode.cpp | 5 -- src/engine/scene/node/modelnode.cpp | 2 - src/engine/scene/node/modelnode.h | 5 -- src/engine/scene/node/modelnode_animation.cpp | 5 -- src/engine/scene/node/modelnodescenenode.cpp | 2 - src/engine/scene/node/scenenode.cpp | 4 -- src/engine/scene/node/scenenode.h | 9 --- src/engine/scene/pipeline/control.cpp | 4 -- src/engine/scene/pipeline/control.h | 5 -- src/engine/scene/pipeline/world.cpp | 6 -- src/engine/scene/pipeline/world.h | 4 -- src/engine/scene/scenegraph.cpp | 5 -- src/engine/scene/scenegraph.h | 9 --- src/engine/scene/services.h | 4 -- src/engine/script/enginetype.h | 2 - src/engine/script/execution.cpp | 5 -- src/engine/script/execution.h | 7 -- src/engine/script/instrutil.cpp | 4 -- src/engine/script/instrutil.h | 2 - src/engine/script/ncsreader.h | 3 - src/engine/script/program.cpp | 4 -- src/engine/script/program.h | 5 -- src/engine/script/routine.h | 3 - src/engine/script/scripts.h | 2 - src/engine/script/services.h | 4 -- src/engine/script/types.h | 4 -- src/engine/script/variable.cpp | 4 -- src/engine/script/variable.h | 5 -- src/engine/video/bikreader.cpp | 4 -- src/engine/video/bikreader.h | 2 - src/engine/video/video.cpp | 7 -- src/engine/video/video.h | 3 - src/launcher/frame.cpp | 5 -- src/launcher/frame.h | 2 - src/tests/gffwriter.cpp | 2 - src/tests/pathfinder.cpp | 4 -- src/tests/streamreader.cpp | 2 - src/tools/2datool.cpp | 1 - src/tools/audiotool.cpp | 2 - src/tools/erftool.cpp | 2 - src/tools/gfftool.cpp | 4 -- src/tools/keybiftool.cpp | 6 -- src/tools/main.cpp | 2 - src/tools/program.cpp | 5 -- src/tools/program.h | 5 -- src/tools/pthtool.cpp | 8 --- src/tools/rimtool.cpp | 2 - src/tools/tools.h | 2 - src/tools/tpctool.cpp | 2 - 323 files changed, 88 insertions(+), 1271 deletions(-) create mode 100644 src/engine/pch.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e6799b2..6ba8d5f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,7 @@ set(COMMON_SOURCES add_library(libcommon STATIC ${COMMON_HEADERS} ${COMMON_SOURCES}) set_target_properties(libcommon PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libcommon PRIVATE src/engine/pch.h) ## END libcommon static library @@ -154,6 +155,7 @@ set(RESOURCE_SOURCES add_library(libresource STATIC ${RESOURCE_HEADERS} ${RESOURCE_SOURCES}) set_target_properties(libresource PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libresource PRIVATE src/engine/pch.h) ## END libresource static library @@ -251,6 +253,7 @@ set(GRAPHICS_SOURCES add_library(libgraphics STATIC ${GRAPHICS_HEADERS} ${GRAPHICS_SOURCES}) set_target_properties(libgraphics PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libgraphics PRIVATE src/engine/pch.h) ## END libgraphics static library @@ -280,6 +283,7 @@ set(AUDIO_SOURCES add_library(libaudio STATIC ${AUDIO_HEADERS} ${AUDIO_SOURCES}) set_target_properties(libaudio PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libaudio PRIVATE src/engine/pch.h) ## END libaudio static library @@ -295,6 +299,7 @@ set(VIDEO_SOURCES add_library(libvideo STATIC ${VIDEO_HEADERS} ${VIDEO_SOURCES}) set_target_properties(libvideo PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libvideo PRIVATE src/engine/pch.h) ## END libvideo static library @@ -336,6 +341,7 @@ set(SCENE_SOURCES add_library(libscene STATIC ${SCENE_HEADERS} ${SCENE_SOURCES}) set_target_properties(libscene PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libscene PRIVATE src/engine/pch.h) ## END libscene static library @@ -374,6 +380,7 @@ set(GUI_SOURCES add_library(libgui STATIC ${GUI_HEADERS} ${GUI_SOURCES}) set_target_properties(libgui PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libgui PRIVATE src/engine/pch.h) ## END libgui static library @@ -403,6 +410,7 @@ set(SCRIPT_SOURCES add_library(libscript STATIC ${SCRIPT_HEADERS} ${SCRIPT_SOURCES}) set_target_properties(libscript PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libscript PRIVATE src/engine/pch.h) ## END libscript static library @@ -657,6 +665,7 @@ set(GAME_SOURCES add_library(libgame STATIC ${GAME_HEADERS} ${GAME_SOURCES}) set_target_properties(libgame PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +target_precompile_headers(libgame PRIVATE src/engine/pch.h) ## END libgame static library @@ -664,6 +673,7 @@ set_target_properties(libgame PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY set(REONE_HEADERS src/engine/engine.h + src/engine/pch.h src/engine/program.h) set(REONE_SOURCES @@ -677,6 +687,7 @@ endif() add_executable(reone ${REONE_HEADERS} ${REONE_SOURCES}) set_target_properties(reone PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +target_precompile_headers(reone PRIVATE src/engine/pch.h) target_link_libraries(reone PRIVATE libgame libscript libgui libscene libvideo libaudio libgraphics libresource libcommon @@ -721,6 +732,7 @@ if(BUILD_TOOLS) add_executable(reone-tools ${TOOLS_HEADERS} ${TOOLS_SOURCES}) set_target_properties(reone-tools PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + target_precompile_headers(reone-tools PRIVATE src/engine/pch.h) target_link_libraries(reone-tools PRIVATE libgraphics libresource libcommon @@ -762,6 +774,7 @@ if(BUILD_LAUNCHER) target_link_libraries(reone-launcher ${wxWidgets_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY}) set_target_properties(reone-launcher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + target_precompile_headers(reone-launcher PRIVATE src/engine/pch.h) list(APPEND InstallTargets reone-launcher) else() message(WARNING "wxWidgets not found - launcher cannot be built") @@ -788,6 +801,7 @@ if(BUILD_TESTS) endif() add_test(${TEST_NAME} test_${TEST_NAME}) + target_precompile_headers(test_${TEST_NAME} PRIVATE src/engine/pch.h) endforeach() endif() diff --git a/src/engine/audio/files.h b/src/engine/audio/files.h index bb8093b2..4ed8263b 100644 --- a/src/engine/audio/files.h +++ b/src/engine/audio/files.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../common/cache.h" #include "../resource/resources.h" diff --git a/src/engine/audio/format/mp3reader.h b/src/engine/audio/format/mp3reader.h index 7b609871..45309bd7 100644 --- a/src/engine/audio/format/mp3reader.h +++ b/src/engine/audio/format/mp3reader.h @@ -17,15 +17,10 @@ #pragma once -#include -#include - -#include +#include "../stream.h" #include "mad.h" -#include "../stream.h" - namespace reone { namespace audio { diff --git a/src/engine/audio/format/wavreader.cpp b/src/engine/audio/format/wavreader.cpp index 1f2f6f78..8e4bbcab 100644 --- a/src/engine/audio/format/wavreader.cpp +++ b/src/engine/audio/format/wavreader.cpp @@ -17,8 +17,6 @@ #include "wavreader.h" -#include - #include "../../common/streamutil.h" #include "mp3reader.h" diff --git a/src/engine/audio/player.cpp b/src/engine/audio/player.cpp index 7b4e0714..c8626a7b 100644 --- a/src/engine/audio/player.cpp +++ b/src/engine/audio/player.cpp @@ -17,14 +17,6 @@ #include "player.h" -#include -#include -#include - -#include "glm/gtx/norm.hpp" - -#include "AL/al.h" - #include "../common/log.h" #include "../common/guardutil.h" diff --git a/src/engine/audio/player.h b/src/engine/audio/player.h index 19b688fd..4049deea 100644 --- a/src/engine/audio/player.h +++ b/src/engine/audio/player.h @@ -17,20 +17,6 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "AL/alc.h" - -#include "glm/vec3.hpp" - #include "files.h" #include "options.h" #include "soundinstance.h" diff --git a/src/engine/audio/services.h b/src/engine/audio/services.h index d704a237..8ad6362c 100644 --- a/src/engine/audio/services.h +++ b/src/engine/audio/services.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../resource/services.h" #include "files.h" diff --git a/src/engine/audio/soundhandle.h b/src/engine/audio/soundhandle.h index d2b1396c..1a78b8db 100644 --- a/src/engine/audio/soundhandle.h +++ b/src/engine/audio/soundhandle.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include - -#include "glm/vec3.hpp" - namespace reone { namespace audio { diff --git a/src/engine/audio/soundinstance.cpp b/src/engine/audio/soundinstance.cpp index a937e756..acd508ba 100644 --- a/src/engine/audio/soundinstance.cpp +++ b/src/engine/audio/soundinstance.cpp @@ -17,11 +17,6 @@ #include "soundinstance.h" -#include -#include - -#include "AL/al.h" - #include "../common/log.h" #include "soundhandle.h" diff --git a/src/engine/audio/soundinstance.h b/src/engine/audio/soundinstance.h index ada18af3..ca0a9e61 100644 --- a/src/engine/audio/soundinstance.h +++ b/src/engine/audio/soundinstance.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include - -#include "glm/vec3.hpp" - #include "stream.h" namespace reone { diff --git a/src/engine/audio/stream.cpp b/src/engine/audio/stream.cpp index dd01200b..a1d9412b 100644 --- a/src/engine/audio/stream.cpp +++ b/src/engine/audio/stream.cpp @@ -17,11 +17,6 @@ #include "stream.h" -#include -#include - -#include "AL/al.h" - using namespace std; namespace reone { diff --git a/src/engine/common/cache.h b/src/engine/common/cache.h index 16ca60a2..0ad01abe 100644 --- a/src/engine/common/cache.h +++ b/src/engine/common/cache.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "guardutil.h" namespace reone { diff --git a/src/engine/common/collectionutil.h b/src/engine/common/collectionutil.h index ca22be47..8ddbaa45 100644 --- a/src/engine/common/collectionutil.h +++ b/src/engine/common/collectionutil.h @@ -17,11 +17,6 @@ #pragma once -#include -#include -#include -#include - namespace reone { template diff --git a/src/engine/common/guardutil.h b/src/engine/common/guardutil.h index 23768828..bca4d2dc 100644 --- a/src/engine/common/guardutil.h +++ b/src/engine/common/guardutil.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - namespace reone { template diff --git a/src/engine/common/log.cpp b/src/engine/common/log.cpp index cdd3ecae..6e643c06 100644 --- a/src/engine/common/log.cpp +++ b/src/engine/common/log.cpp @@ -17,11 +17,6 @@ #include "log.h" -#include -#include - -#include - namespace fs = boost::filesystem; using namespace std; diff --git a/src/engine/common/log.h b/src/engine/common/log.h index 8f59b823..c379f5e0 100644 --- a/src/engine/common/log.h +++ b/src/engine/common/log.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "types.h" namespace reone { diff --git a/src/engine/common/mediastream.h b/src/engine/common/mediastream.h index 070a3da0..2c35ff53 100644 --- a/src/engine/common/mediastream.h +++ b/src/engine/common/mediastream.h @@ -17,14 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include - namespace reone { template diff --git a/src/engine/common/pathutil.cpp b/src/engine/common/pathutil.cpp index f2779dcd..36a56bbd 100644 --- a/src/engine/common/pathutil.cpp +++ b/src/engine/common/pathutil.cpp @@ -17,9 +17,6 @@ #include "pathutil.h" -#include -#include - #include "log.h" using namespace std; diff --git a/src/engine/common/pathutil.h b/src/engine/common/pathutil.h index f87e9249..1d1b660e 100644 --- a/src/engine/common/pathutil.h +++ b/src/engine/common/pathutil.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { boost::filesystem::path getPathIgnoreCase(const boost::filesystem::path &basePath, const std::string &relPath, bool logNotFound = true); diff --git a/src/engine/common/random.cpp b/src/engine/common/random.cpp index b8659140..5e796fe4 100644 --- a/src/engine/common/random.cpp +++ b/src/engine/common/random.cpp @@ -17,9 +17,6 @@ #include "random.h" -#include -#include - using namespace std; namespace reone { diff --git a/src/engine/common/stopwatch.cpp b/src/engine/common/stopwatch.cpp index e587ee7b..bba58418 100644 --- a/src/engine/common/stopwatch.cpp +++ b/src/engine/common/stopwatch.cpp @@ -17,8 +17,6 @@ #include "stopwatch.h" -#include "SDL2/SDL_timer.h" - namespace reone { Stopwatch::Stopwatch() : diff --git a/src/engine/common/stopwatch.h b/src/engine/common/stopwatch.h index 81194015..a549e274 100644 --- a/src/engine/common/stopwatch.h +++ b/src/engine/common/stopwatch.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { /** diff --git a/src/engine/common/streamreader.cpp b/src/engine/common/streamreader.cpp index d55bcff4..08303047 100644 --- a/src/engine/common/streamreader.cpp +++ b/src/engine/common/streamreader.cpp @@ -17,9 +17,6 @@ #include "streamreader.h" -#include -#include - #include "guardutil.h" using namespace std; diff --git a/src/engine/common/streamreader.h b/src/engine/common/streamreader.h index 02b324fd..6d5f6744 100644 --- a/src/engine/common/streamreader.h +++ b/src/engine/common/streamreader.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include -#include - #include "types.h" namespace reone { diff --git a/src/engine/common/streamutil.cpp b/src/engine/common/streamutil.cpp index 2e89e2c9..56802d10 100644 --- a/src/engine/common/streamutil.cpp +++ b/src/engine/common/streamutil.cpp @@ -17,8 +17,6 @@ #include "streamutil.h" -#include - using namespace std; namespace io = boost::iostreams; diff --git a/src/engine/common/streamwriter.cpp b/src/engine/common/streamwriter.cpp index 24717e26..154d0fe8 100644 --- a/src/engine/common/streamwriter.cpp +++ b/src/engine/common/streamwriter.cpp @@ -17,8 +17,6 @@ #include "streamwriter.h" -#include - #include "guardutil.h" using namespace std; diff --git a/src/engine/common/streamwriter.h b/src/engine/common/streamwriter.h index cda558ee..07d57627 100644 --- a/src/engine/common/streamwriter.h +++ b/src/engine/common/streamwriter.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include -#include - #include "types.h" namespace reone { diff --git a/src/engine/common/timer.cpp b/src/engine/common/timer.cpp index 4cadac95..08727d40 100644 --- a/src/engine/common/timer.cpp +++ b/src/engine/common/timer.cpp @@ -17,8 +17,6 @@ #include "timer.h" -#include "glm/common.hpp" - namespace reone { Timer::Timer(float timeout) { diff --git a/src/engine/common/types.h b/src/engine/common/types.h index 1bff0e37..b4cec224 100644 --- a/src/engine/common/types.h +++ b/src/engine/common/types.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { struct DebugChannels { diff --git a/src/engine/engine.h b/src/engine/engine.h index 307bf503..661a8467 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "game/options.h" namespace reone { diff --git a/src/engine/game/action/action.h b/src/engine/game/action/action.h index 705af45f..ab844419 100644 --- a/src/engine/game/action/action.h +++ b/src/engine/game/action/action.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../types.h" namespace reone { diff --git a/src/engine/game/action/locationaction.h b/src/engine/game/action/locationaction.h index f661ba7d..8013e0fd 100644 --- a/src/engine/game/action/locationaction.h +++ b/src/engine/game/action/locationaction.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "action.h" namespace reone { diff --git a/src/engine/game/action/movetopoint.h b/src/engine/game/action/movetopoint.h index 4e24e9d6..5823706a 100644 --- a/src/engine/game/action/movetopoint.h +++ b/src/engine/game/action/movetopoint.h @@ -17,8 +17,6 @@ #pragma once -#include "glm/vec3.hpp" - #include "action.h" namespace reone { diff --git a/src/engine/game/action/objectaction.h b/src/engine/game/action/objectaction.h index 1ae1a578..c91c8130 100644 --- a/src/engine/game/action/objectaction.h +++ b/src/engine/game/action/objectaction.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../../common/guardutil.h" #include "action.h" diff --git a/src/engine/game/action/waitaction.h b/src/engine/game/action/waitaction.h index 514e1cef..e9a94080 100644 --- a/src/engine/game/action/waitaction.h +++ b/src/engine/game/action/waitaction.h @@ -17,8 +17,6 @@ #pragma once -#include "glm/common.hpp" - #include "../../common/timer.h" #include "action.h" diff --git a/src/engine/game/actionexecutor.cpp b/src/engine/game/actionexecutor.cpp index ce6f75e8..1e286c74 100644 --- a/src/engine/game/actionexecutor.cpp +++ b/src/engine/game/actionexecutor.cpp @@ -17,10 +17,6 @@ #include "actionexecutor.h" -#include - -#include "SDL2/SDL_timer.h" - #include "../common/log.h" #include "../common/guardutil.h" #include "../scene/types.h" diff --git a/src/engine/game/camera/animatedcamera.cpp b/src/engine/game/camera/animatedcamera.cpp index 60eefd51..13097d02 100644 --- a/src/engine/game/camera/animatedcamera.cpp +++ b/src/engine/game/camera/animatedcamera.cpp @@ -17,10 +17,6 @@ #include "animatedcamera.h" -#include - -#include - #include "../../graphics/types.h" #include "../../graphics/model/models.h" #include "../../resource/resources.h" diff --git a/src/engine/game/camera/animatedcamera.h b/src/engine/game/camera/animatedcamera.h index 8fa672d1..81935db7 100644 --- a/src/engine/game/camera/animatedcamera.h +++ b/src/engine/game/camera/animatedcamera.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../scene/node/modelnode.h" #include "../../scene/scenegraph.h" diff --git a/src/engine/game/camera/camera.h b/src/engine/game/camera/camera.h index db6d783f..e7d14e80 100644 --- a/src/engine/game/camera/camera.h +++ b/src/engine/game/camera/camera.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include "SDL2/SDL_events.h" - -#include "glm/vec3.hpp" - #include "../../scene/node/cameranode.h" namespace reone { diff --git a/src/engine/game/camera/dialogcamera.cpp b/src/engine/game/camera/dialogcamera.cpp index f829f97a..79fffdad 100644 --- a/src/engine/game/camera/dialogcamera.cpp +++ b/src/engine/game/camera/dialogcamera.cpp @@ -17,8 +17,6 @@ #include "dialogcamera.h" -#include "glm/ext.hpp" - using namespace std; using namespace reone::graphics; diff --git a/src/engine/game/camera/dialogcamera.h b/src/engine/game/camera/dialogcamera.h index 5ac0117e..785a2d81 100644 --- a/src/engine/game/camera/dialogcamera.h +++ b/src/engine/game/camera/dialogcamera.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../scene/scenegraph.h" #include "../types.h" diff --git a/src/engine/game/camera/firstperson.cpp b/src/engine/game/camera/firstperson.cpp index b92b6c52..254e53e9 100644 --- a/src/engine/game/camera/firstperson.cpp +++ b/src/engine/game/camera/firstperson.cpp @@ -17,8 +17,6 @@ #include "firstperson.h" -#include "glm/ext.hpp" - #include "../../graphics/types.h" using namespace std; diff --git a/src/engine/game/camera/staticcamera.cpp b/src/engine/game/camera/staticcamera.cpp index b3372ac7..a27c8009 100644 --- a/src/engine/game/camera/staticcamera.cpp +++ b/src/engine/game/camera/staticcamera.cpp @@ -17,8 +17,6 @@ #include "staticcamera.h" -#include "glm/ext.hpp" - #include "../object/placeablecamera.h" using namespace std; diff --git a/src/engine/game/camera/thirdperson.cpp b/src/engine/game/camera/thirdperson.cpp index 433f4d3a..d02002c7 100644 --- a/src/engine/game/camera/thirdperson.cpp +++ b/src/engine/game/camera/thirdperson.cpp @@ -17,8 +17,6 @@ #include "thirdperson.h" -#include "glm/ext.hpp" - #include "../game.h" using namespace std; diff --git a/src/engine/game/camera/thirdperson.h b/src/engine/game/camera/thirdperson.h index 7cc17fa8..5d1759df 100644 --- a/src/engine/game/camera/thirdperson.h +++ b/src/engine/game/camera/thirdperson.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../types.h" #include "camera.h" diff --git a/src/engine/game/combat/combat.h b/src/engine/game/combat/combat.h index 200710a1..29323750 100644 --- a/src/engine/game/combat/combat.h +++ b/src/engine/game/combat/combat.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - #include "../../common/timer.h" #include "../../scene/services.h" diff --git a/src/engine/game/combat/combat_attack.cpp b/src/engine/game/combat/combat_attack.cpp index 46ea1df0..c1cdc166 100644 --- a/src/engine/game/combat/combat_attack.cpp +++ b/src/engine/game/combat/combat_attack.cpp @@ -17,8 +17,6 @@ #include "combat.h" -#include - #include "../../common/log.h" #include "../../common/random.h" diff --git a/src/engine/game/combat/combat_projectiles.cpp b/src/engine/game/combat/combat_projectiles.cpp index 54f67bbc..78af3bba 100644 --- a/src/engine/game/combat/combat_projectiles.cpp +++ b/src/engine/game/combat/combat_projectiles.cpp @@ -21,9 +21,6 @@ #include "combat.h" -#include "glm/gtx/euler_angles.hpp" -#include "glm/gtx/transform.hpp" - using namespace std; using namespace reone::graphics; diff --git a/src/engine/game/console.cpp b/src/engine/game/console.cpp index cbe9acdf..ab1eb990 100644 --- a/src/engine/game/console.cpp +++ b/src/engine/game/console.cpp @@ -17,13 +17,6 @@ #include "console.h" -#include -#include - -#include - -#include "glm/ext.hpp" - #include "../common/log.h" #include "../graphics/font.h" #include "../graphics/fonts.h" diff --git a/src/engine/game/console.h b/src/engine/game/console.h index b95a79d6..742984a8 100644 --- a/src/engine/game/console.h +++ b/src/engine/game/console.h @@ -17,17 +17,6 @@ #pragma once -#include -#include -#include -#include -#include -#include - -#include - -#include "SDL2/SDL_events.h" - #include "../gui/textinput.h" #include "../graphics/font.h" #include "../graphics/options.h" diff --git a/src/engine/game/cursors.cpp b/src/engine/game/cursors.cpp index 2f9b666d..985c0120 100644 --- a/src/engine/game/cursors.cpp +++ b/src/engine/game/cursors.cpp @@ -17,8 +17,6 @@ #include "cursors.h" -#include - #include "../common/streamutil.h" #include "../graphics/texture/curreader.h" diff --git a/src/engine/game/cursors.h b/src/engine/game/cursors.h index 760e8c43..220ee005 100644 --- a/src/engine/game/cursors.h +++ b/src/engine/game/cursors.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../graphics/services.h" #include "../resource/services.h" diff --git a/src/engine/game/d20/attributes.h b/src/engine/game/d20/attributes.h index fcca7adb..cc39ce93 100644 --- a/src/engine/game/d20/attributes.h +++ b/src/engine/game/d20/attributes.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../types.h" #include "savingthrows.h" diff --git a/src/engine/game/d20/attributes_classes.cpp b/src/engine/game/d20/attributes_classes.cpp index d2c330d0..d233d36b 100644 --- a/src/engine/game/d20/attributes_classes.cpp +++ b/src/engine/game/d20/attributes_classes.cpp @@ -17,8 +17,6 @@ #include "attributes.h" -#include - #include "classes.h" using namespace std; diff --git a/src/engine/game/d20/class.cpp b/src/engine/game/d20/class.cpp index 513f9da3..2f66c983 100644 --- a/src/engine/game/d20/class.cpp +++ b/src/engine/game/d20/class.cpp @@ -17,10 +17,6 @@ #include "class.h" -#include - -#include - #include "classes.h" using namespace std; diff --git a/src/engine/game/d20/class.h b/src/engine/game/d20/class.h index c9c6b285..afdc5380 100644 --- a/src/engine/game/d20/class.h +++ b/src/engine/game/d20/class.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../../resource/format/2dareader.h" #include "../../resource/services.h" diff --git a/src/engine/game/d20/feat.h b/src/engine/game/d20/feat.h index 7cd5c313..47a09916 100644 --- a/src/engine/game/d20/feat.h +++ b/src/engine/game/d20/feat.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../../graphics/texture/texture.h" #include "../types.h" diff --git a/src/engine/game/d20/feats.cpp b/src/engine/game/d20/feats.cpp index d5965b72..8f5ba685 100644 --- a/src/engine/game/d20/feats.cpp +++ b/src/engine/game/d20/feats.cpp @@ -17,9 +17,6 @@ #include "feats.h" -#include -#include - #include "../../common/collectionutil.h" using namespace std; diff --git a/src/engine/game/d20/feats.h b/src/engine/game/d20/feats.h index 5a7dcb27..6b29c25f 100644 --- a/src/engine/game/d20/feats.h +++ b/src/engine/game/d20/feats.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../graphics/texture/textures.h" #include "../../resource/services.h" diff --git a/src/engine/game/d20/skill.h b/src/engine/game/d20/skill.h index 3d33381f..f0be4610 100644 --- a/src/engine/game/d20/skill.h +++ b/src/engine/game/d20/skill.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../../graphics/texture/texture.h" namespace reone { diff --git a/src/engine/game/d20/skills.h b/src/engine/game/d20/skills.h index f2b40ffe..4bb243bf 100644 --- a/src/engine/game/d20/skills.h +++ b/src/engine/game/d20/skills.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../graphics/services.h" #include "../../resource/services.h" diff --git a/src/engine/game/d20/spell.h b/src/engine/game/d20/spell.h index ce36648b..e6d72643 100644 --- a/src/engine/game/d20/spell.h +++ b/src/engine/game/d20/spell.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../../graphics/texture/texture.h" #include "../types.h" diff --git a/src/engine/game/d20/spells.h b/src/engine/game/d20/spells.h index 3bb96312..ee22f876 100644 --- a/src/engine/game/d20/spells.h +++ b/src/engine/game/d20/spells.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../graphics/texture/textures.h" #include "../../resource/services.h" diff --git a/src/engine/game/dialog.cpp b/src/engine/game/dialog.cpp index 710c8407..65e72d10 100644 --- a/src/engine/game/dialog.cpp +++ b/src/engine/game/dialog.cpp @@ -17,10 +17,6 @@ #include "dialog.h" -#include - -#include - #include "../common/guardutil.h" #include "../resource/strings.h" diff --git a/src/engine/game/dialog.h b/src/engine/game/dialog.h index 02dfd81a..5222ca9a 100644 --- a/src/engine/game/dialog.h +++ b/src/engine/game/dialog.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../resource/format/gffreader.h" #include "../resource/strings.h" diff --git a/src/engine/game/enginetype/effect.h b/src/engine/game/enginetype/effect.h index 48eece2a..6afc82fb 100644 --- a/src/engine/game/enginetype/effect.h +++ b/src/engine/game/enginetype/effect.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include "glm/common.hpp" - #include "../../script/enginetype.h" #include "../types.h" diff --git a/src/engine/game/enginetype/location.h b/src/engine/game/enginetype/location.h index cb90aae3..42df047b 100644 --- a/src/engine/game/enginetype/location.h +++ b/src/engine/game/enginetype/location.h @@ -17,8 +17,6 @@ #pragma once -#include "glm/vec3.hpp" - #include "../../script/enginetype.h" namespace reone { diff --git a/src/engine/game/footstepsounds.cpp b/src/engine/game/footstepsounds.cpp index e8c6a5cb..a13d0f24 100644 --- a/src/engine/game/footstepsounds.cpp +++ b/src/engine/game/footstepsounds.cpp @@ -17,8 +17,6 @@ #include "footstepsounds.h" -#include - #include "../common/guardutil.h" using namespace std; diff --git a/src/engine/game/footstepsounds.h b/src/engine/game/footstepsounds.h index c917e569..6361c35a 100644 --- a/src/engine/game/footstepsounds.h +++ b/src/engine/game/footstepsounds.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../audio/files.h" #include "../audio/stream.h" #include "../common/cache.h" diff --git a/src/engine/game/game.cpp b/src/engine/game/game.cpp index 8b9f34d6..1c91970a 100644 --- a/src/engine/game/game.cpp +++ b/src/engine/game/game.cpp @@ -17,10 +17,6 @@ #include "game.h" -#include - -#include "SDL2/SDL_timer.h" - #include "../common/log.h" #include "../common/pathutil.h" #include "../video/bikreader.h" diff --git a/src/engine/game/game.h b/src/engine/game/game.h index 43dd8e21..8cf59119 100644 --- a/src/engine/game/game.h +++ b/src/engine/game/game.h @@ -18,13 +18,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "../audio/services.h" #include "../graphics/eventhandler.h" #include "../graphics/services.h" diff --git a/src/engine/game/game_save.cpp b/src/engine/game/game_save.cpp index b29ba53b..16f032cb 100644 --- a/src/engine/game/game_save.cpp +++ b/src/engine/game/game_save.cpp @@ -21,8 +21,6 @@ #include "game.h" -#include - #include "../common/streamutil.h" #include "../graphics/texture/tgawriter.h" #include "../resource/format/erfreader.h" diff --git a/src/engine/game/gameidutil.h b/src/engine/game/gameidutil.h index 00e04d5d..93e68489 100644 --- a/src/engine/game/gameidutil.h +++ b/src/engine/game/gameidutil.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "types.h" namespace reone { diff --git a/src/engine/game/gui/chargen/abilities.cpp b/src/engine/game/gui/chargen/abilities.cpp index 45e4efd2..15e0c335 100644 --- a/src/engine/game/gui/chargen/abilities.cpp +++ b/src/engine/game/gui/chargen/abilities.cpp @@ -17,12 +17,6 @@ #include "abilities.h" -#include - -#include - -#include "glm/common.hpp" - #include "../../../gui/control/listbox.h" #include "../../../resource/strings.h" diff --git a/src/engine/game/gui/chargen/chargen.cpp b/src/engine/game/gui/chargen/chargen.cpp index 3cc6dc24..d75cab5a 100644 --- a/src/engine/game/gui/chargen/chargen.cpp +++ b/src/engine/game/gui/chargen/chargen.cpp @@ -17,8 +17,6 @@ #include "chargen.h" -#include - #include "../../../gui/scenebuilder.h" #include "../../../graphics/model/models.h" #include "../../../resource/resources.h" diff --git a/src/engine/game/gui/chargen/custom.cpp b/src/engine/game/gui/chargen/custom.cpp index 86dd8756..92af0d12 100644 --- a/src/engine/game/gui/chargen/custom.cpp +++ b/src/engine/game/gui/chargen/custom.cpp @@ -17,8 +17,6 @@ #include "custom.h" -#include - #include "../../game.h" #include "../colorutil.h" diff --git a/src/engine/game/gui/chargen/levelup.cpp b/src/engine/game/gui/chargen/levelup.cpp index dca61866..5dfec013 100644 --- a/src/engine/game/gui/chargen/levelup.cpp +++ b/src/engine/game/gui/chargen/levelup.cpp @@ -17,8 +17,6 @@ #include "levelup.h" -#include - #include "../../game.h" #include "../colorutil.h" diff --git a/src/engine/game/gui/chargen/quick.cpp b/src/engine/game/gui/chargen/quick.cpp index e7ac745d..2a63bf20 100644 --- a/src/engine/game/gui/chargen/quick.cpp +++ b/src/engine/game/gui/chargen/quick.cpp @@ -17,8 +17,6 @@ #include "quick.h" -#include - #include "../../game.h" #include "../colorutil.h" diff --git a/src/engine/game/gui/chargen/skills.cpp b/src/engine/game/gui/chargen/skills.cpp index 251919cf..a49a177c 100644 --- a/src/engine/game/gui/chargen/skills.cpp +++ b/src/engine/game/gui/chargen/skills.cpp @@ -17,10 +17,6 @@ #include "skills.h" -#include - -#include - #include "../../../gui/control/listbox.h" #include "../../../resource/strings.h" diff --git a/src/engine/game/gui/colorutil.h b/src/engine/game/gui/colorutil.h index de792a11..65a2438e 100644 --- a/src/engine/game/gui/colorutil.h +++ b/src/engine/game/gui/colorutil.h @@ -17,8 +17,6 @@ #pragma once -#include "glm/vec3.hpp" - #include "../types.h" namespace reone { diff --git a/src/engine/game/gui/dialog.cpp b/src/engine/game/gui/dialog.cpp index ec3ad7a0..86da856c 100644 --- a/src/engine/game/gui/dialog.cpp +++ b/src/engine/game/gui/dialog.cpp @@ -17,13 +17,6 @@ #include "dialog.h" -#include - -#include -#include - -#include "SDL2/SDL_timer.h" - #include "../../audio/files.h" #include "../../audio/player.h" #include "../../audio/soundhandle.h" diff --git a/src/engine/game/gui/gui.cpp b/src/engine/game/gui/gui.cpp index b0521370..23be0343 100644 --- a/src/engine/game/gui/gui.cpp +++ b/src/engine/game/gui/gui.cpp @@ -17,8 +17,6 @@ #include "gui.h" -#include - #include "../../audio/player.h" #include "../../graphics/texture/textures.h" diff --git a/src/engine/game/gui/ingame/character.cpp b/src/engine/game/gui/ingame/character.cpp index 1b8e68d6..577a3331 100644 --- a/src/engine/game/gui/ingame/character.cpp +++ b/src/engine/game/gui/ingame/character.cpp @@ -17,8 +17,6 @@ #include "character.h" -#include - #include "../../../graphics/model/models.h" #include "../../../gui/scenebuilder.h" diff --git a/src/engine/game/gui/ingame/character.h b/src/engine/game/gui/ingame/character.h index 8e1b1f96..4211f391 100644 --- a/src/engine/game/gui/ingame/character.h +++ b/src/engine/game/gui/ingame/character.h @@ -17,13 +17,14 @@ #pragma once -#include "../gui.h" #include "../../../gui/control/button.h" #include "../../../gui/control/label.h" #include "../../../gui/control/listbox.h" #include "../../../gui/control/slider.h" #include "../../../scene/node/modelnode.h" +#include "../gui.h" + namespace reone { namespace game { diff --git a/src/engine/game/gui/ingame/equip.cpp b/src/engine/game/gui/ingame/equip.cpp index c1f369c8..e727f575 100644 --- a/src/engine/game/gui/ingame/equip.cpp +++ b/src/engine/game/gui/ingame/equip.cpp @@ -17,9 +17,6 @@ #include "equip.h" -#include -#include - #include "../../../graphics/texture/textures.h" #include "../../../resource/strings.h" diff --git a/src/engine/game/gui/ingame/ingame.cpp b/src/engine/game/gui/ingame/ingame.cpp index 4e43ab3a..c58350d6 100644 --- a/src/engine/game/gui/ingame/ingame.cpp +++ b/src/engine/game/gui/ingame/ingame.cpp @@ -17,8 +17,6 @@ #include "ingame.h" -#include - #include "../../game.h" #include "../../gameidutil.h" diff --git a/src/engine/game/gui/ingame/ingame.h b/src/engine/game/gui/ingame/ingame.h index 30ffe14f..4be01965 100644 --- a/src/engine/game/gui/ingame/ingame.h +++ b/src/engine/game/gui/ingame/ingame.h @@ -27,7 +27,6 @@ #include "map.h" #include "messages.h" #include "options.h" -#include namespace reone { diff --git a/src/engine/game/gui/ingame/map.cpp b/src/engine/game/gui/ingame/map.cpp index 30c7936f..547fdad6 100644 --- a/src/engine/game/gui/ingame/map.cpp +++ b/src/engine/game/gui/ingame/map.cpp @@ -17,8 +17,6 @@ #include "map.h" -#include - #include "../../../resource/strings.h" #include "../../game.h" diff --git a/src/engine/game/gui/mainmenu.cpp b/src/engine/game/gui/mainmenu.cpp index 8e877e5a..fdb1a7a1 100644 --- a/src/engine/game/gui/mainmenu.cpp +++ b/src/engine/game/gui/mainmenu.cpp @@ -17,8 +17,6 @@ #include "mainmenu.h" -#include "glm/glm.hpp" - #include "../../audio/player.h" #include "../../common/log.h" #include "../../gui/control/listbox.h" diff --git a/src/engine/game/gui/partyselect.cpp b/src/engine/game/gui/partyselect.cpp index 06dd2213..7270a9c9 100644 --- a/src/engine/game/gui/partyselect.cpp +++ b/src/engine/game/gui/partyselect.cpp @@ -17,8 +17,6 @@ #include "partyselect.h" -#include - #include "../../gui/control/label.h" #include "../../gui/control/togglebutton.h" #include "../../graphics/texture/textures.h" diff --git a/src/engine/game/gui/profileoverlay.cpp b/src/engine/game/gui/profileoverlay.cpp index b948d976..528aa804 100644 --- a/src/engine/game/gui/profileoverlay.cpp +++ b/src/engine/game/gui/profileoverlay.cpp @@ -17,13 +17,6 @@ #include "profileoverlay.h" -#include -#include - -#include "SDL2/SDL_timer.h" - -#include "glm/ext.hpp" - #include "../../common/guardutil.h" #include "../../graphics/fonts.h" #include "../../graphics/mesh/meshes.h" diff --git a/src/engine/game/gui/profileoverlay.h b/src/engine/game/gui/profileoverlay.h index c76baf51..a3572f23 100644 --- a/src/engine/game/gui/profileoverlay.h +++ b/src/engine/game/gui/profileoverlay.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include "SDL2/SDL_events.h" - #include "../../common/timer.h" #include "../../graphics/font.h" #include "../../graphics/services.h" diff --git a/src/engine/game/gui/saveload.cpp b/src/engine/game/gui/saveload.cpp index 58ba746d..4b5ab332 100644 --- a/src/engine/game/gui/saveload.cpp +++ b/src/engine/game/gui/saveload.cpp @@ -17,11 +17,6 @@ #include "saveload.h" -#include - -#include -#include - #include "../../common/log.h" #include "../../common/streamutil.h" #include "../../graphics/texture/tgareader.h" diff --git a/src/engine/game/gui/saveload.h b/src/engine/game/gui/saveload.h index 25733b0a..2a61afee 100644 --- a/src/engine/game/gui/saveload.h +++ b/src/engine/game/gui/saveload.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../savedgame.h" #include "gui.h" diff --git a/src/engine/game/gui/selectoverlay.cpp b/src/engine/game/gui/selectoverlay.cpp index 64dcfe2d..3819bd05 100644 --- a/src/engine/game/gui/selectoverlay.cpp +++ b/src/engine/game/gui/selectoverlay.cpp @@ -17,8 +17,6 @@ #include "selectoverlay.h" -#include - #include "../../common/guardutil.h" #include "../../graphics/context.h" #include "../../graphics/font.h" diff --git a/src/engine/game/gui/selectoverlay.h b/src/engine/game/gui/selectoverlay.h index f13eb7a9..dff02c2d 100644 --- a/src/engine/game/gui/selectoverlay.h +++ b/src/engine/game/gui/selectoverlay.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include - -#include "SDL2/SDL_events.h" - -#include "glm/mat4x4.hpp" -#include "glm/vec3.hpp" - #include "../../graphics/font.h" #include "../../graphics/texture/texture.h" diff --git a/src/engine/game/gui/sounds.h b/src/engine/game/gui/sounds.h index 9b6485da..d6acc21f 100644 --- a/src/engine/game/gui/sounds.h +++ b/src/engine/game/gui/sounds.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../audio/files.h" #include "../../audio/stream.h" #include "../../resource/2da.h" diff --git a/src/engine/game/map.cpp b/src/engine/game/map.cpp index c8d943f6..1be98c74 100644 --- a/src/engine/game/map.cpp +++ b/src/engine/game/map.cpp @@ -17,14 +17,6 @@ #include "map.h" -#include - -#include "glm/mat4x4.hpp" - -#include "GL/glew.h" - -#include "SDL2/SDL_opengl.h" - #include "../common/log.h" #include "../common/guardutil.h" #include "../graphics/context.h" diff --git a/src/engine/game/map.h b/src/engine/game/map.h index aa6431ff..577e0d00 100644 --- a/src/engine/game/map.h +++ b/src/engine/game/map.h @@ -17,12 +17,6 @@ #pragma once -#include -#include - -#include "glm/vec2.hpp" -#include "glm/vec4.hpp" - #include "../graphics/texture/texture.h" #include "../resource/format/gffreader.h" diff --git a/src/engine/game/object/area.cpp b/src/engine/game/object/area.cpp index d1336e30..b31815d1 100644 --- a/src/engine/game/object/area.cpp +++ b/src/engine/game/object/area.cpp @@ -17,15 +17,6 @@ #include "area.h" -#include -#include -#include - -#include -#include - -#include "glm/gtx/norm.hpp" - #include "../../common/guardutil.h" #include "../../common/log.h" #include "../../common/random.h" diff --git a/src/engine/game/object/area.h b/src/engine/game/object/area.h index 1f7f247a..31fd71df 100644 --- a/src/engine/game/object/area.h +++ b/src/engine/game/object/area.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include "glm/vec3.hpp" - -#include "SDL2/SDL_events.h" - #include "../../common/timer.h" #include "../../graphics/types.h" #include "../../resource/format/gffreader.h" diff --git a/src/engine/game/object/area_are.cpp b/src/engine/game/object/area_are.cpp index 97f41143..33585f04 100644 --- a/src/engine/game/object/area_are.cpp +++ b/src/engine/game/object/area_are.cpp @@ -21,8 +21,6 @@ #include "area.h" -#include - #include "../../graphics/texture/textures.h" #include "../../resource/resources.h" #include "../../resource/strings.h" diff --git a/src/engine/game/object/area_perception.cpp b/src/engine/game/object/area_perception.cpp index 956b992e..33a15602 100644 --- a/src/engine/game/object/area_perception.cpp +++ b/src/engine/game/object/area_perception.cpp @@ -17,9 +17,6 @@ #include "area.h" -#include -#include - #include "../../common/log.h" using namespace std; diff --git a/src/engine/game/object/area_selection.cpp b/src/engine/game/object/area_selection.cpp index d94efb2f..5fbab85f 100644 --- a/src/engine/game/object/area_selection.cpp +++ b/src/engine/game/object/area_selection.cpp @@ -17,8 +17,6 @@ #include "area.h" -#include "glm/vec3.hpp" - #include "../game.h" using namespace std; diff --git a/src/engine/game/object/creature.cpp b/src/engine/game/object/creature.cpp index 44fb008e..ad10b8c0 100644 --- a/src/engine/game/object/creature.cpp +++ b/src/engine/game/object/creature.cpp @@ -17,11 +17,6 @@ #include "creature.h" -#include -#include - -#include - #include "../../audio/player.h" #include "../../common/log.h" #include "../../common/random.h" diff --git a/src/engine/game/object/creature.h b/src/engine/game/object/creature.h index 7f34a57e..0d6531e7 100644 --- a/src/engine/game/object/creature.h +++ b/src/engine/game/object/creature.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../../audio/stream.h" #include "../../common/timer.h" #include "../../graphics/lip/animation.h" diff --git a/src/engine/game/object/creature_animations.cpp b/src/engine/game/object/creature_animations.cpp index 52af5263..c9fa834c 100644 --- a/src/engine/game/object/creature_animations.cpp +++ b/src/engine/game/object/creature_animations.cpp @@ -21,8 +21,6 @@ #include "creature.h" -#include - #include "../../common/log.h" using namespace std; diff --git a/src/engine/game/object/creature_appearance.cpp b/src/engine/game/object/creature_appearance.cpp index 63aba312..a74a3afa 100644 --- a/src/engine/game/object/creature_appearance.cpp +++ b/src/engine/game/object/creature_appearance.cpp @@ -21,9 +21,6 @@ #include "creature.h" -#include -#include - #include "../../common/streamutil.h" #include "../../graphics/model/models.h" #include "../../graphics/texture/textures.h" diff --git a/src/engine/game/object/creature_blueprint.cpp b/src/engine/game/object/creature_blueprint.cpp index a863d4ec..1aec8704 100644 --- a/src/engine/game/object/creature_blueprint.cpp +++ b/src/engine/game/object/creature_blueprint.cpp @@ -21,8 +21,6 @@ #include "creature.h" -#include - #include "../../graphics/texture/textures.h" #include "../../resource/resources.h" #include "../../resource/strings.h" diff --git a/src/engine/game/object/door.cpp b/src/engine/game/object/door.cpp index a34a61e3..d023ae7e 100644 --- a/src/engine/game/object/door.cpp +++ b/src/engine/game/object/door.cpp @@ -17,8 +17,6 @@ #include "door.h" -#include - #include "../../common/streamutil.h" #include "../../graphics/model/models.h" #include "../../graphics/walkmesh/walkmeshes.h" diff --git a/src/engine/game/object/door_blueprint.cpp b/src/engine/game/object/door_blueprint.cpp index ea1e3942..89bb233b 100644 --- a/src/engine/game/object/door_blueprint.cpp +++ b/src/engine/game/object/door_blueprint.cpp @@ -21,8 +21,6 @@ #include "door.h" -#include - #include "../../resource/strings.h" #include "../game.h" diff --git a/src/engine/game/object/encounter.cpp b/src/engine/game/object/encounter.cpp index 1480e3fb..9be9771c 100644 --- a/src/engine/game/object/encounter.cpp +++ b/src/engine/game/object/encounter.cpp @@ -17,8 +17,6 @@ #include "encounter.h" -#include - #include "../../resource/resources.h" #include "../game.h" diff --git a/src/engine/game/object/encounter_blueprint.cpp b/src/engine/game/object/encounter_blueprint.cpp index 3e57caad..7ed2bd7e 100644 --- a/src/engine/game/object/encounter_blueprint.cpp +++ b/src/engine/game/object/encounter_blueprint.cpp @@ -21,8 +21,6 @@ #include "encounter.h" -#include - #include "../../resource/strings.h" #include "../game.h" diff --git a/src/engine/game/object/item.cpp b/src/engine/game/object/item.cpp index 7dbce242..e90d6866 100644 --- a/src/engine/game/object/item.cpp +++ b/src/engine/game/object/item.cpp @@ -17,8 +17,6 @@ #include "item.h" -#include - #include "../../audio/player.h" #include "../../resource/resources.h" diff --git a/src/engine/game/object/item.h b/src/engine/game/object/item.h index fbda912f..6add8f39 100644 --- a/src/engine/game/object/item.h +++ b/src/engine/game/object/item.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../audio/stream.h" #include "../../graphics/model/model.h" #include "../../graphics/texture/texture.h" diff --git a/src/engine/game/object/item_blueprint.cpp b/src/engine/game/object/item_blueprint.cpp index 12aa3672..0f477b45 100644 --- a/src/engine/game/object/item_blueprint.cpp +++ b/src/engine/game/object/item_blueprint.cpp @@ -21,9 +21,6 @@ #include "item.h" -#include -#include - #include "../../audio/files.h" #include "../../graphics/model/models.h" #include "../../graphics/texture/textures.h" diff --git a/src/engine/game/object/module.h b/src/engine/game/object/module.h index b4c902f7..50f9ae87 100644 --- a/src/engine/game/object/module.h +++ b/src/engine/game/object/module.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include "glm/vec3.hpp" - -#include "SDL2/SDL_events.h" - #include "../../graphics/types.h" #include "../../resource/format/gffreader.h" #include "../../resource/types.h" diff --git a/src/engine/game/object/object.cpp b/src/engine/game/object/object.cpp index f9a26fae..825da016 100644 --- a/src/engine/game/object/object.cpp +++ b/src/engine/game/object/object.cpp @@ -17,8 +17,6 @@ #include "object.h" -#include - #include "../../common/collectionutil.h" #include "../../common/guardutil.h" diff --git a/src/engine/game/object/object.h b/src/engine/game/object/object.h index c1238e0d..e2b31931 100644 --- a/src/engine/game/object/object.h +++ b/src/engine/game/object/object.h @@ -17,14 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include - #include "../../common/timer.h" #include "../action/action.h" diff --git a/src/engine/game/object/object_actions.cpp b/src/engine/game/object/object_actions.cpp index 5940151a..41cc697e 100644 --- a/src/engine/game/object/object_actions.cpp +++ b/src/engine/game/object/object_actions.cpp @@ -17,8 +17,6 @@ #include "object.h" -#include - using namespace std; namespace reone { diff --git a/src/engine/game/object/objectfactory.h b/src/engine/game/object/objectfactory.h index adbbf1e8..8dff753c 100644 --- a/src/engine/game/object/objectfactory.h +++ b/src/engine/game/object/objectfactory.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../../scene/scenegraph.h" #include "../../graphics/types.h" #include "../../resource/types.h" diff --git a/src/engine/game/object/placeable.cpp b/src/engine/game/object/placeable.cpp index 8ba6e9e0..af4305cb 100644 --- a/src/engine/game/object/placeable.cpp +++ b/src/engine/game/object/placeable.cpp @@ -17,8 +17,6 @@ #include "placeable.h" -#include - #include "../../graphics/model/models.h" #include "../../graphics/walkmesh/walkmeshes.h" #include "../../resource/resources.h" diff --git a/src/engine/game/object/placeable.h b/src/engine/game/object/placeable.h index 84164264..7156e222 100644 --- a/src/engine/game/object/placeable.h +++ b/src/engine/game/object/placeable.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../resource/format/gffreader.h" #include "spatial.h" diff --git a/src/engine/game/object/placeable_blueprint.cpp b/src/engine/game/object/placeable_blueprint.cpp index 7b60008e..9ee4063b 100644 --- a/src/engine/game/object/placeable_blueprint.cpp +++ b/src/engine/game/object/placeable_blueprint.cpp @@ -21,8 +21,6 @@ #include "placeable.h" -#include - #include "../../resource/strings.h" #include "../game.h" diff --git a/src/engine/game/object/placeablecamera.cpp b/src/engine/game/object/placeablecamera.cpp index 673cb1af..92074f5a 100644 --- a/src/engine/game/object/placeablecamera.cpp +++ b/src/engine/game/object/placeablecamera.cpp @@ -17,8 +17,6 @@ #include "placeablecamera.h" -#include "glm/gtx/euler_angles.hpp" - using namespace std; using namespace reone::resource; diff --git a/src/engine/game/object/sound.cpp b/src/engine/game/object/sound.cpp index 12905187..d81106d5 100644 --- a/src/engine/game/object/sound.cpp +++ b/src/engine/game/object/sound.cpp @@ -17,10 +17,6 @@ #include "sound.h" -#include - -#include "glm/glm.hpp" - #include "../../audio/files.h" #include "../../audio/player.h" #include "../../resource/resources.h" diff --git a/src/engine/game/object/sound_blueprint.cpp b/src/engine/game/object/sound_blueprint.cpp index ffab14e3..f5df331d 100644 --- a/src/engine/game/object/sound_blueprint.cpp +++ b/src/engine/game/object/sound_blueprint.cpp @@ -21,8 +21,6 @@ #include "sound.h" -#include - #include "../../resource/resources.h" #include "../../resource/strings.h" diff --git a/src/engine/game/object/spatial.h b/src/engine/game/object/spatial.h index 62c0d493..1847a8c5 100644 --- a/src/engine/game/object/spatial.h +++ b/src/engine/game/object/spatial.h @@ -17,14 +17,6 @@ #pragma once -#include -#include -#include - -#include "glm/gtc/quaternion.hpp" -#include "glm/mat4x4.hpp" -#include "glm/vec3.hpp" - #include "../../graphics/walkmesh/walkmesh.h" #include "../../scene/animproperties.h" #include "../../scene/node/scenenode.h" diff --git a/src/engine/game/object/trigger.cpp b/src/engine/game/object/trigger.cpp index 43ddf96d..dd68ec85 100644 --- a/src/engine/game/object/trigger.cpp +++ b/src/engine/game/object/trigger.cpp @@ -17,10 +17,6 @@ #include "trigger.h" -#include - -#include "glm/gtx/intersect.hpp" - #include "../../common/log.h" #include "../../resource/resources.h" #include "../../resource/strings.h" diff --git a/src/engine/game/object/trigger.h b/src/engine/game/object/trigger.h index 94111508..4f37c50f 100644 --- a/src/engine/game/object/trigger.h +++ b/src/engine/game/object/trigger.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../resource/format/gffreader.h" #include "spatial.h" diff --git a/src/engine/game/object/trigger_blueprint.cpp b/src/engine/game/object/trigger_blueprint.cpp index 583c948b..d448d379 100644 --- a/src/engine/game/object/trigger_blueprint.cpp +++ b/src/engine/game/object/trigger_blueprint.cpp @@ -21,8 +21,6 @@ #include "trigger.h" -#include - #include "../../resource/strings.h" #include "../game.h" diff --git a/src/engine/game/object/waypoint.cpp b/src/engine/game/object/waypoint.cpp index 83a52b70..675e63e7 100644 --- a/src/engine/game/object/waypoint.cpp +++ b/src/engine/game/object/waypoint.cpp @@ -17,10 +17,6 @@ #include "waypoint.h" -#include - -#include "glm/glm.hpp" - #include "../../resource/resources.h" #include "../../resource/strings.h" diff --git a/src/engine/game/object/waypoint_blueprint.cpp b/src/engine/game/object/waypoint_blueprint.cpp index c0886a7b..f32fa111 100644 --- a/src/engine/game/object/waypoint_blueprint.cpp +++ b/src/engine/game/object/waypoint_blueprint.cpp @@ -21,8 +21,6 @@ #include "waypoint.h" -#include - #include "../../resource/strings.h" #include "../game.h" diff --git a/src/engine/game/objectconverter.h b/src/engine/game/objectconverter.h index 00d5dc60..28918e6a 100644 --- a/src/engine/game/objectconverter.h +++ b/src/engine/game/objectconverter.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "object/creature.h" #include "object/door.h" #include "object/object.h" diff --git a/src/engine/game/options.h b/src/engine/game/options.h index 3b45cb84..352852ed 100644 --- a/src/engine/game/options.h +++ b/src/engine/game/options.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../audio/options.h" #include "../graphics/options.h" diff --git a/src/engine/game/party.cpp b/src/engine/game/party.cpp index d563e5c9..96af9414 100644 --- a/src/engine/game/party.cpp +++ b/src/engine/game/party.cpp @@ -17,8 +17,6 @@ #include "party.h" -#include - #include "../common/log.h" #include "../common/random.h" diff --git a/src/engine/game/party.h b/src/engine/game/party.h index cd9865da..0d0960fe 100644 --- a/src/engine/game/party.h +++ b/src/engine/game/party.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include "SDL2/SDL_events.h" - namespace reone { namespace game { diff --git a/src/engine/game/path.h b/src/engine/game/path.h index 632c72a9..083974e6 100644 --- a/src/engine/game/path.h +++ b/src/engine/game/path.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include - -#include - #include "../resource/format/gffreader.h" namespace reone { diff --git a/src/engine/game/pathfinder.cpp b/src/engine/game/pathfinder.cpp index 56beafe1..69a923eb 100644 --- a/src/engine/game/pathfinder.cpp +++ b/src/engine/game/pathfinder.cpp @@ -17,8 +17,6 @@ #include "pathfinder.h" -#include "glm/gtx/norm.hpp" - using namespace std; using namespace reone::resource; diff --git a/src/engine/game/pathfinder.h b/src/engine/game/pathfinder.h index abf29a83..3c9b22bf 100644 --- a/src/engine/game/pathfinder.h +++ b/src/engine/game/pathfinder.h @@ -17,17 +17,6 @@ #pragma once -#include -#include -#include -#include -#include -#include - -#include - -#include "glm/vec3.hpp" - #include "path.h" namespace reone { diff --git a/src/engine/game/player.cpp b/src/engine/game/player.cpp index e386fcaa..fd801f34 100644 --- a/src/engine/game/player.cpp +++ b/src/engine/game/player.cpp @@ -17,8 +17,6 @@ #include "player.h" -#include - #include "../common/guardutil.h" #include "camera/camera.h" diff --git a/src/engine/game/player.h b/src/engine/game/player.h index 74863283..ba8bbb4d 100644 --- a/src/engine/game/player.h +++ b/src/engine/game/player.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include "SDL2/SDL_events.h" - namespace reone { namespace game { diff --git a/src/engine/game/portrait.h b/src/engine/game/portrait.h index 6b3e5078..18abd325 100644 --- a/src/engine/game/portrait.h +++ b/src/engine/game/portrait.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../graphics/texture/texture.h" namespace reone { diff --git a/src/engine/game/portraits.cpp b/src/engine/game/portraits.cpp index b8f58135..391d8e21 100644 --- a/src/engine/game/portraits.cpp +++ b/src/engine/game/portraits.cpp @@ -17,8 +17,6 @@ #include "portraits.h" -#include - using namespace std; using namespace reone::graphics; diff --git a/src/engine/game/portraits.h b/src/engine/game/portraits.h index 50257440..9f4a9d82 100644 --- a/src/engine/game/portraits.h +++ b/src/engine/game/portraits.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../graphics/texture/textures.h" #include "../resource/resources.h" diff --git a/src/engine/game/reputes.cpp b/src/engine/game/reputes.cpp index 98425744..ac48743b 100644 --- a/src/engine/game/reputes.cpp +++ b/src/engine/game/reputes.cpp @@ -17,11 +17,6 @@ #include "reputes.h" -#include -#include - -#include - using namespace std; using namespace reone::resource; diff --git a/src/engine/game/reputes.h b/src/engine/game/reputes.h index 7863d6e6..441d9903 100644 --- a/src/engine/game/reputes.h +++ b/src/engine/game/reputes.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../resource/resources.h" #include "object/creature.h" diff --git a/src/engine/game/room.h b/src/engine/game/room.h index b8e59522..bcffeff7 100644 --- a/src/engine/game/room.h +++ b/src/engine/game/room.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include "glm/vec3.hpp" - #include "../graphics/walkmesh/walkmesh.h" #include "../scene/node/modelnode.h" diff --git a/src/engine/game/savedgame.h b/src/engine/game/savedgame.h index 2bf06e86..cec34a51 100644 --- a/src/engine/game/savedgame.h +++ b/src/engine/game/savedgame.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../graphics/texture/texture.h" namespace reone { diff --git a/src/engine/game/script/objectutil.h b/src/engine/game/script/objectutil.h index d3c41101..66ebd755 100644 --- a/src/engine/game/script/objectutil.h +++ b/src/engine/game/script/objectutil.h @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include - #include "../../script/types.h" #include "../object/object.h" diff --git a/src/engine/game/script/routines.h b/src/engine/game/script/routines.h index 9dcdd8ff..62a7315a 100644 --- a/src/engine/game/script/routines.h +++ b/src/engine/game/script/routines.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "../../common/collectionutil.h" #include "../../resource/types.h" #include "../../script/routine.h" diff --git a/src/engine/game/script/routines_common.cpp b/src/engine/game/script/routines_common.cpp index 0b7427c2..b39987f1 100644 --- a/src/engine/game/script/routines_common.cpp +++ b/src/engine/game/script/routines_common.cpp @@ -21,9 +21,6 @@ #include "routines.h" -#include -#include - #include "../../common/log.h" #include "../../common/random.h" #include "../../resource/strings.h" diff --git a/src/engine/game/script/routines_items.cpp b/src/engine/game/script/routines_items.cpp index 93923405..b83509dc 100644 --- a/src/engine/game/script/routines_items.cpp +++ b/src/engine/game/script/routines_items.cpp @@ -21,8 +21,6 @@ #include "routines.h" -#include - #include "../../common/log.h" #include "../game.h" diff --git a/src/engine/game/script/routines_locations.cpp b/src/engine/game/script/routines_locations.cpp index 736eceda..efa609f1 100644 --- a/src/engine/game/script/routines_locations.cpp +++ b/src/engine/game/script/routines_locations.cpp @@ -21,8 +21,6 @@ #include "routines.h" -#include "glm/trigonometric.hpp" - #include "../../common/log.h" #include "../enginetype/location.h" diff --git a/src/engine/game/script/routines_math.cpp b/src/engine/game/script/routines_math.cpp index 0b34b4fc..ed1a76f0 100644 --- a/src/engine/game/script/routines_math.cpp +++ b/src/engine/game/script/routines_math.cpp @@ -21,8 +21,6 @@ #include "routines.h" -#include "glm/glm.hpp" - using namespace std; using namespace reone::script; diff --git a/src/engine/game/script/routines_objects.cpp b/src/engine/game/script/routines_objects.cpp index 6893f502..ab1f7b9e 100644 --- a/src/engine/game/script/routines_objects.cpp +++ b/src/engine/game/script/routines_objects.cpp @@ -21,8 +21,6 @@ #include "routines.h" -#include - #include "../../common/log.h" #include "../enginetype/location.h" diff --git a/src/engine/game/script/routines_party.cpp b/src/engine/game/script/routines_party.cpp index db9f8769..31ee7418 100644 --- a/src/engine/game/script/routines_party.cpp +++ b/src/engine/game/script/routines_party.cpp @@ -21,9 +21,6 @@ #include "routines.h" -#include -#include - #include "../../common/log.h" #include "../game.h" diff --git a/src/engine/game/script/routines_strings.cpp b/src/engine/game/script/routines_strings.cpp index be69ad9b..b9389843 100644 --- a/src/engine/game/script/routines_strings.cpp +++ b/src/engine/game/script/routines_strings.cpp @@ -21,8 +21,6 @@ #include "routines.h" -#include - #include "../../common/log.h" #include "../../resource/strings.h" diff --git a/src/engine/game/script/runner.cpp b/src/engine/game/script/runner.cpp index 3e7fd63d..3e2cd951 100644 --- a/src/engine/game/script/runner.cpp +++ b/src/engine/game/script/runner.cpp @@ -17,8 +17,6 @@ #include "runner.h" -#include - #include "../../script/execution.h" #include "../game.h" diff --git a/src/engine/game/script/runner.h b/src/engine/game/script/runner.h index 1f311f0e..3a5969a0 100644 --- a/src/engine/game/script/runner.h +++ b/src/engine/game/script/runner.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../../script/scripts.h" #include "routines.h" diff --git a/src/engine/game/services.h b/src/engine/game/services.h index 1937e2a0..b0a17d8d 100644 --- a/src/engine/game/services.h +++ b/src/engine/game/services.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../audio/services.h" #include "../graphics/services.h" #include "../resource/services.h" diff --git a/src/engine/game/soundsets.cpp b/src/engine/game/soundsets.cpp index a5256bcd..0fb67312 100644 --- a/src/engine/game/soundsets.cpp +++ b/src/engine/game/soundsets.cpp @@ -17,8 +17,6 @@ #include "soundsets.h" -#include - #include "../audio/files.h" #include "../common/streamutil.h" #include "../resource/format/ssfreader.h" diff --git a/src/engine/game/soundsets.h b/src/engine/game/soundsets.h index d6d28d33..cf2f5967 100644 --- a/src/engine/game/soundsets.h +++ b/src/engine/game/soundsets.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../audio/files.h" #include "../common/cache.h" #include "../resource/services.h" diff --git a/src/engine/game/surface.h b/src/engine/game/surface.h index 84960880..47183938 100644 --- a/src/engine/game/surface.h +++ b/src/engine/game/surface.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace game { diff --git a/src/engine/game/surfaces.cpp b/src/engine/game/surfaces.cpp index aeeaccc3..7854a203 100644 --- a/src/engine/game/surfaces.cpp +++ b/src/engine/game/surfaces.cpp @@ -17,10 +17,6 @@ #include "surfaces.h" -#include - -#include - #include "../common/guardutil.h" using namespace std; diff --git a/src/engine/game/surfaces.h b/src/engine/game/surfaces.h index 2ce78465..9a2c0e9e 100644 --- a/src/engine/game/surfaces.h +++ b/src/engine/game/surfaces.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "../resource/resources.h" #include "surface.h" diff --git a/src/engine/game/types.h b/src/engine/game/types.h index 986be7af..603d12fd 100644 --- a/src/engine/game/types.h +++ b/src/engine/game/types.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../audio/stream.h" namespace reone { diff --git a/src/engine/graphics/aabb.cpp b/src/engine/graphics/aabb.cpp index 08f39115..bf4f4ffc 100644 --- a/src/engine/graphics/aabb.cpp +++ b/src/engine/graphics/aabb.cpp @@ -17,11 +17,6 @@ #include "aabb.h" -#include - -#include "glm/ext.hpp" -#include "glm/gtx/norm.hpp" - using namespace std; namespace reone { diff --git a/src/engine/graphics/aabb.h b/src/engine/graphics/aabb.h index 96df6942..2c76d34c 100644 --- a/src/engine/graphics/aabb.h +++ b/src/engine/graphics/aabb.h @@ -17,9 +17,6 @@ #pragma once -#include "glm/mat4x4.hpp" -#include "glm/vec3.hpp" - namespace reone { namespace graphics { diff --git a/src/engine/graphics/baryutil.h b/src/engine/graphics/baryutil.h index 15ec0903..7ab62df3 100644 --- a/src/engine/graphics/baryutil.h +++ b/src/engine/graphics/baryutil.h @@ -21,10 +21,6 @@ #pragma once -#include "glm/geometric.hpp" -#include "glm/vec2.hpp" -#include "glm/vec3.hpp" - namespace reone { namespace graphics { diff --git a/src/engine/graphics/beziercurve.h b/src/engine/graphics/beziercurve.h index f7c1db9f..5054511b 100644 --- a/src/engine/graphics/beziercurve.h +++ b/src/engine/graphics/beziercurve.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace graphics { diff --git a/src/engine/graphics/context.cpp b/src/engine/graphics/context.cpp index e102b118..738de51c 100644 --- a/src/engine/graphics/context.cpp +++ b/src/engine/graphics/context.cpp @@ -17,9 +17,6 @@ #include "context.h" -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - using namespace std; namespace reone { diff --git a/src/engine/graphics/context.h b/src/engine/graphics/context.h index 19daa2aa..bf9c26f7 100644 --- a/src/engine/graphics/context.h +++ b/src/engine/graphics/context.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include - -#include "glm/vec4.hpp" - #include "types.h" namespace reone { diff --git a/src/engine/graphics/cursor.cpp b/src/engine/graphics/cursor.cpp index 6c5437f9..c9a4e979 100644 --- a/src/engine/graphics/cursor.cpp +++ b/src/engine/graphics/cursor.cpp @@ -17,11 +17,6 @@ #include "cursor.h" -#include - -#include "glm/glm.hpp" -#include "glm/ext.hpp" - #include "../common/guardutil.h" #include "services.h" diff --git a/src/engine/graphics/cursor.h b/src/engine/graphics/cursor.h index cb233963..333b3f81 100644 --- a/src/engine/graphics/cursor.h +++ b/src/engine/graphics/cursor.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include - -#include "glm/vec2.hpp" - #include "texture/texture.h" namespace reone { diff --git a/src/engine/graphics/eventhandler.h b/src/engine/graphics/eventhandler.h index 48c0bf07..6c9f3fba 100644 --- a/src/engine/graphics/eventhandler.h +++ b/src/engine/graphics/eventhandler.h @@ -17,8 +17,6 @@ #pragma once -#include "SDL2/SDL_events.h" - namespace reone { namespace graphics { diff --git a/src/engine/graphics/features.h b/src/engine/graphics/features.h index eb0e7948..1eb89d02 100644 --- a/src/engine/graphics/features.h +++ b/src/engine/graphics/features.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "options.h" #include "types.h" diff --git a/src/engine/graphics/font.cpp b/src/engine/graphics/font.cpp index b20cc52a..c5e08fbe 100644 --- a/src/engine/graphics/font.cpp +++ b/src/engine/graphics/font.cpp @@ -17,11 +17,6 @@ #include "font.h" -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - -#include "glm/ext.hpp" - #include "../common/guardutil.h" using namespace std; diff --git a/src/engine/graphics/font.h b/src/engine/graphics/font.h index 9736ebb9..21b666a8 100644 --- a/src/engine/graphics/font.h +++ b/src/engine/graphics/font.h @@ -17,12 +17,6 @@ #pragma once -#include - -#include "glm/mat4x4.hpp" -#include "glm/vec2.hpp" -#include "glm/vec3.hpp" - #include "context.h" #include "mesh/meshes.h" #include "shader/shaders.h" diff --git a/src/engine/graphics/fonts.h b/src/engine/graphics/fonts.h index e71efa67..6c4adf6c 100644 --- a/src/engine/graphics/fonts.h +++ b/src/engine/graphics/fonts.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../common/cache.h" #include "context.h" diff --git a/src/engine/graphics/framebuffer.cpp b/src/engine/graphics/framebuffer.cpp index aeca50e2..0baf83ed 100644 --- a/src/engine/graphics/framebuffer.cpp +++ b/src/engine/graphics/framebuffer.cpp @@ -17,11 +17,6 @@ #include "framebuffer.h" -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - using namespace std; namespace reone { diff --git a/src/engine/graphics/framebuffer.h b/src/engine/graphics/framebuffer.h index ffd338c9..61611aec 100644 --- a/src/engine/graphics/framebuffer.h +++ b/src/engine/graphics/framebuffer.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "renderbuffer.h" #include "texture/texture.h" diff --git a/src/engine/graphics/lip/animation.cpp b/src/engine/graphics/lip/animation.cpp index 1363f352..c2fdf1f6 100644 --- a/src/engine/graphics/lip/animation.cpp +++ b/src/engine/graphics/lip/animation.cpp @@ -17,8 +17,6 @@ #include "animation.h" -#include - using namespace std; namespace reone { diff --git a/src/engine/graphics/lip/animation.h b/src/engine/graphics/lip/animation.h index 00d7e447..d5d8eab7 100644 --- a/src/engine/graphics/lip/animation.h +++ b/src/engine/graphics/lip/animation.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - namespace reone { namespace graphics { diff --git a/src/engine/graphics/lip/lips.cpp b/src/engine/graphics/lip/lips.cpp index 0f7f5341..69eb1122 100644 --- a/src/engine/graphics/lip/lips.cpp +++ b/src/engine/graphics/lip/lips.cpp @@ -18,8 +18,6 @@ #include "lips.h" -#include - #include "../../common/streamutil.h" #include "lipreader.h" diff --git a/src/engine/graphics/lip/lips.h b/src/engine/graphics/lip/lips.h index c3b229cb..165b902b 100644 --- a/src/engine/graphics/lip/lips.h +++ b/src/engine/graphics/lip/lips.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../common/cache.h" #include "../../resource/resources.h" diff --git a/src/engine/graphics/lip/lipwriter.cpp b/src/engine/graphics/lip/lipwriter.cpp index ef304167..df348aab 100644 --- a/src/engine/graphics/lip/lipwriter.cpp +++ b/src/engine/graphics/lip/lipwriter.cpp @@ -17,8 +17,6 @@ #include "lipwriter.h" -#include - #include "../../common/streamwriter.h" namespace fs = boost::filesystem; diff --git a/src/engine/graphics/lip/lipwriter.h b/src/engine/graphics/lip/lipwriter.h index 71f20978..76957fb0 100644 --- a/src/engine/graphics/lip/lipwriter.h +++ b/src/engine/graphics/lip/lipwriter.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "animation.h" namespace reone { diff --git a/src/engine/graphics/materials.cpp b/src/engine/graphics/materials.cpp index a28f265b..b6ef61b0 100644 --- a/src/engine/graphics/materials.cpp +++ b/src/engine/graphics/materials.cpp @@ -17,10 +17,6 @@ #include "materials.h" -#include - -#include - #include "../common/collectionutil.h" using namespace std; diff --git a/src/engine/graphics/materials.h b/src/engine/graphics/materials.h index 51d6924b..c531a769 100644 --- a/src/engine/graphics/materials.h +++ b/src/engine/graphics/materials.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../resource/resources.h" #include "material.h" diff --git a/src/engine/graphics/mesh/mesh.cpp b/src/engine/graphics/mesh/mesh.cpp index 6b58ee67..c909a528 100644 --- a/src/engine/graphics/mesh/mesh.cpp +++ b/src/engine/graphics/mesh/mesh.cpp @@ -17,14 +17,6 @@ #include "mesh.h" -#include -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - -#include "glm/ext.hpp" - #include "../baryutil.h" using namespace std; diff --git a/src/engine/graphics/mesh/mesh.h b/src/engine/graphics/mesh/mesh.h index 858aad1a..f5859087 100644 --- a/src/engine/graphics/mesh/mesh.h +++ b/src/engine/graphics/mesh/mesh.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../aabb.h" #include "vertexattributes.h" diff --git a/src/engine/graphics/mesh/meshes.cpp b/src/engine/graphics/mesh/meshes.cpp index 6bb6124e..db6a15fb 100644 --- a/src/engine/graphics/mesh/meshes.cpp +++ b/src/engine/graphics/mesh/meshes.cpp @@ -18,8 +18,6 @@ #include "meshes.h" -#include "glm/ext.hpp" - using namespace std; namespace reone { diff --git a/src/engine/graphics/mesh/meshes.h b/src/engine/graphics/mesh/meshes.h index 7ddf5c0b..aeca86d9 100644 --- a/src/engine/graphics/mesh/meshes.h +++ b/src/engine/graphics/mesh/meshes.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "mesh.h" namespace reone { diff --git a/src/engine/graphics/mesh/vertexattributes.h b/src/engine/graphics/mesh/vertexattributes.h index 8e49d498..d0780ba9 100644 --- a/src/engine/graphics/mesh/vertexattributes.h +++ b/src/engine/graphics/mesh/vertexattributes.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace graphics { diff --git a/src/engine/graphics/model/animatedproperty.h b/src/engine/graphics/model/animatedproperty.h index 8309a747..7b0e6e31 100644 --- a/src/engine/graphics/model/animatedproperty.h +++ b/src/engine/graphics/model/animatedproperty.h @@ -17,12 +17,6 @@ #pragma once -#include -#include - -#include "glm/common.hpp" -#include "glm/gtc/quaternion.hpp" - namespace reone { namespace graphics { diff --git a/src/engine/graphics/model/animation.cpp b/src/engine/graphics/model/animation.cpp index 685a5699..8edead9b 100644 --- a/src/engine/graphics/model/animation.cpp +++ b/src/engine/graphics/model/animation.cpp @@ -17,8 +17,6 @@ #include "animation.h" -#include - #include "../../common/collectionutil.h" using namespace std; diff --git a/src/engine/graphics/model/animation.h b/src/engine/graphics/model/animation.h index 5da58518..268cee4e 100644 --- a/src/engine/graphics/model/animation.h +++ b/src/engine/graphics/model/animation.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "modelnode.h" namespace reone { diff --git a/src/engine/graphics/model/mdlreader.cpp b/src/engine/graphics/model/mdlreader.cpp index ac65ead5..4978213d 100644 --- a/src/engine/graphics/model/mdlreader.cpp +++ b/src/engine/graphics/model/mdlreader.cpp @@ -17,10 +17,6 @@ #include "mdlreader.h" -#include - -#include "glm/ext.hpp" - #include "../../common/collectionutil.h" #include "../../common/guardutil.h" #include "../../common/log.h" diff --git a/src/engine/graphics/model/mdlreader.h b/src/engine/graphics/model/mdlreader.h index 60659e9c..d2e18491 100644 --- a/src/engine/graphics/model/mdlreader.h +++ b/src/engine/graphics/model/mdlreader.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - #include "../../graphics/model/models.h" #include "../../graphics/texture/textures.h" #include "../../resource/format/binreader.h" diff --git a/src/engine/graphics/model/mdlreader_controllers.cpp b/src/engine/graphics/model/mdlreader_controllers.cpp index 5ff4898a..9e52e76d 100644 --- a/src/engine/graphics/model/mdlreader_controllers.cpp +++ b/src/engine/graphics/model/mdlreader_controllers.cpp @@ -17,11 +17,6 @@ #include "mdlreader.h" -#include -#include - -#include "glm/ext.hpp" - #include "../../common/collectionutil.h" using namespace std; diff --git a/src/engine/graphics/model/model.cpp b/src/engine/graphics/model/model.cpp index b8aa5efd..0c45a348 100644 --- a/src/engine/graphics/model/model.cpp +++ b/src/engine/graphics/model/model.cpp @@ -17,8 +17,6 @@ #include "model.h" -#include - #include "../../common/collectionutil.h" #include "../../common/guardutil.h" #include "../../common/log.h" diff --git a/src/engine/graphics/model/model.h b/src/engine/graphics/model/model.h index 99e0dda6..bed27f8b 100644 --- a/src/engine/graphics/model/model.h +++ b/src/engine/graphics/model/model.h @@ -17,14 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include - #include "../aabb.h" #include "animation.h" diff --git a/src/engine/graphics/model/modelnode.cpp b/src/engine/graphics/model/modelnode.cpp index 8cb97faf..98a7debf 100644 --- a/src/engine/graphics/model/modelnode.cpp +++ b/src/engine/graphics/model/modelnode.cpp @@ -19,8 +19,6 @@ #include "../../common/log.h" -#include "glm/gtx/transform.hpp" - using namespace std; namespace reone { diff --git a/src/engine/graphics/model/modelnode.h b/src/engine/graphics/model/modelnode.h index 2152b66a..eb46e4c9 100644 --- a/src/engine/graphics/model/modelnode.h +++ b/src/engine/graphics/model/modelnode.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include - -#include "glm/gtx/quaternion.hpp" - #include "../mesh/mesh.h" #include "../texture/texture.h" diff --git a/src/engine/graphics/model/models.h b/src/engine/graphics/model/models.h index e4196a2a..c6760a57 100644 --- a/src/engine/graphics/model/models.h +++ b/src/engine/graphics/model/models.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../../resource/resources.h" #include "../texture/textures.h" diff --git a/src/engine/graphics/pbribl.cpp b/src/engine/graphics/pbribl.cpp index eec6417b..a10aa503 100644 --- a/src/engine/graphics/pbribl.cpp +++ b/src/engine/graphics/pbribl.cpp @@ -17,11 +17,6 @@ #include "pbribl.h" -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - -#include "glm/ext.hpp" - #include "renderbuffer.h" #include "texture/textureutil.h" diff --git a/src/engine/graphics/pbribl.h b/src/engine/graphics/pbribl.h index bf1e68c4..786312a5 100644 --- a/src/engine/graphics/pbribl.h +++ b/src/engine/graphics/pbribl.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "context.h" #include "framebuffer.h" #include "mesh/meshes.h" diff --git a/src/engine/graphics/pixelutil.cpp b/src/engine/graphics/pixelutil.cpp index f24e4815..812e02dd 100644 --- a/src/engine/graphics/pixelutil.cpp +++ b/src/engine/graphics/pixelutil.cpp @@ -17,12 +17,6 @@ #include "pixelutil.h" -#include -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - using namespace std; namespace reone { diff --git a/src/engine/graphics/pixelutil.h b/src/engine/graphics/pixelutil.h index 2629e26b..606f9a0a 100644 --- a/src/engine/graphics/pixelutil.h +++ b/src/engine/graphics/pixelutil.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "types.h" namespace reone { diff --git a/src/engine/graphics/renderbuffer.cpp b/src/engine/graphics/renderbuffer.cpp index ce1b7dd1..38138a0e 100644 --- a/src/engine/graphics/renderbuffer.cpp +++ b/src/engine/graphics/renderbuffer.cpp @@ -17,9 +17,6 @@ #include "renderbuffer.h" -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - #include "pixelutil.h" namespace reone { diff --git a/src/engine/graphics/renderbuffer.h b/src/engine/graphics/renderbuffer.h index 470f45b9..94d3383f 100644 --- a/src/engine/graphics/renderbuffer.h +++ b/src/engine/graphics/renderbuffer.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "types.h" namespace reone { diff --git a/src/engine/graphics/services.h b/src/engine/graphics/services.h index aebe3534..17aea736 100644 --- a/src/engine/graphics/services.h +++ b/src/engine/graphics/services.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../resource/services.h" #include "context.h" diff --git a/src/engine/graphics/shader/shaders.cpp b/src/engine/graphics/shader/shaders.cpp index 19722564..a109ccaf 100644 --- a/src/engine/graphics/shader/shaders.cpp +++ b/src/engine/graphics/shader/shaders.cpp @@ -17,16 +17,6 @@ #include "shaders.h" -#include -#include - -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - -#include "glm/ext.hpp" - #include "../texture/texture.h" #include "../texture/textures.h" diff --git a/src/engine/graphics/shader/shaders.h b/src/engine/graphics/shader/shaders.h index cbe451a7..dc4dc6e9 100644 --- a/src/engine/graphics/shader/shaders.h +++ b/src/engine/graphics/shader/shaders.h @@ -17,17 +17,6 @@ #pragma once -#include -#include -#include -#include -#include -#include - -#include - -#include "glm/glm.hpp" - #include "../types.h" namespace reone { diff --git a/src/engine/graphics/texture/texture.cpp b/src/engine/graphics/texture/texture.cpp index c4c2bfd9..3a81b71a 100644 --- a/src/engine/graphics/texture/texture.cpp +++ b/src/engine/graphics/texture/texture.cpp @@ -17,12 +17,6 @@ #include "texture.h" -#include -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - #include "../pixelutil.h" #include "textureutil.h" diff --git a/src/engine/graphics/texture/texture.h b/src/engine/graphics/texture/texture.h index 4d361539..0a88d834 100644 --- a/src/engine/graphics/texture/texture.h +++ b/src/engine/graphics/texture/texture.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include - -#include "glm/vec3.hpp" - #include "../../common/types.h" #include "../types.h" diff --git a/src/engine/graphics/texture/textures.cpp b/src/engine/graphics/texture/textures.cpp index 1608e856..c8d96bfb 100644 --- a/src/engine/graphics/texture/textures.cpp +++ b/src/engine/graphics/texture/textures.cpp @@ -17,8 +17,6 @@ #include "textures.h" -#include - #include "../../common/log.h" #include "../../common/streamutil.h" diff --git a/src/engine/graphics/texture/textures.h b/src/engine/graphics/texture/textures.h index 2e32b31a..e68c1cc3 100644 --- a/src/engine/graphics/texture/textures.h +++ b/src/engine/graphics/texture/textures.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - #include "../../resource/resources.h" #include "../context.h" diff --git a/src/engine/graphics/texture/textureutil.cpp b/src/engine/graphics/texture/textureutil.cpp index 3044feb6..e1e4262b 100644 --- a/src/engine/graphics/texture/textureutil.cpp +++ b/src/engine/graphics/texture/textureutil.cpp @@ -17,11 +17,6 @@ #include "textureutil.h" -#include -#include - -#include "glm/vec4.hpp" - #include "s3tc.h" using namespace std; diff --git a/src/engine/graphics/texture/tgareader.cpp b/src/engine/graphics/texture/tgareader.cpp index 26393318..f37e547f 100644 --- a/src/engine/graphics/texture/tgareader.cpp +++ b/src/engine/graphics/texture/tgareader.cpp @@ -17,8 +17,6 @@ #include "tgareader.h" -#include "glm/common.hpp" - #include "../../common/log.h" #include "textureutil.h" diff --git a/src/engine/graphics/texture/tgareader.h b/src/engine/graphics/texture/tgareader.h index 77b149e4..ae6562b2 100644 --- a/src/engine/graphics/texture/tgareader.h +++ b/src/engine/graphics/texture/tgareader.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../resource/format/binreader.h" #include "../types.h" diff --git a/src/engine/graphics/texture/tgawriter.cpp b/src/engine/graphics/texture/tgawriter.cpp index 05a6f7db..dad8d20c 100644 --- a/src/engine/graphics/texture/tgawriter.cpp +++ b/src/engine/graphics/texture/tgawriter.cpp @@ -21,10 +21,6 @@ #include "tgawriter.h" -#include - -#include - #include "../../common/guardutil.h" #include "s3tc.h" diff --git a/src/engine/graphics/texture/tgawriter.h b/src/engine/graphics/texture/tgawriter.h index 85c2fda0..e642e8b8 100644 --- a/src/engine/graphics/texture/tgawriter.h +++ b/src/engine/graphics/texture/tgawriter.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "texture.h" namespace reone { diff --git a/src/engine/graphics/texture/tpcreader.cpp b/src/engine/graphics/texture/tpcreader.cpp index 3b418d7b..4e2ed5bc 100644 --- a/src/engine/graphics/texture/tpcreader.cpp +++ b/src/engine/graphics/texture/tpcreader.cpp @@ -17,8 +17,6 @@ #include "tpcreader.h" -#include "glm/glm.hpp" - #include "../../common/streamutil.h" #include "textureutil.h" diff --git a/src/engine/graphics/texture/txireader.cpp b/src/engine/graphics/texture/txireader.cpp index 258fa9c1..a47a4d66 100644 --- a/src/engine/graphics/texture/txireader.cpp +++ b/src/engine/graphics/texture/txireader.cpp @@ -17,10 +17,6 @@ #include "txireader.h" -#include - -#include - #include "../../common/log.h" using namespace std; diff --git a/src/engine/graphics/texture/txireader.h b/src/engine/graphics/texture/txireader.h index 20401ef4..28f3b79d 100644 --- a/src/engine/graphics/texture/txireader.h +++ b/src/engine/graphics/texture/txireader.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "texture.h" namespace reone { diff --git a/src/engine/graphics/textutil.cpp b/src/engine/graphics/textutil.cpp index 99e7f004..68dfc808 100644 --- a/src/engine/graphics/textutil.cpp +++ b/src/engine/graphics/textutil.cpp @@ -17,10 +17,6 @@ #include "textutil.h" -#include - -#include - #include "font.h" using namespace std; diff --git a/src/engine/graphics/textutil.h b/src/engine/graphics/textutil.h index d0c2d43e..eda10ff4 100644 --- a/src/engine/graphics/textutil.h +++ b/src/engine/graphics/textutil.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - namespace reone { namespace graphics { diff --git a/src/engine/graphics/walkmesh/bwmreader.cpp b/src/engine/graphics/walkmesh/bwmreader.cpp index 7c5b69a9..faff4e98 100644 --- a/src/engine/graphics/walkmesh/bwmreader.cpp +++ b/src/engine/graphics/walkmesh/bwmreader.cpp @@ -17,8 +17,6 @@ #include "bwmreader.h" -#include "glm/ext.hpp" - using namespace std; namespace reone { diff --git a/src/engine/graphics/walkmesh/bwmreader.h b/src/engine/graphics/walkmesh/bwmreader.h index 1e01fc5d..84979282 100644 --- a/src/engine/graphics/walkmesh/bwmreader.h +++ b/src/engine/graphics/walkmesh/bwmreader.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../resource/format/binreader.h" #include "walkmesh.h" diff --git a/src/engine/graphics/walkmesh/walkmesh.h b/src/engine/graphics/walkmesh/walkmesh.h index 01f2e7bc..59ccef28 100644 --- a/src/engine/graphics/walkmesh/walkmesh.h +++ b/src/engine/graphics/walkmesh/walkmesh.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../aabb.h" #include "../types.h" diff --git a/src/engine/graphics/walkmesh/walkmeshes.h b/src/engine/graphics/walkmesh/walkmeshes.h index bafe70a3..3c551664 100644 --- a/src/engine/graphics/walkmesh/walkmeshes.h +++ b/src/engine/graphics/walkmesh/walkmeshes.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "../../resource/resources.h" #include "../../resource/types.h" diff --git a/src/engine/graphics/window.cpp b/src/engine/graphics/window.cpp index 91f63d3c..1a3f6eb8 100644 --- a/src/engine/graphics/window.cpp +++ b/src/engine/graphics/window.cpp @@ -17,15 +17,8 @@ #include "window.h" -#include - -#include - -#include "GL/glew.h" #include "SDL2/SDL.h" -#include "glm/ext.hpp" - #include "../common/guardutil.h" #include "cursor.h" diff --git a/src/engine/graphics/window.h b/src/engine/graphics/window.h index 265a17f6..d4bea130 100644 --- a/src/engine/graphics/window.h +++ b/src/engine/graphics/window.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include - -#include "glm/mat4x4.hpp" - #include "cursor.h" #include "eventhandler.h" #include "options.h" diff --git a/src/engine/gui/control/control.cpp b/src/engine/gui/control/control.cpp index 34df30c7..f7dd33d5 100644 --- a/src/engine/gui/control/control.cpp +++ b/src/engine/gui/control/control.cpp @@ -17,10 +17,6 @@ #include "control.h" -#include - -#include "glm/ext.hpp" - #include "../../common/log.h" #include "../../graphics/fonts.h" #include "../../graphics/mesh/meshes.h" diff --git a/src/engine/gui/control/control.h b/src/engine/gui/control/control.h index 70659c89..074e112b 100644 --- a/src/engine/gui/control/control.h +++ b/src/engine/gui/control/control.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include - -#include - -#include "glm/vec2.hpp" -#include "glm/vec3.hpp" - #include "../../graphics/font.h" #include "../../graphics/framebuffer.h" #include "../../graphics/texture/texture.h" diff --git a/src/engine/gui/control/listbox.h b/src/engine/gui/control/listbox.h index 45e720af..ca34dbad 100644 --- a/src/engine/gui/control/listbox.h +++ b/src/engine/gui/control/listbox.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "control.h" namespace reone { diff --git a/src/engine/gui/gui.cpp b/src/engine/gui/gui.cpp index 9feb105e..8d92a055 100644 --- a/src/engine/gui/gui.cpp +++ b/src/engine/gui/gui.cpp @@ -17,8 +17,6 @@ #include "gui.h" -#include - #include "../common/log.h" #include "../graphics/mesh/meshes.h" #include "../graphics/shader/shaders.h" diff --git a/src/engine/gui/gui.h b/src/engine/gui/gui.h index b0684669..1117e49e 100644 --- a/src/engine/gui/gui.h +++ b/src/engine/gui/gui.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include - -#include - -#include "glm/mat4x4.hpp" -#include "glm/vec2.hpp" - #include "../audio/services.h" #include "../graphics/fonts.h" #include "../graphics/mesh/meshes.h" diff --git a/src/engine/gui/scenebuilder.cpp b/src/engine/gui/scenebuilder.cpp index b1aa8a00..ae03b240 100644 --- a/src/engine/gui/scenebuilder.cpp +++ b/src/engine/gui/scenebuilder.cpp @@ -17,8 +17,6 @@ #include "scenebuilder.h" -#include - #include "../scene/node/cameranode.h" #include "../scene/node/meshnode.h" #include "../scene/scenegraph.h" diff --git a/src/engine/gui/scenebuilder.h b/src/engine/gui/scenebuilder.h index 2782f91c..9351990e 100644 --- a/src/engine/gui/scenebuilder.h +++ b/src/engine/gui/scenebuilder.h @@ -17,13 +17,6 @@ #pragma once -#include -#include - -#include "glm/mat4x4.hpp" -#include "glm/vec2.hpp" -#include "glm/vec3.hpp" - #include "../graphics/options.h" #include "../graphics/services.h" diff --git a/src/engine/gui/textinput.h b/src/engine/gui/textinput.h index db0af8c0..7bfe6181 100644 --- a/src/engine/gui/textinput.h +++ b/src/engine/gui/textinput.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include "SDL2/SDL_events.h" - namespace reone { namespace gui { diff --git a/src/engine/main.cpp b/src/engine/main.cpp index 7cf99f17..aa6e9ab4 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include - #include "common/log.h" #include "program.h" diff --git a/src/engine/pch.h b/src/engine/pch.h new file mode 100644 index 00000000..5980bca2 --- /dev/null +++ b/src/engine/pch.h @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2020-2021 The reone project contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "GL/glew.h" +#include "SDL2/SDL_events.h" +#include "SDL2/SDL_opengl.h" +#include "SDL2/SDL_timer.h" +#include "AL/al.h" +#include "AL/alc.h" + +#include "glm/ext.hpp" +#include "glm/glm.hpp" +#include "glm/gtx/euler_angles.hpp" +#include "glm/gtx/intersect.hpp" +#include "glm/gtx/matrix_decompose.hpp" +#include "glm/gtx/norm.hpp" +#include "glm/gtx/transform.hpp" diff --git a/src/engine/program.cpp b/src/engine/program.cpp index c16a2a48..23a28b87 100644 --- a/src/engine/program.cpp +++ b/src/engine/program.cpp @@ -17,10 +17,6 @@ #include "program.h" -#include -#include - -#include #include #include "common/guardutil.h" diff --git a/src/engine/program.h b/src/engine/program.h index 87d2de3d..973d599f 100644 --- a/src/engine/program.h +++ b/src/engine/program.h @@ -17,8 +17,6 @@ #pragma once -#include -#include #include #include "game/options.h" diff --git a/src/engine/resource/2da.h b/src/engine/resource/2da.h index acdf2752..0f86577a 100644 --- a/src/engine/resource/2da.h +++ b/src/engine/resource/2da.h @@ -17,12 +17,6 @@ #pragma once -#include -#include -#include - -#include - namespace reone { namespace resource { diff --git a/src/engine/resource/folder.h b/src/engine/resource/folder.h index 8b9fb718..7f240a70 100644 --- a/src/engine/resource/folder.h +++ b/src/engine/resource/folder.h @@ -17,11 +17,6 @@ #pragma once -#include - -#include -#include - #include "../common/types.h" #include "resourceprovider.h" diff --git a/src/engine/resource/format/2dawriter.h b/src/engine/resource/format/2dawriter.h index 66c6f6ec..e5a51568 100644 --- a/src/engine/resource/format/2dawriter.h +++ b/src/engine/resource/format/2dawriter.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../common/streamwriter.h" #include "../2da.h" diff --git a/src/engine/resource/format/binreader.h b/src/engine/resource/format/binreader.h index 6a84b515..9a5906c3 100644 --- a/src/engine/resource/format/binreader.h +++ b/src/engine/resource/format/binreader.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include -#include -#include - #include "../../common/streamreader.h" #include "../../common/types.h" diff --git a/src/engine/resource/format/erfwriter.h b/src/engine/resource/format/erfwriter.h index 0f5108f3..13abb412 100644 --- a/src/engine/resource/format/erfwriter.h +++ b/src/engine/resource/format/erfwriter.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../../common/types.h" #include "../types.h" diff --git a/src/engine/resource/format/gffwriter.h b/src/engine/resource/format/gffwriter.h index 618723e5..adb8d0b6 100644 --- a/src/engine/resource/format/gffwriter.h +++ b/src/engine/resource/format/gffwriter.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../../common/streamwriter.h" #include "../gffstruct.h" diff --git a/src/engine/resource/format/lytreader.h b/src/engine/resource/format/lytreader.h index 43e1f30e..bf09a106 100644 --- a/src/engine/resource/format/lytreader.h +++ b/src/engine/resource/format/lytreader.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include "glm/vec3.hpp" - namespace reone { namespace resource { diff --git a/src/engine/resource/format/pereader.h b/src/engine/resource/format/pereader.h index 79f819ba..15eca188 100644 --- a/src/engine/resource/format/pereader.h +++ b/src/engine/resource/format/pereader.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "binreader.h" namespace reone { diff --git a/src/engine/resource/format/rimwriter.h b/src/engine/resource/format/rimwriter.h index f115cebc..d967a4e3 100644 --- a/src/engine/resource/format/rimwriter.h +++ b/src/engine/resource/format/rimwriter.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../../common/types.h" #include "../types.h" diff --git a/src/engine/resource/format/tlkreader.h b/src/engine/resource/format/tlkreader.h index 48eb111a..83f06ff3 100644 --- a/src/engine/resource/format/tlkreader.h +++ b/src/engine/resource/format/tlkreader.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../talktable.h" #include "binreader.h" diff --git a/src/engine/resource/format/tlkwriter.h b/src/engine/resource/format/tlkwriter.h index 28986b27..d1224899 100644 --- a/src/engine/resource/format/tlkwriter.h +++ b/src/engine/resource/format/tlkwriter.h @@ -17,12 +17,6 @@ #pragma once -#include -#include - -#include -#include - #include "../talktable.h" namespace reone { diff --git a/src/engine/resource/format/visreader.h b/src/engine/resource/format/visreader.h index 48d137e8..dfc88df0 100644 --- a/src/engine/resource/format/visreader.h +++ b/src/engine/resource/format/visreader.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - #include "../types.h" namespace reone { diff --git a/src/engine/resource/gffstruct.h b/src/engine/resource/gffstruct.h index bc153acd..765aa214 100644 --- a/src/engine/resource/gffstruct.h +++ b/src/engine/resource/gffstruct.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include - -#include - -#include "glm/gtc/quaternion.hpp" -#include "glm/vec3.hpp" - #include "../common/types.h" namespace reone { diff --git a/src/engine/resource/keybifprovider.h b/src/engine/resource/keybifprovider.h index 3314757c..3813dc9d 100644 --- a/src/engine/resource/keybifprovider.h +++ b/src/engine/resource/keybifprovider.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "format/bifreader.h" #include "format/keyreader.h" #include "resourceprovider.h" diff --git a/src/engine/resource/resourceprovider.h b/src/engine/resource/resourceprovider.h index 80ddb229..e2aa9657 100644 --- a/src/engine/resource/resourceprovider.h +++ b/src/engine/resource/resourceprovider.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../common/types.h" #include "types.h" diff --git a/src/engine/resource/resources.h b/src/engine/resource/resources.h index fcd3491a..386dafc1 100644 --- a/src/engine/resource/resources.h +++ b/src/engine/resource/resources.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include -#include -#include - -#include -#include - #include "2da.h" #include "format/pereader.h" #include "gffstruct.h" diff --git a/src/engine/resource/services.h b/src/engine/resource/services.h index 214c4c5a..8a015782 100644 --- a/src/engine/resource/services.h +++ b/src/engine/resource/services.h @@ -17,11 +17,6 @@ #pragma once -#include - -#include -#include - #include "resources.h" #include "strings.h" diff --git a/src/engine/resource/strings.h b/src/engine/resource/strings.h index ddda0ea3..c333edf5 100644 --- a/src/engine/resource/strings.h +++ b/src/engine/resource/strings.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "format/tlkreader.h" #include "types.h" diff --git a/src/engine/resource/talktable.h b/src/engine/resource/talktable.h index 8b17bb52..b062f2c1 100644 --- a/src/engine/resource/talktable.h +++ b/src/engine/resource/talktable.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - namespace reone { namespace resource { diff --git a/src/engine/resource/types.h b/src/engine/resource/types.h index 020aa5cd..0db6918a 100644 --- a/src/engine/resource/types.h +++ b/src/engine/resource/types.h @@ -17,11 +17,6 @@ #pragma once -#include -#include -#include -#include - namespace reone { namespace resource { diff --git a/src/engine/resource/typeutil.h b/src/engine/resource/typeutil.h index 3f796672..aaa2917d 100644 --- a/src/engine/resource/typeutil.h +++ b/src/engine/resource/typeutil.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "types.h" namespace reone { diff --git a/src/engine/scene/animeventlistener.h b/src/engine/scene/animeventlistener.h index 7bc77bdb..68c19250 100644 --- a/src/engine/scene/animeventlistener.h +++ b/src/engine/scene/animeventlistener.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace scene { diff --git a/src/engine/scene/node/cameranode.cpp b/src/engine/scene/node/cameranode.cpp index c356d386..e2abdfff 100644 --- a/src/engine/scene/node/cameranode.cpp +++ b/src/engine/scene/node/cameranode.cpp @@ -17,8 +17,6 @@ #include "cameranode.h" -#include "glm/ext.hpp" - using namespace std; using namespace reone::graphics; diff --git a/src/engine/scene/node/emitternode.cpp b/src/engine/scene/node/emitternode.cpp index 8a6ca20e..999ab8e8 100644 --- a/src/engine/scene/node/emitternode.cpp +++ b/src/engine/scene/node/emitternode.cpp @@ -17,12 +17,6 @@ #include "emitternode.h" -#include -#include -#include - -#include "glm/gtc/constants.hpp" - #include "../../common/guardutil.h" #include "../../common/random.h" #include "../../graphics/mesh/meshes.h" diff --git a/src/engine/scene/node/emitternode.h b/src/engine/scene/node/emitternode.h index cc64bf76..fff944cd 100644 --- a/src/engine/scene/node/emitternode.h +++ b/src/engine/scene/node/emitternode.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../../common/timer.h" #include "../../graphics/beziercurve.h" #include "../../graphics/model/modelnode.h" diff --git a/src/engine/scene/node/grassnode.cpp b/src/engine/scene/node/grassnode.cpp index b0f5fef3..bd58b0ff 100644 --- a/src/engine/scene/node/grassnode.cpp +++ b/src/engine/scene/node/grassnode.cpp @@ -17,8 +17,6 @@ #include "grassnode.h" -#include - #include "../../common/guardutil.h" #include "../../graphics/mesh/meshes.h" #include "../../graphics/shader/shaders.h" diff --git a/src/engine/scene/node/lightnode.cpp b/src/engine/scene/node/lightnode.cpp index 03a953d0..1f232c43 100644 --- a/src/engine/scene/node/lightnode.cpp +++ b/src/engine/scene/node/lightnode.cpp @@ -17,10 +17,6 @@ #include "lightnode.h" -#include - -#include "glm/ext.hpp" - #include "../../common/guardutil.h" #include "../../graphics/mesh/meshes.h" #include "../../graphics/shader/shaders.h" diff --git a/src/engine/scene/node/meshnode.cpp b/src/engine/scene/node/meshnode.cpp index 87941a19..adf295c5 100644 --- a/src/engine/scene/node/meshnode.cpp +++ b/src/engine/scene/node/meshnode.cpp @@ -17,11 +17,6 @@ #include "meshnode.h" -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - #include "../../common/log.h" #include "../../common/guardutil.h" #include "../../common/random.h" diff --git a/src/engine/scene/node/modelnode.cpp b/src/engine/scene/node/modelnode.cpp index 58bfd7de..a7d5fbda 100644 --- a/src/engine/scene/node/modelnode.cpp +++ b/src/engine/scene/node/modelnode.cpp @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include - #include "../../common/collectionutil.h" #include "../../common/log.h" #include "../../common/guardutil.h" diff --git a/src/engine/scene/node/modelnode.h b/src/engine/scene/node/modelnode.h index 8f2f8688..27e41e2a 100644 --- a/src/engine/scene/node/modelnode.h +++ b/src/engine/scene/node/modelnode.h @@ -17,11 +17,6 @@ #pragma once -#include -#include -#include -#include - #include "../../graphics/lip/animation.h" #include "../../graphics/model/model.h" diff --git a/src/engine/scene/node/modelnode_animation.cpp b/src/engine/scene/node/modelnode_animation.cpp index 1eb01a20..98576d11 100644 --- a/src/engine/scene/node/modelnode_animation.cpp +++ b/src/engine/scene/node/modelnode_animation.cpp @@ -17,11 +17,6 @@ #include "modelnode.h" -#include - -#include "glm/gtx/matrix_decompose.hpp" -#include "glm/gtx/transform.hpp" - #include "../../common/collectionutil.h" using namespace std; diff --git a/src/engine/scene/node/modelnodescenenode.cpp b/src/engine/scene/node/modelnodescenenode.cpp index d62a01c7..15876020 100644 --- a/src/engine/scene/node/modelnodescenenode.cpp +++ b/src/engine/scene/node/modelnodescenenode.cpp @@ -17,8 +17,6 @@ #include "modelnodescenenode.h" -#include - #include "../../common/guardutil.h" using namespace std; diff --git a/src/engine/scene/node/scenenode.cpp b/src/engine/scene/node/scenenode.cpp index e2b5c014..dfe93b60 100644 --- a/src/engine/scene/node/scenenode.cpp +++ b/src/engine/scene/node/scenenode.cpp @@ -17,10 +17,6 @@ #include "scenenode.h" -#include - -#include "glm/gtx/norm.hpp" - using namespace std; namespace reone { diff --git a/src/engine/scene/node/scenenode.h b/src/engine/scene/node/scenenode.h index d7992e4b..753ef878 100644 --- a/src/engine/scene/node/scenenode.h +++ b/src/engine/scene/node/scenenode.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include - -#include - -#include "glm/mat4x4.hpp" -#include "glm/vec3.hpp" - #include "../../graphics/aabb.h" #include "../nodeelement.h" diff --git a/src/engine/scene/pipeline/control.cpp b/src/engine/scene/pipeline/control.cpp index 3781bb91..b531ec71 100644 --- a/src/engine/scene/pipeline/control.cpp +++ b/src/engine/scene/pipeline/control.cpp @@ -17,10 +17,6 @@ #include "control.h" -#include "GL/glew.h" - -#include "glm/ext.hpp" - #include "../../graphics/mesh/meshes.h" #include "../../graphics/shader/shaders.h" #include "../../graphics/texture/textures.h" diff --git a/src/engine/scene/pipeline/control.h b/src/engine/scene/pipeline/control.h index b2599c12..eb893ede 100644 --- a/src/engine/scene/pipeline/control.h +++ b/src/engine/scene/pipeline/control.h @@ -17,11 +17,6 @@ #pragma once -#include - -#include "glm/vec2.hpp" -#include "glm/vec4.hpp" - #include "../../graphics/framebuffer.h" #include "../../graphics/renderbuffer.h" #include "../../graphics/services.h" diff --git a/src/engine/scene/pipeline/world.cpp b/src/engine/scene/pipeline/world.cpp index 27ffb629..6d0077ca 100644 --- a/src/engine/scene/pipeline/world.cpp +++ b/src/engine/scene/pipeline/world.cpp @@ -17,12 +17,6 @@ #include "world.h" -#include - -#include "glm/ext.hpp" - -#include "GL/glew.h" - #include "../../graphics/mesh/meshes.h" #include "../../graphics/pbribl.h" #include "../../graphics/shader/shaders.h" diff --git a/src/engine/scene/pipeline/world.h b/src/engine/scene/pipeline/world.h index 949ee54f..5ea35e93 100644 --- a/src/engine/scene/pipeline/world.h +++ b/src/engine/scene/pipeline/world.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include "glm/mat4x4.hpp" - #include "../../graphics/framebuffer.h" #include "../../graphics/renderbuffer.h" #include "../../graphics/services.h" diff --git a/src/engine/scene/scenegraph.cpp b/src/engine/scene/scenegraph.cpp index 62ca083d..ed4225c2 100644 --- a/src/engine/scene/scenegraph.cpp +++ b/src/engine/scene/scenegraph.cpp @@ -17,11 +17,6 @@ #include "scenegraph.h" -#include -#include - -#include "glm/gtx/transform.hpp" - #include "../graphics/mesh/meshes.h" #include "node/cameranode.h" diff --git a/src/engine/scene/scenegraph.h b/src/engine/scene/scenegraph.h index deeb79b6..d3dabeb6 100644 --- a/src/engine/scene/scenegraph.h +++ b/src/engine/scene/scenegraph.h @@ -17,15 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - -#include "glm/vec3.hpp" - #include "../graphics/options.h" #include "../graphics/services.h" diff --git a/src/engine/scene/services.h b/src/engine/scene/services.h index 6684a00c..2bb0efe7 100644 --- a/src/engine/scene/services.h +++ b/src/engine/scene/services.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../graphics/options.h" #include "../graphics/services.h" diff --git a/src/engine/script/enginetype.h b/src/engine/script/enginetype.h index 2e96e737..42fe53cb 100644 --- a/src/engine/script/enginetype.h +++ b/src/engine/script/enginetype.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace script { diff --git a/src/engine/script/execution.cpp b/src/engine/script/execution.cpp index 45954cad..c3423e40 100644 --- a/src/engine/script/execution.cpp +++ b/src/engine/script/execution.cpp @@ -17,11 +17,6 @@ #include "execution.h" -#include - -#include -#include - #include "../common/log.h" #include "instrutil.h" diff --git a/src/engine/script/execution.h b/src/engine/script/execution.h index 503061b7..2679442d 100644 --- a/src/engine/script/execution.h +++ b/src/engine/script/execution.h @@ -17,13 +17,6 @@ #pragma once -#include -#include -#include -#include - -#include - #include "program.h" #include "types.h" #include "variable.h" diff --git a/src/engine/script/instrutil.cpp b/src/engine/script/instrutil.cpp index b4cb6d7c..a5782243 100644 --- a/src/engine/script/instrutil.cpp +++ b/src/engine/script/instrutil.cpp @@ -17,10 +17,6 @@ #include "instrutil.h" -#include - -#include - #include "program.h" using namespace std; diff --git a/src/engine/script/instrutil.h b/src/engine/script/instrutil.h index 84b71307..1186dff7 100644 --- a/src/engine/script/instrutil.h +++ b/src/engine/script/instrutil.h @@ -17,8 +17,6 @@ #pragma once -#include - namespace reone { namespace script { diff --git a/src/engine/script/ncsreader.h b/src/engine/script/ncsreader.h index a9c97b51..2c7ec6bc 100644 --- a/src/engine/script/ncsreader.h +++ b/src/engine/script/ncsreader.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../resource/format/binreader.h" #include "program.h" diff --git a/src/engine/script/program.cpp b/src/engine/script/program.cpp index 26cf4c1b..c324694b 100644 --- a/src/engine/script/program.cpp +++ b/src/engine/script/program.cpp @@ -17,10 +17,6 @@ #include "program.h" -#include - -#include - using namespace std; namespace reone { diff --git a/src/engine/script/program.h b/src/engine/script/program.h index 78da8643..9cf1a2dc 100644 --- a/src/engine/script/program.h +++ b/src/engine/script/program.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include - namespace reone { namespace script { diff --git a/src/engine/script/routine.h b/src/engine/script/routine.h index d34553fd..c5ad8899 100644 --- a/src/engine/script/routine.h +++ b/src/engine/script/routine.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "variable.h" namespace reone { diff --git a/src/engine/script/scripts.h b/src/engine/script/scripts.h index 88223814..ebe8b62e 100644 --- a/src/engine/script/scripts.h +++ b/src/engine/script/scripts.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../common/cache.h" #include "../resource/resources.h" diff --git a/src/engine/script/services.h b/src/engine/script/services.h index f89f01e0..9990a42b 100644 --- a/src/engine/script/services.h +++ b/src/engine/script/services.h @@ -17,10 +17,6 @@ #pragma once -#include - -#include - #include "../resource/services.h" #include "scripts.h" diff --git a/src/engine/script/types.h b/src/engine/script/types.h index 3dd15058..1fedb112 100644 --- a/src/engine/script/types.h +++ b/src/engine/script/types.h @@ -17,10 +17,6 @@ #pragma once -#include -#include -#include - namespace reone { namespace script { diff --git a/src/engine/script/variable.cpp b/src/engine/script/variable.cpp index df8195fa..1c98adf4 100644 --- a/src/engine/script/variable.cpp +++ b/src/engine/script/variable.cpp @@ -17,10 +17,6 @@ #include "variable.h" -#include - -#include - #include "enginetype.h" using namespace std; diff --git a/src/engine/script/variable.h b/src/engine/script/variable.h index 732d7063..e79a02a8 100644 --- a/src/engine/script/variable.h +++ b/src/engine/script/variable.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include "glm/vec3.hpp" - #include "types.h" namespace reone { diff --git a/src/engine/video/bikreader.cpp b/src/engine/video/bikreader.cpp index d20fc8f0..3415ec14 100644 --- a/src/engine/video/bikreader.cpp +++ b/src/engine/video/bikreader.cpp @@ -17,10 +17,6 @@ #include "bikreader.h" -#include - -#include - #include "../audio/stream.h" #include "../common/log.h" #include "../common/guardutil.h" diff --git a/src/engine/video/bikreader.h b/src/engine/video/bikreader.h index 96a55ca9..87125234 100644 --- a/src/engine/video/bikreader.h +++ b/src/engine/video/bikreader.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../audio/types.h" #include "../graphics/services.h" diff --git a/src/engine/video/video.cpp b/src/engine/video/video.cpp index c35d0333..2056f86e 100644 --- a/src/engine/video/video.cpp +++ b/src/engine/video/video.cpp @@ -17,13 +17,6 @@ #include "video.h" -#include - -#include "GL/glew.h" -#include "SDL2/SDL_opengl.h" - -#include "glm/ext.hpp" - #include "../common/guardutil.h" #include "../graphics/mesh/meshes.h" #include "../graphics/shader/shaders.h" diff --git a/src/engine/video/video.h b/src/engine/video/video.h index 8020b056..7987bac9 100644 --- a/src/engine/video/video.h +++ b/src/engine/video/video.h @@ -17,9 +17,6 @@ #pragma once -#include -#include - #include "../audio/stream.h" #include "../common/mediastream.h" #include "../common/types.h" diff --git a/src/launcher/frame.cpp b/src/launcher/frame.cpp index 8f1d6371..e766b401 100644 --- a/src/launcher/frame.cpp +++ b/src/launcher/frame.cpp @@ -17,11 +17,6 @@ #include "frame.h" -#include - -#include -#include -#include #include #include diff --git a/src/launcher/frame.h b/src/launcher/frame.h index 48eb8c53..28a16a67 100644 --- a/src/launcher/frame.h +++ b/src/launcher/frame.h @@ -17,8 +17,6 @@ #pragma once -#include - #include #ifndef WX_PRECOMP diff --git a/src/tests/gffwriter.cpp b/src/tests/gffwriter.cpp index 4baca407..a7977338 100644 --- a/src/tests/gffwriter.cpp +++ b/src/tests/gffwriter.cpp @@ -17,8 +17,6 @@ #define BOOST_TEST_MODULE gffwriter -#include - #include #include "../engine/resource/format/gffreader.h" diff --git a/src/tests/pathfinder.cpp b/src/tests/pathfinder.cpp index fd00f0fc..ecb6130b 100644 --- a/src/tests/pathfinder.cpp +++ b/src/tests/pathfinder.cpp @@ -17,10 +17,6 @@ #define BOOST_TEST_MODULE pathfinder -#include -#include -#include - #include #include "../engine/game/path.h" diff --git a/src/tests/streamreader.cpp b/src/tests/streamreader.cpp index daee1b45..d3af0b41 100644 --- a/src/tests/streamreader.cpp +++ b/src/tests/streamreader.cpp @@ -17,8 +17,6 @@ #define BOOST_TEST_MODULE streamreader -#include - #include #include "../engine/common/streamreader.h" diff --git a/src/tools/2datool.cpp b/src/tools/2datool.cpp index 996f7779..0af0f193 100644 --- a/src/tools/2datool.cpp +++ b/src/tools/2datool.cpp @@ -17,7 +17,6 @@ #include "tools.h" -#include #include #include "../engine/resource/format/2dawriter.h" diff --git a/src/tools/audiotool.cpp b/src/tools/audiotool.cpp index e06cd0d2..ceed60d0 100644 --- a/src/tools/audiotool.cpp +++ b/src/tools/audiotool.cpp @@ -17,8 +17,6 @@ #include "tools.h" -#include - #include "../engine/common/streamreader.h" using namespace std; diff --git a/src/tools/erftool.cpp b/src/tools/erftool.cpp index 419ad07c..3dd74307 100644 --- a/src/tools/erftool.cpp +++ b/src/tools/erftool.cpp @@ -17,8 +17,6 @@ #include "tools.h" -#include - #include "../engine/resource/format/erfwriter.h" #include "../engine/resource/typeutil.h" diff --git a/src/tools/gfftool.cpp b/src/tools/gfftool.cpp index 60244970..3369a6bd 100644 --- a/src/tools/gfftool.cpp +++ b/src/tools/gfftool.cpp @@ -17,10 +17,6 @@ #include "tools.h" -#include -#include - -#include #include #include "../engine/resource/format/gffreader.h" diff --git a/src/tools/keybiftool.cpp b/src/tools/keybiftool.cpp index b167529f..1030073d 100644 --- a/src/tools/keybiftool.cpp +++ b/src/tools/keybiftool.cpp @@ -17,12 +17,6 @@ #include "tools.h" -#include -#include - -#include -#include - #include "../engine/common/pathutil.h" #include "../engine/resource/typeutil.h" diff --git a/src/tools/main.cpp b/src/tools/main.cpp index 4259bd9a..a6d8fdeb 100644 --- a/src/tools/main.cpp +++ b/src/tools/main.cpp @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include - #include "../engine/common/log.h" #include "program.h" diff --git a/src/tools/program.cpp b/src/tools/program.cpp index e87ef2d1..cb5d3aa6 100644 --- a/src/tools/program.cpp +++ b/src/tools/program.cpp @@ -17,11 +17,6 @@ #include "program.h" -#include -#include -#include - -#include #include #include "../engine/common/pathutil.h" diff --git a/src/tools/program.h b/src/tools/program.h index 6a9f0b40..ec0dd192 100644 --- a/src/tools/program.h +++ b/src/tools/program.h @@ -17,11 +17,6 @@ #pragma once -#include -#include - -#include -#include #include #include "../engine/resource/types.h" diff --git a/src/tools/pthtool.cpp b/src/tools/pthtool.cpp index 25ef479f..eeb39c32 100644 --- a/src/tools/pthtool.cpp +++ b/src/tools/pthtool.cpp @@ -17,14 +17,6 @@ #include "tools.h" -#include -#include - -#include -#include - -#include "glm/vec3.hpp" - #include "../engine/common/streamutil.h" #include "../engine/resource/format/gffreader.h" #include "../engine/resource/format/gffwriter.h" diff --git a/src/tools/rimtool.cpp b/src/tools/rimtool.cpp index 2ce69d8d..dec7f7e0 100644 --- a/src/tools/rimtool.cpp +++ b/src/tools/rimtool.cpp @@ -17,8 +17,6 @@ #include "tools.h" -#include - #include "../engine/resource/format/rimwriter.h" #include "../engine/resource/typeutil.h" diff --git a/src/tools/tools.h b/src/tools/tools.h index 3e567ed8..6df0da9c 100644 --- a/src/tools/tools.h +++ b/src/tools/tools.h @@ -17,8 +17,6 @@ #pragma once -#include - #include "../engine/resource/format/2dareader.h" #include "../engine/resource/format/bifreader.h" #include "../engine/resource/format/erfreader.h" diff --git a/src/tools/tpctool.cpp b/src/tools/tpctool.cpp index 58b11a04..7193cf98 100644 --- a/src/tools/tpctool.cpp +++ b/src/tools/tpctool.cpp @@ -17,8 +17,6 @@ #include "tools.h" -#include - #include "s3tc.h" #include "../engine/common/log.h"