Skip to content

Commit 3106c9a

Browse files
committed
Change in raytracing scene and bloom pass
1 parent 6efd01e commit 3106c9a

File tree

13 files changed

+171439
-145
lines changed

13 files changed

+171439
-145
lines changed

examples/raytracing/application.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,21 @@ void Application::setup() {
154154
Tools::Loaders::load_texture(droidText2, TEXTURE_PATH + "DROID_Body_Normal.jpg", TEXTURE_FORMAT_TYPE_NORMAL);
155155
droidMat->set_normal_texture(droidText2);
156156
droidMesh->push_material(droidMat);
157-
auto droidMat1 = new PhysicallyBasedMaterial();
158-
Texture* droidText10 = new Texture();
159-
Tools::Loaders::load_texture(droidText10, TEXTURE_PATH + "DROID_Misc_Emissive.jpg");
160-
droidMat1->set_emissive_texture(droidText0);
161-
droidMesh->push_material(droidMat1);
162-
// droidMesh->set_material_ID(0, 1);
163157
droidMesh->set_name("Droid");
164158
droidMesh->set_position({-0.7f, -2.3f, -1.6f});
165159
droidMesh->set_rotation({0.0, -136.0f, 0.0f});
166160
droidMesh->set_scale(.7f);
161+
Mesh* eyesMesh = new Mesh();
162+
Tools::Loaders::load_3D_file(eyesMesh, MESH_PATH + "eyes.obj", false);
163+
auto droidMat1 = new PhysicallyBasedMaterial();
164+
droidMat1->set_emissive_color(Vec3(1.0));
165+
droidMat1->set_emission_intensity(10.0);
166+
eyesMesh->push_material(droidMat1);
167+
eyesMesh->set_name("Eyes");
168+
droidMesh->add_child(eyesMesh);
167169
m_scene->add(droidMesh);
168170

171+
169172
m_scene->add(plane);
170173

171174
m_scene->set_ambient_color({0.2, 0.25, 0.61});

examples/resources/meshes/droid2.obj

Lines changed: 4 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
2-
# File Created: 06.12.2024 12:02:53
2+
# File Created: 08.12.2024 15:34:30
33

44
#
55
# object Droide_de_seguridad_Star_Wars_KX
@@ -9550,7 +9550,7 @@ v 0.3567 2.7818 0.0020
95509550
v 0.3443 2.8391 0.0190
95519551
v 0.3266 2.7890 -0.0197
95529552
v 0.3220 2.8452 0.0015
9553-
v 0.1847 2.7669 0.0000
9553+
v 0.1847 2.7669 -0.0000
95549554
v 0.1934 2.7416 0.0338
95559555
v 0.1936 2.7004 0.0304
95569556
v 0.1846 2.8023 -0.0384
@@ -12318,7 +12318,7 @@ v 0.0020 3.4943 -0.0190
1231812318
v 0.0012 3.4820 -0.0197
1231912319
v 0.0025 3.4949 -0.0274
1232012320
v 0.0065 3.4956 -0.0256
12321-
v -0.0000 3.4740 -0.0267
12321+
v 0.0000 3.4740 -0.0267
1232212322
v 0.0100 3.4959 -0.0292
1232312323
v 0.0021 3.4651 -0.0338
1232412324
v 0.0084 3.4954 -0.0335
@@ -18042,7 +18042,7 @@ vn 0.1913 -0.1975 -0.9615
1804218042
vn 0.1902 -0.1399 -0.9717
1804318043
vn 0.2122 -0.1423 -0.9668
1804418044
vn -0.0089 -0.9958 -0.0909
18045-
vn -0.0000 -0.9960 -0.0891
18045+
vn 0.0000 -0.9960 -0.0891
1804618046
vn -0.0002 -0.9961 -0.0880
1804718047
vn -0.0128 -0.9951 -0.0983
1804818048
vn -0.0721 -0.9888 -0.1308
@@ -111560,90 +111560,3 @@ f 20155/25608/28834 20195/25610/28874 20154/25607/28833
111560111560
f 20194/25615/28873 20158/25614/28837 20195/25610/28874
111561111561
# 6232 faces
111562111562

111563-
#
111564-
# object Object002
111565-
#
111566-
111567-
v 0.0737 3.6297 0.7688
111568-
v 0.0436 3.6250 0.7664
111569-
v 0.0723 3.6145 0.7647
111570-
v 0.0671 3.6437 0.7723
111571-
v 0.0632 3.6021 0.7611
111572-
v 0.0541 3.6526 0.7742
111573-
v 0.0488 3.5958 0.7588
111574-
v 0.0384 3.6542 0.7740
111575-
v 0.0330 3.5973 0.7586
111576-
v 0.0240 3.6479 0.7718
111577-
v 0.0201 3.6063 0.7605
111578-
v 0.0149 3.6355 0.7681
111579-
v 0.0134 3.6202 0.7640
111580-
v -0.1408 3.5820 0.7431
111581-
v -0.1174 3.6004 0.7501
111582-
v -0.1474 3.5960 0.7464
111583-
v -0.1460 3.6112 0.7507
111584-
v -0.1279 3.5730 0.7417
111585-
v -0.1369 3.6235 0.7548
111586-
v -0.1121 3.5712 0.7425
111587-
v -0.1226 3.6296 0.7577
111588-
v -0.0978 3.5774 0.7454
111589-
v -0.1069 3.6279 0.7585
111590-
v -0.0887 3.5897 0.7495
111591-
v -0.0939 3.6189 0.7571
111592-
v -0.0873 3.6049 0.7538
111593-
# 26 vertices
111594-
111595-
vn -0.0365 -0.2575 0.9656
111596-
vn -0.0365 -0.2576 0.9656
111597-
vn -0.0365 -0.2574 0.9656
111598-
vn -0.0364 -0.2575 0.9656
111599-
vn -0.0794 -0.2641 0.9612
111600-
vn -0.0794 -0.2640 0.9612
111601-
vn -0.0794 -0.2640 0.9613
111602-
vn -0.0795 -0.2640 0.9612
111603-
vn -0.0793 -0.2640 0.9612
111604-
vn -0.0793 -0.2641 0.9612
111605-
# 10 vertex normals
111606-
111607-
vt 0.6797 0.8697 0.0000
111608-
vt 0.5508 0.8674 0.0000
111609-
vt 0.6602 0.9341 0.0000
111610-
vt 0.6641 0.8047 0.0000
111611-
vt 0.6133 0.9806 0.0000
111612-
vt 0.6172 0.7565 0.0000
111613-
vt 0.5469 0.9968 0.0000
111614-
vt 0.5527 0.7380 0.0000
111615-
vt 0.4844 0.9784 0.0000
111616-
vt 0.4883 0.7542 0.0000
111617-
vt 0.4375 0.9302 0.0000
111618-
vt 0.4395 0.8007 0.0000
111619-
vt 0.4199 0.8651 0.0000
111620-
# 13 texture coords
111621-
111622-
o Object002
111623-
g Object002
111624-
f 20196/25650/28875 20197/25651/28875 20198/25652/28876
111625-
f 20199/25653/28877 20197/25651/28875 20196/25650/28875
111626-
f 20198/25652/28876 20197/25651/28875 20200/25654/28878
111627-
f 20201/25655/28875 20197/25651/28875 20199/25653/28877
111628-
f 20200/25654/28878 20197/25651/28875 20202/25656/28875
111629-
f 20203/25657/28875 20197/25651/28875 20201/25655/28875
111630-
f 20202/25656/28875 20197/25651/28875 20204/25658/28875
111631-
f 20205/25659/28878 20197/25651/28875 20203/25657/28875
111632-
f 20204/25658/28875 20197/25651/28875 20206/25660/28875
111633-
f 20207/25661/28876 20197/25651/28875 20205/25659/28878
111634-
f 20206/25660/28875 20197/25651/28875 20208/25662/28876
111635-
f 20208/25662/28876 20197/25651/28875 20207/25661/28876
111636-
f 20209/25652/28879 20210/25651/28880 20211/25650/28879
111637-
f 20211/25650/28879 20210/25651/28880 20212/25653/28881
111638-
f 20213/25654/28882 20210/25651/28880 20209/25652/28879
111639-
f 20212/25653/28881 20210/25651/28880 20214/25655/28880
111640-
f 20215/25656/28880 20210/25651/28880 20213/25654/28882
111641-
f 20214/25655/28880 20210/25651/28880 20216/25657/28880
111642-
f 20217/25658/28883 20210/25651/28880 20215/25656/28880
111643-
f 20216/25657/28880 20210/25651/28880 20218/25659/28882
111644-
f 20219/25660/28880 20210/25651/28880 20217/25658/28883
111645-
f 20218/25659/28882 20210/25651/28880 20220/25661/28879
111646-
f 20220/25661/28879 20210/25651/28880 20221/25662/28884
111647-
f 20221/25662/28884 20210/25651/28880 20219/25660/28880
111648-
# 24 faces
111649-

examples/resources/meshes/eyes.obj

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
2+
# File Created: 08.12.2024 15:25:12
3+
4+
#
5+
# object Object002
6+
#
7+
8+
v 0.0737 3.6297 0.7688
9+
v 0.0436 3.6250 0.7664
10+
v 0.0723 3.6145 0.7647
11+
v 0.0671 3.6437 0.7723
12+
v 0.0632 3.6021 0.7611
13+
v 0.0541 3.6526 0.7742
14+
v 0.0488 3.5958 0.7588
15+
v 0.0384 3.6542 0.7740
16+
v 0.0330 3.5973 0.7586
17+
v 0.0240 3.6479 0.7718
18+
v 0.0201 3.6063 0.7605
19+
v 0.0149 3.6355 0.7681
20+
v 0.0134 3.6202 0.7640
21+
v -0.1408 3.5820 0.7431
22+
v -0.1174 3.6004 0.7501
23+
v -0.1474 3.5960 0.7464
24+
v -0.1460 3.6112 0.7507
25+
v -0.1279 3.5730 0.7417
26+
v -0.1369 3.6235 0.7548
27+
v -0.1121 3.5712 0.7425
28+
v -0.1226 3.6296 0.7577
29+
v -0.0978 3.5774 0.7454
30+
v -0.1069 3.6279 0.7585
31+
v -0.0887 3.5897 0.7495
32+
v -0.0939 3.6189 0.7571
33+
v -0.0873 3.6049 0.7538
34+
# 26 vertices
35+
36+
vn -0.0365 -0.2575 0.9656
37+
vn -0.0365 -0.2576 0.9656
38+
vn -0.0365 -0.2574 0.9656
39+
vn -0.0364 -0.2575 0.9656
40+
vn -0.0794 -0.2641 0.9612
41+
vn -0.0794 -0.2640 0.9612
42+
vn -0.0794 -0.2640 0.9613
43+
vn -0.0795 -0.2640 0.9612
44+
vn -0.0793 -0.2640 0.9612
45+
vn -0.0793 -0.2641 0.9612
46+
# 10 vertex normals
47+
48+
vt 0.6797 0.8697 0.0000
49+
vt 0.5508 0.8674 0.0000
50+
vt 0.6602 0.9341 0.0000
51+
vt 0.6641 0.8047 0.0000
52+
vt 0.6133 0.9806 0.0000
53+
vt 0.6172 0.7565 0.0000
54+
vt 0.5469 0.9968 0.0000
55+
vt 0.5527 0.7380 0.0000
56+
vt 0.4844 0.9784 0.0000
57+
vt 0.4883 0.7542 0.0000
58+
vt 0.4375 0.9302 0.0000
59+
vt 0.4395 0.8007 0.0000
60+
vt 0.4199 0.8651 0.0000
61+
# 13 texture coords
62+
63+
o Object002
64+
g Object002
65+
f 1/1/1 2/2/1 3/3/2
66+
f 4/4/3 2/2/1 1/1/1
67+
f 3/3/2 2/2/1 5/5/4
68+
f 6/6/1 2/2/1 4/4/3
69+
f 5/5/4 2/2/1 7/7/1
70+
f 8/8/1 2/2/1 6/6/1
71+
f 7/7/1 2/2/1 9/9/1
72+
f 10/10/4 2/2/1 8/8/1
73+
f 9/9/1 2/2/1 11/11/1
74+
f 12/12/2 2/2/1 10/10/4
75+
f 11/11/1 2/2/1 13/13/2
76+
f 13/13/2 2/2/1 12/12/2
77+
f 14/3/5 15/2/6 16/1/5
78+
f 16/1/5 15/2/6 17/4/7
79+
f 18/5/8 15/2/6 14/3/5
80+
f 17/4/7 15/2/6 19/6/6
81+
f 20/7/6 15/2/6 18/5/8
82+
f 19/6/6 15/2/6 21/8/6
83+
f 22/9/9 15/2/6 20/7/6
84+
f 21/8/6 15/2/6 23/10/8
85+
f 24/11/6 15/2/6 22/9/9
86+
f 23/10/8 15/2/6 25/12/5
87+
f 25/12/5 15/2/6 26/13/10
88+
f 26/13/10 15/2/6 24/11/6
89+
# 24 faces
90+

0 commit comments

Comments
 (0)