Skip to content

Commit 390e9da

Browse files
committed
Move model assets to attachments folder
Refs #35
1 parent 925a74e commit 390e9da

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

attachments/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,20 @@ add_chapter (27_depth_buffering
158158

159159
add_chapter (28_model_loading
160160
SHADER 27_shader_depth
161-
MODELS ../resources/viking_room.obj
162-
TEXTURES ../resources/viking_room.png
161+
MODELS ../attachments/viking_room.obj
162+
TEXTURES ../attachments/viking_room.png
163163
LIBS glm::glm tinyobjloader::tinyobjloader)
164164

165165
add_chapter (29_mipmapping
166166
SHADER 27_shader_depth
167-
MODELS ../resources/viking_room.obj
168-
TEXTURES ../resources/viking_room.png
167+
MODELS ../attachments/viking_room.obj
168+
TEXTURES ../attachments/viking_room.png
169169
LIBS glm::glm tinyobjloader::tinyobjloader)
170170

171171
add_chapter (30_multisampling
172172
SHADER 27_shader_depth
173-
MODELS ../resources/viking_room.obj
174-
TEXTURES ../resources/viking_room.png
173+
MODELS ../attachments/viking_room.obj
174+
TEXTURES ../attachments/viking_room.png
175175
LIBS glm::glm tinyobjloader::tinyobjloader)
176176

177177
add_chapter (31_compute_shader

en/08_Loading_models.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Many of the models on that site are available in OBJ format with a permissive li
4545
For this tutorial I've decided to go with the https://sketchfab.com/3d-models/viking-room-a49f1b8e4f5c4ecf9e1fe7d81915ad38[Viking room] model by https://sketchfab.com/nigelgoh[nigelgoh] (https://web.archive.org/web/20200428202538/https://sketchfab.com/3d-models/viking-room-a49f1b8e4f5c4ecf9e1fe7d81915ad38[CC BY 4.0]).
4646
I tweaked the size and orientation of the model to use it as a drop in replacement for the current geometry:
4747

48-
* link:/resources/viking_room.obj[viking_room.obj]
49-
* link:/resources/viking_room.png[viking_room.png]
48+
* xref:attachment$viking_room.obj[viking_room.obj]
49+
* xref:attachment$viking_room.png[viking_room.png]
5050

5151
Feel free to use your own model, but make sure that it only consists of one material and that is has dimensions of about 1.5 x 1.5 x 1.5 units.
5252
If it is larger than that, then you'll have to change the view matrix.

0 commit comments

Comments
 (0)