Skip to content

Commit 9d7c890

Browse files
authored
Merge pull request CIS565-Fall-2021#4 from shineyruan/dev
Partially finished TinyObj Loader
2 parents 526e877 + 9714bbb commit 9d7c890

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1236383
-52
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
1010
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
1111
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
1212

13-
# Enable C++11 for host code
14-
set(CMAKE_CXX_STANDARD 11)
13+
# Enable C++14 for host code
14+
set(CMAKE_CXX_STANDARD 14)
1515

1616
# Set a default build type if none was specified
1717
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -78,6 +78,7 @@ set(headers
7878
src/utilities.h
7979
src/stream_compaction.h
8080
src/static_config.h
81+
src/model_loader.hpp
8182
)
8283

8384
set(sources
@@ -90,6 +91,7 @@ set(sources
9091
src/utilities.cpp
9192
src/stream_compaction.cu
9293
src/static_config.cpp
94+
src/obj_loader.cpp
9395
)
9496

9597
list(SORT headers)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
BasedOnStyle: Google
3+
IndentWidth: 2
4+
TabWidth: 2
5+
UseTab: Never
6+
BreakBeforeBraces: Attach
7+
Standard: Cpp03

0 commit comments

Comments
 (0)