From 10ea27b859c980a28ed3af68ce1c642861412368 Mon Sep 17 00:00:00 2001 From: kanosawa Date: Sat, 24 Feb 2018 02:39:06 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=A7=8B?= =?UTF-8?q?=E6=88=90=E3=81=AE=E5=A4=89=E6=9B=B4=E3=80=81=E3=82=B3=E3=83=9E?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=83=A9=E3=82=A4=E3=83=B3=E5=BC=95=E6=95=B0?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 7 +++---- {src => include}/Bone.h | 0 {src => include}/FileReader.h | 0 {src => include}/Material.h | 0 {src => include}/ModelFileReader.h | 0 {src => include}/ModelFileReaderFactory.h | 0 {src => include}/ModelUpdater.h | 0 {src => include}/Motion.h | 0 {src => include}/MotionStream.h | 0 {src => include}/MotionStreamGenerator.h | 0 {src => include}/PmdModelFileReader.h | 0 {src => include}/PmxModel.h | 0 {src => include}/PmxModelFileReader.h | 0 {src => include}/Renderer.h | 0 {src => include}/Surface.h | 0 {src => include}/Vertex.h | 0 {src => include}/VmdFileReader.h | 0 src/Main.cpp | 9 +++++++-- 18 files changed, 10 insertions(+), 6 deletions(-) rename {src => include}/Bone.h (100%) rename {src => include}/FileReader.h (100%) rename {src => include}/Material.h (100%) rename {src => include}/ModelFileReader.h (100%) rename {src => include}/ModelFileReaderFactory.h (100%) rename {src => include}/ModelUpdater.h (100%) rename {src => include}/Motion.h (100%) rename {src => include}/MotionStream.h (100%) rename {src => include}/MotionStreamGenerator.h (100%) rename {src => include}/PmdModelFileReader.h (100%) rename {src => include}/PmxModel.h (100%) rename {src => include}/PmxModelFileReader.h (100%) rename {src => include}/Renderer.h (100%) rename {src => include}/Surface.h (100%) rename {src => include}/Vertex.h (100%) rename {src => include}/VmdFileReader.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddef3b4..7ae20d6 100644 --- 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 b/include/Bone.h similarity index 100% rename from src/Bone.h rename to include/Bone.h diff --git a/src/FileReader.h b/include/FileReader.h similarity index 100% rename from src/FileReader.h rename to include/FileReader.h diff --git a/src/Material.h b/include/Material.h similarity index 100% rename from src/Material.h rename to include/Material.h diff --git a/src/ModelFileReader.h b/include/ModelFileReader.h similarity index 100% rename from src/ModelFileReader.h rename to include/ModelFileReader.h diff --git a/src/ModelFileReaderFactory.h b/include/ModelFileReaderFactory.h similarity index 100% rename from src/ModelFileReaderFactory.h rename to include/ModelFileReaderFactory.h diff --git a/src/ModelUpdater.h b/include/ModelUpdater.h similarity index 100% rename from src/ModelUpdater.h rename to include/ModelUpdater.h diff --git a/src/Motion.h b/include/Motion.h similarity index 100% rename from src/Motion.h rename to include/Motion.h diff --git a/src/MotionStream.h b/include/MotionStream.h similarity index 100% rename from src/MotionStream.h rename to include/MotionStream.h diff --git a/src/MotionStreamGenerator.h b/include/MotionStreamGenerator.h similarity index 100% rename from src/MotionStreamGenerator.h rename to include/MotionStreamGenerator.h diff --git a/src/PmdModelFileReader.h b/include/PmdModelFileReader.h similarity index 100% rename from src/PmdModelFileReader.h rename to include/PmdModelFileReader.h diff --git a/src/PmxModel.h b/include/PmxModel.h similarity index 100% rename from src/PmxModel.h rename to include/PmxModel.h diff --git a/src/PmxModelFileReader.h b/include/PmxModelFileReader.h similarity index 100% rename from src/PmxModelFileReader.h rename to include/PmxModelFileReader.h diff --git a/src/Renderer.h b/include/Renderer.h similarity index 100% rename from src/Renderer.h rename to include/Renderer.h diff --git a/src/Surface.h b/include/Surface.h similarity index 100% rename from src/Surface.h rename to include/Surface.h diff --git a/src/Vertex.h b/include/Vertex.h similarity index 100% rename from src/Vertex.h rename to include/Vertex.h diff --git a/src/VmdFileReader.h b/include/VmdFileReader.h similarity index 100% rename from src/VmdFileReader.h rename to include/VmdFileReader.h diff --git a/src/Main.cpp b/src/Main.cpp index c16a64a..17aa6f5 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -8,10 +8,15 @@ 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 modelFileReader = - factory.create("/home/kanosawa/src/mmd-eigen/data/lat/lat.pmd"); + factory.create(argv[1]); // モデルファイルの読み込み mmd::PmxModel model; @@ -19,7 +24,7 @@ int main(int argc, char *argv[]) { // VMDファイルの入力 vector 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のモーションデータをボーンごとのモーションストリームに変換