diff --git a/CMakeLists.txt b/CMakeLists.txt index e4a30526..9c5ab9ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,7 @@ set(RENDER_HEADERS src/render/model/mdlfile.h src/render/model/model.h src/render/model/modelnode.h - src/render/models.h + src/render/model/models.h src/render/shaders.h src/render/stateutil.h src/render/texture.h @@ -201,7 +201,7 @@ set(RENDER_SOURCES src/render/model/mdlfile.cpp src/render/model/model.cpp src/render/model/modelnode.cpp - src/render/models.cpp + src/render/model/models.cpp src/render/shaders.cpp src/render/stateutil.cpp src/render/texture.cpp diff --git a/src/game/blueprint/item.cpp b/src/game/blueprint/item.cpp index af4fe80d..162d8949 100644 --- a/src/game/blueprint/item.cpp +++ b/src/game/blueprint/item.cpp @@ -23,7 +23,7 @@ #include #include "../../audio/files.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/textures.h" #include "../../resource/resources.h" diff --git a/src/game/camera/animatedcamera.cpp b/src/game/camera/animatedcamera.cpp index 1b5720ad..fa232120 100644 --- a/src/game/camera/animatedcamera.cpp +++ b/src/game/camera/animatedcamera.cpp @@ -21,7 +21,7 @@ #include -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../resource/resources.h" using namespace std; diff --git a/src/game/game.cpp b/src/game/game.cpp index 3f2d9b2d..3d8574f3 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -25,7 +25,7 @@ #include "../common/jobs.h" #include "../common/log.h" #include "../common/pathutil.h" -#include "../render/models.h" +#include "../render/model/models.h" #include "../render/textures.h" #include "../render/walkmeshes.h" #include "../resource/resources.h" diff --git a/src/game/gui/chargen/chargen.cpp b/src/game/gui/chargen/chargen.cpp index 0191b6bd..9b1eae24 100644 --- a/src/game/gui/chargen/chargen.cpp +++ b/src/game/gui/chargen/chargen.cpp @@ -20,7 +20,7 @@ #include #include "../../../gui/scenebuilder.h" -#include "../../../render/models.h" +#include "../../../render/model/models.h" #include "../../../resource/resources.h" #include "../../game.h" diff --git a/src/game/gui/chargen/classselect.cpp b/src/game/gui/chargen/classselect.cpp index fbb92a4d..a249f459 100644 --- a/src/game/gui/chargen/classselect.cpp +++ b/src/game/gui/chargen/classselect.cpp @@ -18,7 +18,7 @@ #include "classselect.h" #include "../../../gui/scenebuilder.h" -#include "../../../render/models.h" +#include "../../../render/model/models.h" #include "../../../resource/resources.h" #include "../../characterutil.h" diff --git a/src/game/gui/chargen/portraitselect.cpp b/src/game/gui/chargen/portraitselect.cpp index 642bca2b..83664ac4 100644 --- a/src/game/gui/chargen/portraitselect.cpp +++ b/src/game/gui/chargen/portraitselect.cpp @@ -19,7 +19,7 @@ #include "../../../common/random.h" #include "../../../gui/scenebuilder.h" -#include "../../../render/models.h" +#include "../../../render/model/models.h" #include "../../../render/textures.h" #include "../../../resource/resources.h" #include "../../../scene/node/modelscenenode.h" diff --git a/src/game/gui/conversation.cpp b/src/game/gui/conversation.cpp index 2f9a6a3d..62f807ac 100644 --- a/src/game/gui/conversation.cpp +++ b/src/game/gui/conversation.cpp @@ -21,7 +21,7 @@ #include "../../audio/player.h" #include "../../common/log.h" #include "../../gui/control/listbox.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../resource/resources.h" #include "../game.h" diff --git a/src/game/gui/dialog.cpp b/src/game/gui/dialog.cpp index cc8a05da..289c8765 100644 --- a/src/game/gui/dialog.cpp +++ b/src/game/gui/dialog.cpp @@ -31,7 +31,7 @@ #include "../../common/random.h" #include "../../gui/control/listbox.h" #include "../../gui/control/panel.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../resource/resources.h" #include "../../scene/types.h" #include "../../script/execution.h" diff --git a/src/game/gui/mainmenu.cpp b/src/game/gui/mainmenu.cpp index fa68b16e..11af4b9b 100644 --- a/src/game/gui/mainmenu.cpp +++ b/src/game/gui/mainmenu.cpp @@ -23,7 +23,7 @@ #include "../../common/log.h" #include "../../gui/control/listbox.h" #include "../../gui/scenebuilder.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../resource/resources.h" #include "../blueprint/blueprints.h" diff --git a/src/game/object/area.cpp b/src/game/object/area.cpp index 5bce957a..dedcde56 100644 --- a/src/game/object/area.cpp +++ b/src/game/object/area.cpp @@ -28,7 +28,7 @@ #include "../../common/log.h" #include "../../common/streamutil.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/walkmeshes.h" #include "../../resource/format/lytfile.h" #include "../../resource/format/visfile.h" diff --git a/src/game/object/creature.cpp b/src/game/object/creature.cpp index 13e5fd38..118df4c9 100644 --- a/src/game/object/creature.cpp +++ b/src/game/object/creature.cpp @@ -27,7 +27,7 @@ #include "../../common/streamutil.h" #include "../../common/timer.h" #include "../../experimental/net/types.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/textures.h" #include "../../resource/resources.h" #include "../../scene/types.h" diff --git a/src/game/object/creaturemodelbuilder.cpp b/src/game/object/creaturemodelbuilder.cpp index 8d056c79..910ff7fd 100644 --- a/src/game/object/creaturemodelbuilder.cpp +++ b/src/game/object/creaturemodelbuilder.cpp @@ -23,7 +23,7 @@ #include #include "../../common/streamutil.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/textures.h" #include "../../resource/resources.h" #include "../../scene/types.h" diff --git a/src/game/object/door.cpp b/src/game/object/door.cpp index 17cd64c8..e8c2fcbe 100644 --- a/src/game/object/door.cpp +++ b/src/game/object/door.cpp @@ -20,7 +20,7 @@ #include #include "../../common/streamutil.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/walkmeshes.h" #include "../../resource/resources.h" #include "../../scene/node/modelscenenode.h" diff --git a/src/game/object/placeable.cpp b/src/game/object/placeable.cpp index 8ba24b80..5427ca3e 100644 --- a/src/game/object/placeable.cpp +++ b/src/game/object/placeable.cpp @@ -22,7 +22,7 @@ #include #include "../../common/streamutil.h" -#include "../../render/models.h" +#include "../../render/model/models.h" #include "../../render/walkmeshes.h" #include "../../resource/resources.h" #include "../../scene/node/modelscenenode.h" diff --git a/src/render/model/mdlfile.cpp b/src/render/model/mdlfile.cpp index 83801552..cb0954f1 100644 --- a/src/render/model/mdlfile.cpp +++ b/src/render/model/mdlfile.cpp @@ -24,7 +24,7 @@ #include "../../common/log.h" #include "../../resource/resources.h" -#include "../models.h" +#include "../model/models.h" #include "../textures.h" using namespace std; diff --git a/src/render/models.cpp b/src/render/model/models.cpp similarity index 94% rename from src/render/models.cpp rename to src/render/model/models.cpp index 269d0f4a..07ad32ae 100644 --- a/src/render/models.cpp +++ b/src/render/model/models.cpp @@ -17,10 +17,10 @@ #include "models.h" -#include "../common/streamutil.h" -#include "../resource/resources.h" +#include "../../common/streamutil.h" +#include "../../resource/resources.h" -#include "model/mdlfile.h" +#include "../model/mdlfile.h" using namespace std; diff --git a/src/render/models.h b/src/render/model/models.h similarity index 96% rename from src/render/models.h rename to src/render/model/models.h index 46285c66..dcf6d872 100644 --- a/src/render/models.h +++ b/src/render/model/models.h @@ -21,9 +21,9 @@ #include #include -#include "../resource/types.h" +#include "../../resource/types.h" -#include "types.h" +#include "../types.h" namespace reone {