Skip to content

Commit 61ed490

Browse files
committed
Model loading
1 parent 35abf24 commit 61ed490

20 files changed

+207568
-65
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
44
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/")
55
project(renderer)
66

7+
LINK_DIRECTORIES(/usr/local/lib)
78
add_subdirectory(engine)
89
add_subdirectory(sandbox)
910

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
![Triangle](readme/readme.png)
1+
![Triangle](readme/readme.png)
2+
![Backpack](readme/backpack.png)

engine/CMakeLists.txt

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
project(engine)
22

33
find_package(glfw3 3.3 REQUIRED)
4-
#find_package(glm REQUIRED)
5-
6-
##set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/")
4+
find_package(assimp REQUIRED)
75

86
file(GLOB src
97
${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp
@@ -13,17 +11,9 @@ add_library(engine ${src} ${vendor})
1311

1412
target_include_directories(engine PRIVATE
1513
${CMAKE_CURRENT_SOURCE_DIR}/include
16-
${CMAKE_CURRENT_SOURCE_DIR}/vendor/glad/include)
14+
${CMAKE_CURRENT_SOURCE_DIR}/vendor/glad/include
15+
${CMAKE_CURRENT_SOURCE_DIR}/vendor/stb/)
1716

18-
message(wtf ${CMAKE_BINARY_DIR})
1917
file(COPY assets DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
2018
target_include_directories(engine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
21-
target_link_libraries(engine PRIVATE glfw)
22-
23-
24-
25-
26-
27-
28-
29-
19+
target_link_libraries(engine PRIVATE glfw assimp)

engine/assets/backpack/ao.jpg

1.81 MB
Loading

engine/assets/backpack/backpack.mtl

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Blender MTL File: 'None'
2+
# Material Count: 1
3+
4+
newmtl Scene_-_Root
5+
Ns 225.000000
6+
Ka 1.000000 1.000000 1.000000
7+
Kd 0.800000 0.800000 0.800000
8+
Ks 0.500000 0.500000 0.500000
9+
Ke 0.0 0.0 0.0
10+
Ni 1.450000
11+
d 1.000000
12+
illum 2
13+
map_Kd diffuse.jpg
14+
map_Bump normal.png
15+
map_Ks specular.jpg
16+

0 commit comments

Comments
 (0)