From 45cadaa21791ac25b31993454070215bb08364c0 Mon Sep 17 00:00:00 2001 From: yzyDavid Date: Thu, 14 Dec 2017 22:25:54 +0800 Subject: [PATCH 1/2] fix it to make it compile on Linux via cmake. --- .gitignore | 2 + CGProject/.idea/CGProject.iml | 364 +----------- CGProject/.idea/misc.xml | 10 - CGProject/.idea/workspace.xml | 395 ++++++++++--- CGProject/CMakeLists.txt | 27 +- CGProject/Mtl.cpp | 5 + CGProject/Mtl.h | 5 + CGProject/Obj.cpp | 5 + CGProject/Obj.h | 5 + CGProject/glm.h | 5 +- CGProject/main.cpp | 1003 ++++++++++++++++++++------------- CGProject/main.h | 5 + 12 files changed, 983 insertions(+), 848 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..51757d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +cmake-build-debug/ +.idea diff --git a/CGProject/.idea/CGProject.iml b/CGProject/.idea/CGProject.iml index 5f83d42..f08604b 100644 --- a/CGProject/.idea/CGProject.iml +++ b/CGProject/.idea/CGProject.iml @@ -1,364 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/CGProject/.idea/misc.xml b/CGProject/.idea/misc.xml index 3eb495b..79b3c94 100644 --- a/CGProject/.idea/misc.xml +++ b/CGProject/.idea/misc.xml @@ -1,14 +1,4 @@ - - - - - - - - - - \ No newline at end of file diff --git a/CGProject/.idea/workspace.xml b/CGProject/.idea/workspace.xml index f83d5e6..ba1c201 100644 --- a/CGProject/.idea/workspace.xml +++ b/CGProject/.idea/workspace.xml @@ -1,19 +1,20 @@ - + - - - - + + + + + - - + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + true + DEFINITION_ORDER - - \ No newline at end of file