ファイル配置調整

diff --git a/Src/LibQtGeoViewerCore/Format/GeomReaderBuilder.cpp b/Src/LibQtGeoViewerCore/Format/GeomReaderBuilder.cpp
index d3a9de6..a26828a 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/GeomReaderBuilder.cpp
+++ b/Src/LibQtGeoViewerCore/Format/GeomReaderBuilder.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "GeomReaderBuilder.h"
 
-#include "Format/PmdLoader.h"
-#include "Format/MqoLoader.h"
-#include "Format/PlyLoader.h"
-#include "Format/StlLoader.h"
+#include "Format/Pmd/PmdLoader.h"
+#include "Format/Mqo/MqoLoader.h"
+#include "Format/Ply/PlyLoader.h"
+#include "Format/Stl/StlLoader.h"
+#include "Format/Obj/ObjLoader.h"
+#include "Format/X/XFileLoader.h"
 #include "Format/DaeLoader.h"
-#include "Format/ObjLoader.h"
-#include "Format/XFileLoader.h"
 
 using namespace geom;
 

diff --git a/Src/LibQtGeoViewerCore/Format/MqoLoader.cpp b/Src/LibQtGeoViewerCore/Format/Mqo/MqoLoader.cpp
similarity index 100%
rename from Src/LibQtGeoViewerCore/Format/MqoLoader.cpp
rename to Src/LibQtGeoViewerCore/Format/Mqo/MqoLoader.cpp

diff --git a/Src/LibQtGeoViewerCore/Format/MqoLoader.h b/Src/LibQtGeoViewerCore/Format/Mqo/MqoLoader.h
similarity index 80%
rename from Src/LibQtGeoViewerCore/Format/MqoLoader.h
rename to Src/LibQtGeoViewerCore/Format/Mqo/MqoLoader.h
index 20d9745..2eb1b01 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/MqoLoader.h
+++ b/Src/LibQtGeoViewerCore/Format/Mqo/MqoLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 class MqoLoader : public GeomFileReader

diff --git a/Src/LibQtGeoViewerCore/Format/ObjLoader.cpp b/Src/LibQtGeoViewerCore/Format/Obj/ObjLoader.cpp
similarity index 100%
rename from Src/LibQtGeoViewerCore/Format/ObjLoader.cpp
rename to Src/LibQtGeoViewerCore/Format/Obj/ObjLoader.cpp

diff --git a/Src/LibQtGeoViewerCore/Format/ObjLoader.h b/Src/LibQtGeoViewerCore/Format/Obj/ObjLoader.h
similarity index 94%
rename from Src/LibQtGeoViewerCore/Format/ObjLoader.h
rename to Src/LibQtGeoViewerCore/Format/Obj/ObjLoader.h
index eaabb46..15ed1b3 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/ObjLoader.h
+++ b/Src/LibQtGeoViewerCore/Format/Obj/ObjLoader.h
@@ -2,7 +2,7 @@
 
 #include "../../LibQtGeoViewerCore/GeomObject.h"
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 

diff --git a/Src/LibQtGeoViewerCore/Format/Plyloader.cpp b/Src/LibQtGeoViewerCore/Format/Ply/Plyloader.cpp
similarity index 100%
rename from Src/LibQtGeoViewerCore/Format/Plyloader.cpp
rename to Src/LibQtGeoViewerCore/Format/Ply/Plyloader.cpp

diff --git a/Src/LibQtGeoViewerCore/Format/Plyloader.h b/Src/LibQtGeoViewerCore/Format/Ply/Plyloader.h
similarity index 80%
rename from Src/LibQtGeoViewerCore/Format/Plyloader.h
rename to Src/LibQtGeoViewerCore/Format/Ply/Plyloader.h
index 6889496..6fd204e 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/Plyloader.h
+++ b/Src/LibQtGeoViewerCore/Format/Ply/Plyloader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 class PlyLoader : public GeomFileReader

diff --git a/Src/LibQtGeoViewerCore/Format/PmdLoader.cpp b/Src/LibQtGeoViewerCore/Format/Pmd/PmdLoader.cpp
similarity index 100%
rename from Src/LibQtGeoViewerCore/Format/PmdLoader.cpp
rename to Src/LibQtGeoViewerCore/Format/Pmd/PmdLoader.cpp

diff --git a/Src/LibQtGeoViewerCore/Format/PmdLoader.h b/Src/LibQtGeoViewerCore/Format/Pmd/PmdLoader.h
similarity index 80%
rename from Src/LibQtGeoViewerCore/Format/PmdLoader.h
rename to Src/LibQtGeoViewerCore/Format/Pmd/PmdLoader.h
index b2770e1..1d5593d 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/PmdLoader.h
+++ b/Src/LibQtGeoViewerCore/Format/Pmd/PmdLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 class PmdLoader : public GeomFileReader

diff --git a/Src/LibQtGeoViewerCore/Format/StlLoader.cpp b/Src/LibQtGeoViewerCore/Format/Stl/StlLoader.cpp
similarity index 100%
rename from Src/LibQtGeoViewerCore/Format/StlLoader.cpp
rename to Src/LibQtGeoViewerCore/Format/Stl/StlLoader.cpp

diff --git a/Src/LibQtGeoViewerCore/Format/StlLoader.h b/Src/LibQtGeoViewerCore/Format/Stl/StlLoader.h
similarity index 80%
rename from Src/LibQtGeoViewerCore/Format/StlLoader.h
rename to Src/LibQtGeoViewerCore/Format/Stl/StlLoader.h
index bd5d988..f00e641 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/StlLoader.h
+++ b/Src/LibQtGeoViewerCore/Format/Stl/StlLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 class StlLoader : public GeomFileReader

diff --git a/Src/LibQtGeoViewerCore/Format/XFileLoader.cpp b/Src/LibQtGeoViewerCore/Format/X/XFileLoader.cpp
similarity index 88%
rename from Src/LibQtGeoViewerCore/Format/XFileLoader.cpp
rename to Src/LibQtGeoViewerCore/Format/X/XFileLoader.cpp
index 668984e..dae77fb 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/XFileLoader.cpp
+++ b/Src/LibQtGeoViewerCore/Format/X/XFileLoader.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XFileLoader.h"
 
-#include "AssimpReader.h"
+#include "..\AssimpReader.h"
 
 
 

diff --git a/Src/LibQtGeoViewerCore/Format/XFileLoader.h b/Src/LibQtGeoViewerCore/Format/X/XFileLoader.h
similarity index 80%
rename from Src/LibQtGeoViewerCore/Format/XFileLoader.h
rename to Src/LibQtGeoViewerCore/Format/X/XFileLoader.h
index 1361366..b057af6 100644 (file)
--- a/Src/LibQtGeoViewerCore/Format/XFileLoader.h
+++ b/Src/LibQtGeoViewerCore/Format/X/XFileLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GeomFileReader.h"
+#include "..\GeomFileReader.h"
 
 
 class XFileLoader : public GeomFileReader

diff --git a/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj b/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj
index 5afa0a7..bdc4d06 100644 (file)
--- a/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj
+++ b/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj
@@ -174,12 +174,12 @@
     <ClCompile Include="Format\DaeLoader.cpp" />
     <ClCompile Include="Format\GeomFileReader.cpp" />
     <ClCompile Include="Format\GeomReaderBuilder.cpp" />
-    <ClCompile Include="Format\MqoLoader.cpp" />
-    <ClCompile Include="Format\ObjLoader.cpp" />
-    <ClCompile Include="Format\Plyloader.cpp" />
-    <ClCompile Include="Format\PmdLoader.cpp" />
-    <ClCompile Include="Format\StlLoader.cpp" />
-    <ClCompile Include="Format\XFileLoader.cpp" />
+    <ClCompile Include="Format\Mqo\MqoLoader.cpp" />
+    <ClCompile Include="Format\Obj\ObjLoader.cpp" />
+    <ClCompile Include="Format\Ply\Plyloader.cpp" />
+    <ClCompile Include="Format\Pmd\PmdLoader.cpp" />
+    <ClCompile Include="Format\Stl\StlLoader.cpp" />
+    <ClCompile Include="Format\X\XFileLoader.cpp" />
     <ClCompile Include="GeomFileFormat.cpp" />
     <ClCompile Include="GeomObject.cpp" />
     <ClCompile Include="GeoNodeTree.cpp" />
@@ -461,12 +461,12 @@
     <ClInclude Include="Format\DaeLoader.h" />
     <ClInclude Include="Format\GeomFileReader.h" />
     <ClInclude Include="Format\GeomReaderBuilder.h" />
-    <ClInclude Include="Format\MqoLoader.h" />
-    <ClInclude Include="Format\ObjLoader.h" />
-    <ClInclude Include="Format\Plyloader.h" />
-    <ClInclude Include="Format\PmdLoader.h" />
-    <ClInclude Include="Format\StlLoader.h" />
-    <ClInclude Include="Format\XFileLoader.h" />
+    <ClInclude Include="Format\Mqo\MqoLoader.h" />
+    <ClInclude Include="Format\Obj\ObjLoader.h" />
+    <ClInclude Include="Format\Ply\Plyloader.h" />
+    <ClInclude Include="Format\Pmd\PmdLoader.h" />
+    <ClInclude Include="Format\Stl\StlLoader.h" />
+    <ClInclude Include="Format\X\XFileLoader.h" />
     <ClInclude Include="GeomFileFormat.h" />
     <ClInclude Include="GeoNodeTree.h" />
     <ClInclude Include="Image\GlTexture.h" />

diff --git a/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj.filters b/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj.filters
index b7b41ee..8660ca5 100644 (file)
--- a/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj.filters
+++ b/Src/LibQtGeoViewerCore/LibQtGeoViewerCore.vcxproj.filters
@@ -32,6 +32,24 @@
     <Filter Include="Skining">
       <UniqueIdentifier>{2a1661fd-54ca-402b-9961-dd6a88c9f2fe}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Format\Mqo">
+      <UniqueIdentifier>{7c872fef-7144-49a1-b782-b55527c1ae47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Format\Obj">
+      <UniqueIdentifier>{9ae891be-e82e-42c1-94be-2b3960cc1d87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Format\Ply">
+      <UniqueIdentifier>{f0432405-362a-4aa2-b3f8-a845e6d10646}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Format\Stl">
+      <UniqueIdentifier>{7c0fb099-5356-4a4b-8181-92507f418b97}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Format\X">
+      <UniqueIdentifier>{18938aa7-cdd2-48d7-97a1-1845124a1ca0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Format\Pmd">
+      <UniqueIdentifier>{7770b437-4923-47ef-8f77-d1b62741688f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="GeomObject.cpp">
@@ -79,15 +97,6 @@
     <ClCompile Include="CrossSectionConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Format\PmdLoader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
-    <ClCompile Include="Format\StlLoader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
-    <ClCompile Include="Format\XFileLoader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
     <ClCompile Include="Format\AssimpUtil.cpp">
       <Filter>Format</Filter>
     </ClCompile>
@@ -100,15 +109,6 @@
     <ClCompile Include="Format\GeomReaderBuilder.cpp">
       <Filter>Format</Filter>
     </ClCompile>
-    <ClCompile Include="Format\MqoLoader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
-    <ClCompile Include="Format\ObjLoader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
-    <ClCompile Include="Format\Plyloader.cpp">
-      <Filter>Format</Filter>
-    </ClCompile>
     <ClCompile Include="FileUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,6 +148,24 @@
     <ClCompile Include="NodeMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Format\X\XFileLoader.cpp">
+      <Filter>Format\X</Filter>
+    </ClCompile>
+    <ClCompile Include="Format\Stl\StlLoader.cpp">
+      <Filter>Format\Stl</Filter>
+    </ClCompile>
+    <ClCompile Include="Format\Pmd\PmdLoader.cpp">
+      <Filter>Format\Pmd</Filter>
+    </ClCompile>
+    <ClCompile Include="Format\Ply\Plyloader.cpp">
+      <Filter>Format\Ply</Filter>
+    </ClCompile>
+    <ClCompile Include="Format\Obj\ObjLoader.cpp">
+      <Filter>Format\Obj</Filter>
+    </ClCompile>
+    <ClCompile Include="Format\Mqo\MqoLoader.cpp">
+      <Filter>Format\Mqo</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="GeomObject.h">
@@ -212,15 +230,6 @@
     <ClInclude Include="ObjLoaderConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Format\PmdLoader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
-    <ClInclude Include="Format\StlLoader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
-    <ClInclude Include="Format\XFileLoader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
     <ClInclude Include="Format\AssimpUtil.h">
       <Filter>Format</Filter>
     </ClInclude>
@@ -233,15 +242,6 @@
     <ClInclude Include="Format\GeomReaderBuilder.h">
       <Filter>Format</Filter>
     </ClInclude>
-    <ClInclude Include="Format\MqoLoader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
-    <ClInclude Include="Format\ObjLoader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
-    <ClInclude Include="Format\Plyloader.h">
-      <Filter>Format</Filter>
-    </ClInclude>
     <ClInclude Include="FileUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -281,6 +281,24 @@
     <ClInclude Include="NodeMap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Format\X\XFileLoader.h">
+      <Filter>Format\X</Filter>
+    </ClInclude>
+    <ClInclude Include="Format\Stl\StlLoader.h">
+      <Filter>Format\Stl</Filter>
+    </ClInclude>
+    <ClInclude Include="Format\Pmd\PmdLoader.h">
+      <Filter>Format\Pmd</Filter>
+    </ClInclude>
+    <ClInclude Include="Format\Ply\Plyloader.h">
+      <Filter>Format\Ply</Filter>
+    </ClInclude>
+    <ClInclude Include="Format\Obj\ObjLoader.h">
+      <Filter>Format\Obj</Filter>
+    </ClInclude>
+    <ClInclude Include="Format\Mqo\MqoLoader.h">
+      <Filter>Format\Mqo</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Property_Include.props" />