フォルダ構成の変更、コマンドライン引数対応

kanosawa · Feb 23, 2018 · 10ea27b · 10ea27b
1 parent 253a49a
commit 10ea27b
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,16 +2,15 @@ cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -O3 -g")
 
-include_directories(/usr/include/eigen3)
+include_directories(/usr/include/eigen3 include)
 
 find_package(OpenCV REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLUT REQUIRED)
 
 add_executable(mmd-eigen src/Main.cpp src/PmxModelFileReader.cpp src/VmdFileReader.cpp
-        src/FileReader.cpp src/Vertex.cpp src/PmxModel.cpp
-        src/Material.cpp src/Bone.cpp src/Motion.cpp src/Renderer.cpp
-        src/MotionStream.cpp src/ModelUpdater.cpp src/Surface.cpp
+        src/FileReader.cpp src/Vertex.cpp src/PmxModel.cpp src/Material.cpp src/Bone.cpp
+        src/Motion.cpp src/Renderer.cpp src/MotionStream.cpp src/ModelUpdater.cpp src/Surface.cpp
         src/MotionStreamGenerator.cpp src/PmdModelFileReader.cpp src/ModelFileReader.cpp
         src/ModelFileReaderFactory.cpp)
 

diff --git a/src/Bone.h → include/Bone.h b/src/Bone.h → include/Bone.h
diff --git a/src/FileReader.h → include/FileReader.h b/src/FileReader.h → include/FileReader.h
diff --git a/src/Material.h → include/Material.h b/src/Material.h → include/Material.h
diff --git a/src/ModelFileReader.h → include/ModelFileReader.h b/src/ModelFileReader.h → include/ModelFileReader.h
diff --git a/src/ModelFileReaderFactory.h → include/ModelFileReaderFactory.h b/src/ModelFileReaderFactory.h → include/ModelFileReaderFactory.h
diff --git a/src/ModelUpdater.h → include/ModelUpdater.h b/src/ModelUpdater.h → include/ModelUpdater.h
diff --git a/src/Motion.h → include/Motion.h b/src/Motion.h → include/Motion.h
diff --git a/src/MotionStream.h → include/MotionStream.h b/src/MotionStream.h → include/MotionStream.h
diff --git a/src/MotionStreamGenerator.h → include/MotionStreamGenerator.h b/src/MotionStreamGenerator.h → include/MotionStreamGenerator.h
diff --git a/src/PmdModelFileReader.h → include/PmdModelFileReader.h b/src/PmdModelFileReader.h → include/PmdModelFileReader.h
diff --git a/src/PmxModel.h → include/PmxModel.h b/src/PmxModel.h → include/PmxModel.h
diff --git a/src/PmxModelFileReader.h → include/PmxModelFileReader.h b/src/PmxModelFileReader.h → include/PmxModelFileReader.h
diff --git a/src/Renderer.h → include/Renderer.h b/src/Renderer.h → include/Renderer.h
diff --git a/src/Surface.h → include/Surface.h b/src/Surface.h → include/Surface.h
diff --git a/src/Vertex.h → include/Vertex.h b/src/Vertex.h → include/Vertex.h
diff --git a/src/VmdFileReader.h → include/VmdFileReader.h b/src/VmdFileReader.h → include/VmdFileReader.h
diff --git a/src/Main.cpp b/src/Main.cpp
@@ -8,18 +8,23 @@ using namespace std;
 
 int main(int argc, char *argv[]) {
 
+    if (argc < 3) {
+        cout << "usage : exe_filename model_filename(fullpath) vmd_filename(fullpath)\n";
+        exit(0);
+    }
+
     // モデルファイル読み込みクラスの生成
     mmd::ModelFileReaderFactory factory;
     unique_ptr<mmd::ModelFileReader> modelFileReader =
-            factory.create("/home/kanosawa/src/mmd-eigen/data/lat/lat.pmd");
+            factory.create(argv[1]);
 
     // モデルファイルの読み込み
     mmd::PmxModel model;
     modelFileReader->readFile(model);
 
     // VMDファイルの入力
     vector<mmd::Motion> motions;
-    mmd::VmdFileReader vmdFileReader("/home/kanosawa/src/mmd-eigen/data/fish.vmd", model.getBones());
+    mmd::VmdFileReader vmdFileReader(argv[2], model.getBones());
     vmdFileReader.readFile(motions);
 
     // VMDのモーションデータをボーンごとのモーションストリームに変換