Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize Pipeline & Add Texture Mapping #13

Merged
merged 19 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ set(LOG_FILE_PATH "${EXECUTABLE_OUTPUT_PATH}/logs/SimpleRendererLog.log")
set(LOG_FILE_MAX_SIZE 1024*1024*4)
# 日志文件数量
set(LOG_FILE_MAX_COUNT 8)
#Debug Type (for cmake debug)
# set(CMAKE_BUILD_TYPE "Debug")
# 生成配置头文件
configure_file(
"${PROJECT_SOURCE_DIR}/cmake/config.h.in"
Expand Down
4 changes: 4 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
"COVERAGE_OUTPUT_DIR": {
"type": "STRING",
"value": "${sourceDir}/build/coverage"
},
"CMAKE_BUILD_TYPE": {
"type": "STRING",
"value": "Debug"
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions cmake/3rd.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ if (stb_ADDED)
BASE_DIRS ${stb_SOURCE_DIR}
FILES stb_image.h
)
add_library(stb_image INTERFACE)
target_include_directories(stb_image INTERFACE ${stb_SOURCE_DIR})
endif ()

# http://wenq.org/wqy2/index.cgi?ZenHei
Expand Down
Binary file added obj/utah-teapot-texture/brick-specular.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added obj/utah-teapot-texture/brick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions obj/utah-teapot-texture/teapot.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# File Created: 08.02.2017 14:08:01

newmtl default
Ns 20.00000000
Ni 1.50000000
d 1.00000000
Tr 0.00000000
Tf 1.00000000 1.00000000 1.00000000
illum 2
Ka 0.50980395 0.00000000 0.00000000
Kd 0.50980395 0.00000000 0.00000000
Ks 0.80099994 0.80099994 0.80099994
Ke 0.00000000 0.00000000 0.00000000
map_Ka brick.png
map_Kd brick.png
map_Ks brick-specular.png
Loading
Loading