diff --git a/CMakeLists.txt b/CMakeLists.txt index bf2ddcaa5..900c9f4d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ if(NOT MSVC) endif() set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) # Set the data path depending on the platform if(WIN32) @@ -138,20 +139,9 @@ set(OD_OPT_FLAGS CACHE STRING "Optimization and optional compilation flags") set(OD_CXX11_FLAGS CACHE STRING "Compilation flags to enable C++11 support") if(MSVC) - # C++11 compilation flag is activated by default + # The language standard is driven by CMAKE_CXX_STANDARD above. # Optimisation flags can be added if deemed useful else() - include(CheckCXXCompilerFlag) - if(NOT OD_CXX11_FLAGS) - CHECK_CXX_COMPILER_FLAG("-std=c++11" OD_CXX11_FLAG_SUPPORTED) - CHECK_CXX_COMPILER_FLAG("-std=gnu++11" OD_CXXGNU11_FLAG_SUPPORTED) - # MinGW supports CXX11 flag but do not compile with it. However, it works with gnu++11 - if(OD_CXX11_FLAG_SUPPORTED AND NOT MINGW) - set(OD_CXX11_FLAGS "-std=c++11" CACHE STRING "Compilation flags to enable C++11 support" FORCE) - elseif(OD_CXX11_FLAG_SUPPORTED) - set(OD_CXX11_FLAGS "-std=gnu++11" CACHE STRING "Compilation flags to enable C++11 support" FORCE) - endif() - endif() if(OD_ENABLE_WARNINGS) # Help getting compilation warnings set(OD_OPT_FLAGS "${OD_OPT_FLAGS} -Wall -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wold-style-cast") @@ -210,7 +200,7 @@ if(OD_USE_SFML_WINDOW) add_definitions(-DOD_USE_SFML_WINDOW) endif() -set(CMAKE_CXX_FLAGS "${OD_CXX11_FLAGS} ${OD_OPT_FLAGS} ${CMAKE_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS "${OD_OPT_FLAGS} ${CMAKE_CXX_FLAGS}") message(STATUS "CMake CXX Flags: " ${CMAKE_CXX_FLAGS}) set(EXTRA_LIBRARIES "") diff --git a/cmake/config/resources.cfg.in b/cmake/config/resources.cfg.in index e4dd7b1bf..d3672eff6 100644 --- a/cmake/config/resources.cfg.in +++ b/cmake/config/resources.cfg.in @@ -1,14 +1,14 @@ -[Graphics] -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib/GLSL -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib/HLSL -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib/HLSL_Cg -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib/materials -FileSystem=@CMAKE_INSTALL_PREFIX@/share/OGRE/Media/RTShaderLib/../Main [OgreInternal] FileSystem=@OGRE_MEDIA_DIR@/Main [Graphics] +# Our hand-written .vert/.frag live in the Graphics group and #include +# OgreUnifiedShader.h plus the RTShaderLib FFPLib_*/SGXLib_* sources. Ogre resolves +# those includes within the *same* resource group, so Main has to be repeated here +# even though [OgreInternal] already lists it. +# RTShaderLib is deliberately listed ONLY here: adding it to [OgreInternal] as well +# makes RTSSamplers.material parse twice and Ogre then throws +# "Sampler 'Ogre/ShadowSampler' already exists" during startup. FileSystem=@RTSHADER_DIR@ FileSystem=@OGRE_MEDIA_DIR@/Main FileSystem=materials/scripts diff --git a/gui/WindowSettings.layout b/gui/WindowSettings.layout index f2a71b0db..0bdcba3cb 100644 --- a/gui/WindowSettings.layout +++ b/gui/WindowSettings.layout @@ -85,7 +85,6 @@ - @@ -168,7 +167,6 @@ - diff --git a/materials/RTShaderLib/GLSL/RTSLib_Colour.glsl b/materials/RTShaderLib/GLSL/RTSLib_Colour.glsl index 014e11e4b..f0ffb3495 100644 --- a/materials/RTShaderLib/GLSL/RTSLib_Colour.glsl +++ b/materials/RTShaderLib/GLSL/RTSLib_Colour.glsl @@ -13,4 +13,4 @@ #define COLOUR_TRANSFER(colour) colour.rgb = pow(colour.rgb, vec3_splat(1.0/2.2)) #else #define COLOUR_TRANSFER(colour) -#endif \ No newline at end of file +#endif diff --git a/materials/RTShaderLib/GLSL/SGXLib_NormalMap.glsl b/materials/RTShaderLib/GLSL/SGXLib_NormalMap.glsl index f8c9305e4..31f03b5a8 100644 --- a/materials/RTShaderLib/GLSL/SGXLib_NormalMap.glsl +++ b/materials/RTShaderLib/GLSL/SGXLib_NormalMap.glsl @@ -122,4 +122,4 @@ void SGX_Generate_Parallax_Texcoord(in sampler2D normalHeightMap, float weight = afterDepth / (afterDepth - beforeDepth); newTexCoord = mix(newTexCoord, prevTexCoords, weight); #endif -} \ No newline at end of file +} diff --git a/materials/scripts/T2HammerGood.material b/materials/scripts/T2HammerGood.material index 354596b4b..fb207a1c8 100644 --- a/materials/scripts/T2HammerGood.material +++ b/materials/scripts/T2HammerGood.material @@ -15,9 +15,10 @@ material T2HammerGood : RTSS/NormalMapping_MultiPass texture T2HammerGoodNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T2HammerGood : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T2ShieldEvil.material b/materials/scripts/T2ShieldEvil.material index d2676a81f..f6a5d2b10 100644 --- a/materials/scripts/T2ShieldEvil.material +++ b/materials/scripts/T2ShieldEvil.material @@ -15,9 +15,10 @@ material T2ShieldEvil : RTSS/NormalMapping_MultiPass texture T2ShieldEvilNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T2ShieldEvil : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T2ShieldGood.material b/materials/scripts/T2ShieldGood.material index 1cef4e9a4..1551852b0 100644 --- a/materials/scripts/T2ShieldGood.material +++ b/materials/scripts/T2ShieldGood.material @@ -15,9 +15,10 @@ material T2ShieldGood : RTSS/NormalMapping_MultiPass texture T2ShieldGoodNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T2ShieldGood : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T2SwordGood.material b/materials/scripts/T2SwordGood.material index a96f8a66b..dc34da7cc 100644 --- a/materials/scripts/T2SwordGood.material +++ b/materials/scripts/T2SwordGood.material @@ -15,9 +15,10 @@ material T2SwordGood : RTSS/NormalMapping_MultiPass texture T2SwordGoodNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T2SwordGood : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T3HammerGood.material b/materials/scripts/T3HammerGood.material index 1b902e50f..a919970fa 100644 --- a/materials/scripts/T3HammerGood.material +++ b/materials/scripts/T3HammerGood.material @@ -15,9 +15,10 @@ material T3HammerGood : RTSS/NormalMapping_MultiPass texture T3HammerGoodNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T3HammerGood : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T3ShieldEvil.material b/materials/scripts/T3ShieldEvil.material index 7110f113e..19fdb87dc 100644 --- a/materials/scripts/T3ShieldEvil.material +++ b/materials/scripts/T3ShieldEvil.material @@ -15,9 +15,10 @@ material T3ShieldEvil : RTSS/NormalMapping_MultiPass texture T3ShieldEvilNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T3ShieldEvil : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/materials/scripts/T3ShieldGood.material b/materials/scripts/T3ShieldGood.material index b6a0ce4e6..0ea82fda7 100644 --- a/materials/scripts/T3ShieldGood.material +++ b/materials/scripts/T3ShieldGood.material @@ -15,9 +15,10 @@ material T3ShieldGood : RTSS/NormalMapping_MultiPass texture T3ShieldGoodNormal.png rtshader_system { - normal_map } + normal_map tangent_space } } + } pass decal { @@ -35,4 +36,4 @@ material T3ShieldGood : RTSS/NormalMapping_MultiPass } } } -} \ No newline at end of file +} diff --git a/source/creaturemood/CreatureMoodHunger.cpp b/source/creaturemood/CreatureMoodHunger.cpp index 740aaa079..3f907ca7f 100755 --- a/source/creaturemood/CreatureMoodHunger.cpp +++ b/source/creaturemood/CreatureMoodHunger.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "creaturemood/CreatureMoodHunger.h" +#include + #include "creaturemood/CreatureMoodManager.h" #include "entities/Creature.h" diff --git a/source/creaturemood/CreatureMoodWakefulness.cpp b/source/creaturemood/CreatureMoodWakefulness.cpp index 116397b82..e4331af39 100755 --- a/source/creaturemood/CreatureMoodWakefulness.cpp +++ b/source/creaturemood/CreatureMoodWakefulness.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "creaturemood/CreatureMoodWakefulness.h" +#include + #include "creaturemood/CreatureMoodManager.h" #include "entities/Creature.h" diff --git a/source/modes/MenuModeMain.cpp b/source/modes/MenuModeMain.cpp index c3a6028da..f8366c206 100755 --- a/source/modes/MenuModeMain.cpp +++ b/source/modes/MenuModeMain.cpp @@ -141,10 +141,6 @@ void MenuModeMain::activate() CEGUI::Window* window = getModeManager().getGui().getGuiSheet(Gui::mainMenu); OD_ASSERT_TRUE(window != nullptr); - CEGUI::Sizef rootSize = window->getPixelSize(); - OD_LOG_INF("MenuModeMain root window size: " + std::to_string(rootSize.d_width) + "x" + std::to_string(rootSize.d_height)); - OD_LOG_INF("MenuModeMain root window area: '" + std::string(window->getProperty("Area").c_str()) + "'"); - window->getChild(WINDOW_SKIRMISH)->hide(); window->getChild(WINDOW_MULTIPLAYER)->hide(); window->getChild(WINDOW_EDITOR)->hide(); @@ -162,8 +158,6 @@ void MenuModeMain::activate() ODFrameListener::getSingleton().stopGameRenderer(); ODFrameListener::getSingleton().createMainMenuScene(); - - // Settings window is hidden by default; user opens it via Settings button. } void MenuModeMain::connectModeChangeEvent(const std::string& buttonName, AbstractModeManager::ModeType mode) diff --git a/source/modes/SettingsWindow.cpp b/source/modes/SettingsWindow.cpp index 318a4e338..7827d7f44 100755 --- a/source/modes/SettingsWindow.cpp +++ b/source/modes/SettingsWindow.cpp @@ -40,34 +40,8 @@ #include -#include - namespace { -void dumpWindowTree(CEGUI::Window* window, int depth = 0) -{ - if(window == nullptr) - return; - - CEGUI::Vector2f pos = window->getPixelPosition(); - CEGUI::Sizef size = window->getPixelSize(); - std::string indent(depth * 2, ' '); - CEGUI::Rectf inner = window->getUnclippedInnerRect().get(); - std::string msg = indent + "CEGUI window: " + std::string(window->getName().c_str()) + - " type: " + std::string(window->getType().c_str()) + - " visible: " + std::string(window->isVisible() ? "yes" : "no") + - " pos: [" + std::to_string(pos.d_x) + "," + std::to_string(pos.d_y) + - "] size: [" + std::to_string(size.d_width) + "," + std::to_string(size.d_height) + "]" + - " inner: [" + std::to_string(inner.left()) + "," + std::to_string(inner.top()) + - "," + std::to_string(inner.right()) + "," + std::to_string(inner.bottom()) + "]" + - " area: '" + std::string(window->getProperty("Area").c_str()) + "'" + - " text: '" + std::string(window->getText().c_str()) + "'"; - std::cerr << msg << std::endl; - - for(size_t i = 0; i < window->getChildCount(); ++i) - dumpWindowTree(window->getChildAtIdx(i), depth + 1); -} - float computeUiScale() { CEGUI::Sizef displaySize = CEGUI::System::getSingleton().getRenderer()->getDisplaySize(); @@ -657,8 +631,6 @@ void SettingsWindow::show() // Input only allowed on this window when visible. mSettingsWindow->setModalState(true); mSettingsWindow->show(); - OD_LOG_INF("SettingsWindow tree dump:"); - dumpWindowTree(mSettingsWindow); } } diff --git a/source/network/ODPacket.cpp b/source/network/ODPacket.cpp index 51ab1c412..2adea6511 100755 --- a/source/network/ODPacket.cpp +++ b/source/network/ODPacket.cpp @@ -15,7 +15,6 @@ * along with this program. If not, see . */ -#include #include "network/ODPacket.h" #include diff --git a/source/network/ODSocketServer.cpp b/source/network/ODSocketServer.cpp index 318f437a5..e2d17f654 100755 --- a/source/network/ODSocketServer.cpp +++ b/source/network/ODSocketServer.cpp @@ -26,6 +26,7 @@ ODSocketServer::ODSocketServer(): mThread(nullptr), + mActualPort(0), mIsConnected(false) { } diff --git a/source/render/ODFrameListener.cpp b/source/render/ODFrameListener.cpp index 38a946e84..68fe95afc 100755 --- a/source/render/ODFrameListener.cpp +++ b/source/render/ODFrameListener.cpp @@ -284,7 +284,9 @@ bool ODFrameListener::frameStarted(const Ogre::FrameEvent& evt) void ODFrameListener::renderQueueStarted(Ogre::uint8 queueGroupId, const Ogre::String& cameraName, bool&) { - if(queueGroupId == RenderManager::OD_RENDER_QUEUE_ID_GUI && cameraName == mCameraManager.getActiveCamera()->getName()) + const Ogre::Camera* activeCamera = mCameraManager.getActiveCamera(); + if(queueGroupId == RenderManager::OD_RENDER_QUEUE_ID_GUI && + activeCamera != nullptr && cameraName == activeCamera->getName()) { Ogre::Root::getSingleton().getRenderSystem()->clearFrameBuffer(Ogre::FBT_DEPTH); CEGUI::System::getSingleton().renderAllGUIContexts(); diff --git a/source/render/RenderManager.cpp b/source/render/RenderManager.cpp index 31a1963bb..9ba082bde 100755 --- a/source/render/RenderManager.cpp +++ b/source/render/RenderManager.cpp @@ -77,8 +77,14 @@ namespace { - void buildTangentVectorsIfNeeded(Ogre::MeshPtr meshPtr) + void buildTangentVectorsIfNeeded(const Ogre::MeshPtr& meshPtr) { + if (!meshPtr) + { + OD_LOG_ERR("Cannot build tangent vectors for a null mesh"); + return; + } + unsigned short src; if (!meshPtr->suggestTangentVectorBuildParams(src)) meshPtr->buildTangentVectors(src); @@ -598,7 +604,7 @@ Ogre::Entity* RenderManager::addEntityMenu(const std::string& meshName, const st Ogre::MeshPtr meshPtr = Ogre::MeshManager::getSingleton().getByName(meshName,"Graphics"); buildTangentVectorsIfNeeded(meshPtr); -Ogre::Entity* ent = mSceneManager->createEntity(entityName, meshPtr); + Ogre::Entity* ent = mSceneManager->createEntity(entityName, meshPtr); Ogre::SceneNode* node = mMainMenuSceneNode->createChildSceneNode(ent->getName() + "_node"); node->attachObject(ent); @@ -987,7 +993,7 @@ void RenderManager::rrRefreshTile(Tile& tile, GameMap& draggableTileContainer, c Ogre::MeshManager::getSingleton().load(meshName,"Graphics"); Ogre::MeshPtr meshPtr = Ogre::MeshManager::getSingleton().getByName(meshName,"Graphics"); buildTangentVectorsIfNeeded(meshPtr); -if((tileMeshEnt == nullptr) && !meshName.empty() ) + if((tileMeshEnt == nullptr) && !meshName.empty() ) { @@ -1118,7 +1124,7 @@ if((tileMeshEnt == nullptr) && !meshName.empty() ) Ogre::MeshPtr meshPtr = Ogre::MeshManager::getSingleton().getByName(meshName,"Graphics"); buildTangentVectorsIfNeeded(meshPtr); -std::string customMeshNodeName = bridgeMeshName + (static_cast(nt) ? "" : "_dtc" ) + "_node"; + std::string customMeshNodeName = bridgeMeshName + (static_cast(nt) ? "" : "_dtc" ) + "_node"; Ogre::SceneNode* customMeshNode; if(!mSceneManager->hasSceneNode(customMeshNodeName)) customMeshNode = tile.getEntityNode()->createChildSceneNode(customMeshNodeName); @@ -1326,7 +1332,7 @@ void RenderManager::rrCreateRenderedMovableEntity(RenderedMovableEntity* rendere Ogre::MeshPtr meshPtr = Ogre::MeshManager::getSingleton().getByName(meshName + ".mesh","Graphics"); buildTangentVectorsIfNeeded(meshPtr); -ent = mSceneManager->createEntity(tempString, meshPtr); + ent = mSceneManager->createEntity(tempString, meshPtr); node->attachObject(ent); } @@ -1433,7 +1439,7 @@ void RenderManager::rrCreateCreature(Creature* curCreature) Ogre::MeshPtr meshPtr = Ogre::MeshManager::getSingleton().getByName(meshName,"Graphics"); buildTangentVectorsIfNeeded(meshPtr); -std::string creatureName = curCreature->getOgreNamePrefix() + curCreature->getName(); + std::string creatureName = curCreature->getOgreNamePrefix() + curCreature->getName(); Ogre::Entity* ent = mSceneManager->createEntity(creatureName, meshPtr); @@ -1967,11 +1973,7 @@ std::string RenderManager::colourizeMaterial(const std::string& materialName, co // std::cout << "\nCloning material: " << tempSS.str(); // If this texture has been copied and colourized, we can return -#if defined(OGRE_VERSION) && OGRE_VERSION < 0x10A00 - if (requestedMaterial) -#else if (requestedMaterial) -#endif return tempSS.str(); // If not yet, then do so @@ -1985,7 +1987,7 @@ std::string RenderManager::colourizeMaterial(const std::string& materialName, co //std::cout << "\nMaterial does not exist, creating a new one."; Ogre::MaterialPtr newMaterial = oldMaterial->clone(tempSS.str()); - bool cloned = mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial.get(), *newMaterial.get()); + bool cloned = mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial, *newMaterial); if(!cloned) { @@ -2337,18 +2339,14 @@ std::string RenderManager::setMaterialOpacity(const std::string& materialName, f Ogre::MaterialPtr requestedMaterial = Ogre::MaterialManager::getSingleton().getByName(newMaterialName.str()); // If this texture has been copied and colourized, we can return -#if defined(OGRE_VERSION) && OGRE_VERSION < 0x10A00 - if (requestedMaterial) -#else if (requestedMaterial) -#endif return newMaterialName.str(); // If not yet, then do so Ogre::MaterialPtr oldMaterial = Ogre::MaterialManager::getSingleton().getByName(materialName); //std::cout << "\nMaterial does not exist, creating a new one."; Ogre::MaterialPtr newMaterial = oldMaterial->clone(newMaterialName.str()); - bool cloned = mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial.get(), *newMaterial.get()); + bool cloned = mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial, *newMaterial); if(!cloned) { OD_LOG_ERR("Failed to clone rtss for material: " + materialName); @@ -2444,17 +2442,13 @@ std::string RenderManager::rrBuildSkullFlagMaterial(const std::string& materialN Ogre::MaterialPtr requestedMaterial = Ogre::MaterialPtr(Ogre::MaterialManager::getSingleton().getByName(materialNameToUse)); // If this texture has been copied and colourized, we can return -#if defined(OGRE_VERSION) && OGRE_VERSION < 0x10A00 - if (requestedMaterial) -#else if (requestedMaterial) -#endif return materialNameToUse; Ogre::MaterialPtr oldMaterial = Ogre::MaterialManager::getSingleton().getByName(materialNameBase); Ogre::MaterialPtr newMaterial = oldMaterial->clone(materialNameToUse); - if(!mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial.get(), *newMaterial.get())) + if(!mShaderGenerator->cloneShaderBasedTechniques(*oldMaterial, *newMaterial)) { OD_LOG_ERR("Failed to clone rtss for material: " + materialNameBase); } diff --git a/source/renderscene/RenderSceneAddEntity.cpp b/source/renderscene/RenderSceneAddEntity.cpp index fe3405a73..3b4acf41e 100755 --- a/source/renderscene/RenderSceneAddEntity.cpp +++ b/source/renderscene/RenderSceneAddEntity.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneAddEntity.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneAddPointLight.cpp b/source/renderscene/RenderSceneAddPointLight.cpp index cb8b6b1bf..a2de5700c 100755 --- a/source/renderscene/RenderSceneAddPointLight.cpp +++ b/source/renderscene/RenderSceneAddPointLight.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneAddPointLight.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneAnimationTime.cpp b/source/renderscene/RenderSceneAnimationTime.cpp index fa46b9d7f..304ea0dea 100755 --- a/source/renderscene/RenderSceneAnimationTime.cpp +++ b/source/renderscene/RenderSceneAnimationTime.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneAnimationTime.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneCameraMove.cpp b/source/renderscene/RenderSceneCameraMove.cpp index 32fc1e378..f9716493c 100755 --- a/source/renderscene/RenderSceneCameraMove.cpp +++ b/source/renderscene/RenderSceneCameraMove.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneCameraMove.h" +#include + #include "camera/CameraManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneMoveEntity.cpp b/source/renderscene/RenderSceneMoveEntity.cpp index 9e8f84366..4ad2f7909 100755 --- a/source/renderscene/RenderSceneMoveEntity.cpp +++ b/source/renderscene/RenderSceneMoveEntity.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneMoveEntity.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderScenePosEntity.cpp b/source/renderscene/RenderScenePosEntity.cpp index 0f53b79ae..61d379ec0 100755 --- a/source/renderscene/RenderScenePosEntity.cpp +++ b/source/renderscene/RenderScenePosEntity.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderScenePosEntity.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneResizeEntity.cpp b/source/renderscene/RenderSceneResizeEntity.cpp index 2dd36510b..cba902979 100755 --- a/source/renderscene/RenderSceneResizeEntity.cpp +++ b/source/renderscene/RenderSceneResizeEntity.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneResizeEntity.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneSyncPost.cpp b/source/renderscene/RenderSceneSyncPost.cpp index 59943b94b..af492e9e8 100755 --- a/source/renderscene/RenderSceneSyncPost.cpp +++ b/source/renderscene/RenderSceneSyncPost.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneSyncPost.h" +#include + #include "camera/CameraManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneSyncWait.cpp b/source/renderscene/RenderSceneSyncWait.cpp index 3b0c4a1e6..e8204da11 100755 --- a/source/renderscene/RenderSceneSyncWait.cpp +++ b/source/renderscene/RenderSceneSyncWait.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneSyncWait.h" +#include + #include "camera/CameraManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneSyncWaitAnimation.cpp b/source/renderscene/RenderSceneSyncWaitAnimation.cpp index d28125eaf..bc8d73b02 100755 --- a/source/renderscene/RenderSceneSyncWaitAnimation.cpp +++ b/source/renderscene/RenderSceneSyncWaitAnimation.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneSyncWaitAnimation.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneTurnEntity.cpp b/source/renderscene/RenderSceneTurnEntity.cpp index ee580c050..bb8ad929d 100755 --- a/source/renderscene/RenderSceneTurnEntity.cpp +++ b/source/renderscene/RenderSceneTurnEntity.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneTurnEntity.h" +#include + #include "camera/CameraManager.h" #include "render/RenderManager.h" #include "renderscene/RenderSceneManager.h" diff --git a/source/renderscene/RenderSceneWait.cpp b/source/renderscene/RenderSceneWait.cpp index eff4f0569..aa93f9384 100755 --- a/source/renderscene/RenderSceneWait.cpp +++ b/source/renderscene/RenderSceneWait.cpp @@ -15,9 +15,10 @@ * along with this program. If not, see . */ -#include #include "renderscene/RenderSceneWait.h" +#include + #include "renderscene/RenderSceneManager.h" static const std::string RenderSceneWaitName = "Wait"; diff --git a/source/utils/ConfigManager.cpp b/source/utils/ConfigManager.cpp index a44468f5e..0e9e60e08 100755 --- a/source/utils/ConfigManager.cpp +++ b/source/utils/ConfigManager.cpp @@ -15,7 +15,6 @@ * along with this program. If not, see . */ -#include #include "utils/ConfigManager.h" #include "entities/CreatureDefinition.h"