Skip to content

Commit 4cff756

Browse files
author
Cheng Xie
committed
Temp commit for data transfer, don't checkout
1 parent 753aa15 commit 4cff756

26 files changed

+406
-163
lines changed

‎src/common.h

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class Scene;
4040
class CameraController;
4141
class Texture;
4242
class MeshRenderer;
43+
class Mesh;
4344

4445
inline float randf() {
4546
return (float)rand() / RAND_MAX * 2 - 1;

‎src/models/cube.obj

+16-100
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ vt 0.000000 0.000000
4848
vt 1.000000 0.000000
4949
vt 0.000000 0.000000
5050
vt 1.000000 1.000000
51-
vn 0.000000 0.000000 -1.000000
52-
vn 0.000000 0.000000 -1.000000
53-
vn 0.000000 0.000000 -1.000000
54-
vn 0.000000 0.000000 -1.000000
55-
vn 0.000000 -1.000000 0.000000
56-
vn 0.000000 -1.000000 0.000000
57-
vn 0.000000 -1.000000 0.000000
58-
vn 0.000000 -1.000000 0.000000
5951
vn 0.000000 0.000000 1.000000
6052
vn 0.000000 0.000000 1.000000
6153
vn 0.000000 0.000000 1.000000
@@ -64,74 +56,6 @@ vn 0.000000 1.000000 0.000000
6456
vn 0.000000 1.000000 0.000000
6557
vn 0.000000 1.000000 0.000000
6658
vn 0.000000 1.000000 0.000000
67-
vn -1.000000 0.000000 0.000000
68-
vn -1.000000 0.000000 0.000000
69-
vn -1.000000 0.000000 0.000000
70-
vn -1.000000 0.000000 0.000000
71-
vn 1.000000 0.000000 0.000000
72-
vn 1.000000 0.000000 0.000000
73-
vn 1.000000 0.000000 0.000000
74-
vn 1.000000 0.000000 0.000000
75-
f 10/4/1 14/14/2 12/10/3
76-
f 12/10/3 14/14/2 16/12/4
77-
f 13/3/5 18/9/6 4/5/7
78-
f 4/5/7 18/9/6 20/6/8
79-
f 17/15/9 22/23/10 6/17/11
80-
f 6/17/11 22/23/10 24/22/12
81-
f 21/13/13 9/21/14 8/18/15
82-
f 8/18/15 9/21/14 2/19/16
83-
f 11/1/17 15/8/18 23/2/19
84-
f 23/2/19 15/8/18 19/7/20
85-
f 7/11/21 5/24/22 1/16/23
86-
f 1/16/23 5/24/22 3/20/24
87-
v -0.250000 -0.250000 0.250000
88-
v 0.250000 -0.250000 0.250000
89-
v -0.250000 0.250000 0.250000
90-
v 0.250000 0.250000 0.250000
91-
v -0.250000 0.250000 -0.250000
92-
v 0.250000 0.250000 -0.250000
93-
v -0.250000 -0.250000 -0.250000
94-
v 0.250000 -0.250000 -0.250000
95-
v -0.250000 -0.250000 0.250000
96-
v -0.250000 -0.250000 0.250000
97-
v 0.250000 -0.250000 0.250000
98-
v 0.250000 -0.250000 0.250000
99-
v -0.250000 0.250000 0.250000
100-
v -0.250000 0.250000 0.250000
101-
v 0.250000 0.250000 0.250000
102-
v 0.250000 0.250000 0.250000
103-
v -0.250000 0.250000 -0.250000
104-
v -0.250000 0.250000 -0.250000
105-
v 0.250000 0.250000 -0.250000
106-
v 0.250000 0.250000 -0.250000
107-
v -0.250000 -0.250000 -0.250000
108-
v -0.250000 -0.250000 -0.250000
109-
v 0.250000 -0.250000 -0.250000
110-
v 0.250000 -0.250000 -0.250000
111-
vt 0.000000 0.000000
112-
vt 1.000000 0.000000
113-
vt 0.000000 0.000000
114-
vt 0.000000 0.000000
115-
vt 1.000000 0.000000
116-
vt 1.000000 1.000000
117-
vt 1.000000 1.000000
118-
vt 0.000000 1.000000
119-
vt 0.000000 1.000000
120-
vt 1.000000 0.000000
121-
vt 1.000000 0.000000
122-
vt 1.000000 1.000000
123-
vt 0.000000 1.000000
124-
vt 0.000000 1.000000
125-
vt 0.000000 1.000000
126-
vt 0.000000 0.000000
127-
vt 1.000000 1.000000
128-
vt 1.000000 1.000000
129-
vt 1.000000 0.000000
130-
vt 0.000000 1.000000
131-
vt 0.000000 0.000000
132-
vt 1.000000 0.000000
133-
vt 0.000000 0.000000
134-
vt 1.000000 1.000000
13559
vn 0.000000 0.000000 -1.000000
13660
vn 0.000000 0.000000 -1.000000
13761
vn 0.000000 0.000000 -1.000000
@@ -140,31 +64,23 @@ vn 0.000000 -1.000000 0.000000
14064
vn 0.000000 -1.000000 0.000000
14165
vn 0.000000 -1.000000 0.000000
14266
vn 0.000000 -1.000000 0.000000
143-
vn 0.000000 0.000000 1.000000
144-
vn 0.000000 0.000000 1.000000
145-
vn 0.000000 0.000000 1.000000
146-
vn 0.000000 0.000000 1.000000
147-
vn 0.000000 1.000000 0.000000
148-
vn 0.000000 1.000000 0.000000
149-
vn 0.000000 1.000000 0.000000
150-
vn 0.000000 1.000000 0.000000
151-
vn -1.000000 0.000000 0.000000
152-
vn -1.000000 0.000000 0.000000
153-
vn -1.000000 0.000000 0.000000
154-
vn -1.000000 0.000000 0.000000
15567
vn 1.000000 0.000000 0.000000
15668
vn 1.000000 0.000000 0.000000
15769
vn 1.000000 0.000000 0.000000
15870
vn 1.000000 0.000000 0.000000
159-
f 34/28/25 38/38/26 36/34/27
160-
f 36/34/27 38/38/26 40/36/28
161-
f 37/27/29 42/33/30 28/29/31
162-
f 28/29/31 42/33/30 44/30/32
163-
f 41/39/33 46/47/34 30/41/35
164-
f 30/41/35 46/47/34 48/46/36
165-
f 45/37/37 33/45/38 32/42/39
166-
f 32/42/39 33/45/38 26/43/40
167-
f 35/25/41 39/32/42 47/26/43
168-
f 47/26/43 39/32/42 43/31/44
169-
f 31/35/45 29/48/46 25/40/47
170-
f 25/40/47 29/48/46 27/44/48
71+
vn -1.000000 0.000000 0.000000
72+
vn -1.000000 0.000000 0.000000
73+
vn -1.000000 0.000000 0.000000
74+
vn -1.000000 0.000000 0.000000
75+
f 10/4/1 12/10/2 14/14/3
76+
f 12/10/2 16/12/4 14/14/3
77+
f 13/3/5 4/5/6 18/9/7
78+
f 4/5/6 20/6/8 18/9/7
79+
f 17/15/9 6/17/10 22/23/11
80+
f 6/17/10 24/22/12 22/23/11
81+
f 21/13/13 8/18/14 9/21/15
82+
f 8/18/14 2/19/16 9/21/15
83+
f 11/1/17 23/2/18 15/8/19
84+
f 23/2/18 19/7/20 15/8/19
85+
f 7/11/21 1/16/22 5/24/23
86+
f 1/16/22 3/20/24 5/24/23

‎src/models/skybox.obj

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
# This file uses centimeters as units for non-parametric coordinates.
2+
3+
v -0.250000 -0.250000 0.250000
4+
v 0.250000 -0.250000 0.250000
5+
v -0.250000 0.250000 0.250000
6+
v 0.250000 0.250000 0.250000
7+
v -0.250000 0.250000 -0.250000
8+
v 0.250000 0.250000 -0.250000
9+
v -0.250000 -0.250000 -0.250000
10+
v 0.250000 -0.250000 -0.250000
11+
v -0.250000 -0.250000 0.250000
12+
v -0.250000 -0.250000 0.250000
13+
v 0.250000 -0.250000 0.250000
14+
v 0.250000 -0.250000 0.250000
15+
v -0.250000 0.250000 0.250000
16+
v -0.250000 0.250000 0.250000
17+
v 0.250000 0.250000 0.250000
18+
v 0.250000 0.250000 0.250000
19+
v -0.250000 0.250000 -0.250000
20+
v -0.250000 0.250000 -0.250000
21+
v 0.250000 0.250000 -0.250000
22+
v 0.250000 0.250000 -0.250000
23+
v -0.250000 -0.250000 -0.250000
24+
v -0.250000 -0.250000 -0.250000
25+
v 0.250000 -0.250000 -0.250000
26+
v 0.250000 -0.250000 -0.250000
27+
vt 0.000000 0.000000
28+
vt 1.000000 0.000000
29+
vt 0.000000 0.000000
30+
vt 0.000000 0.000000
31+
vt 1.000000 0.000000
32+
vt 1.000000 1.000000
33+
vt 1.000000 1.000000
34+
vt 0.000000 1.000000
35+
vt 0.000000 1.000000
36+
vt 1.000000 0.000000
37+
vt 1.000000 0.000000
38+
vt 1.000000 1.000000
39+
vt 0.000000 1.000000
40+
vt 0.000000 1.000000
41+
vt 0.000000 1.000000
42+
vt 0.000000 0.000000
43+
vt 1.000000 1.000000
44+
vt 1.000000 1.000000
45+
vt 1.000000 0.000000
46+
vt 0.000000 1.000000
47+
vt 0.000000 0.000000
48+
vt 1.000000 0.000000
49+
vt 0.000000 0.000000
50+
vt 1.000000 1.000000
51+
vn 0.000000 0.000000 -1.000000
52+
vn 0.000000 0.000000 -1.000000
53+
vn 0.000000 0.000000 -1.000000
54+
vn 0.000000 0.000000 -1.000000
55+
vn 0.000000 -1.000000 0.000000
56+
vn 0.000000 -1.000000 0.000000
57+
vn 0.000000 -1.000000 0.000000
58+
vn 0.000000 -1.000000 0.000000
59+
vn 0.000000 0.000000 1.000000
60+
vn 0.000000 0.000000 1.000000
61+
vn 0.000000 0.000000 1.000000
62+
vn 0.000000 0.000000 1.000000
63+
vn 0.000000 1.000000 0.000000
64+
vn 0.000000 1.000000 0.000000
65+
vn 0.000000 1.000000 0.000000
66+
vn 0.000000 1.000000 0.000000
67+
vn -1.000000 0.000000 0.000000
68+
vn -1.000000 0.000000 0.000000
69+
vn -1.000000 0.000000 0.000000
70+
vn -1.000000 0.000000 0.000000
71+
vn 1.000000 0.000000 0.000000
72+
vn 1.000000 0.000000 0.000000
73+
vn 1.000000 0.000000 0.000000
74+
vn 1.000000 0.000000 0.000000
75+
f 10/4/1 14/14/2 12/10/3
76+
f 12/10/3 14/14/2 16/12/4
77+
f 13/3/5 18/9/6 4/5/7
78+
f 4/5/7 18/9/6 20/6/8
79+
f 17/15/9 22/23/10 6/17/11
80+
f 6/17/11 22/23/10 24/22/12
81+
f 21/13/13 9/21/14 8/18/15
82+
f 8/18/15 9/21/14 2/19/16
83+
f 11/1/17 15/8/18 23/2/19
84+
f 23/2/19 15/8/18 19/7/20
85+
f 7/11/21 5/24/22 1/16/23
86+
f 1/16/23 5/24/22 3/20/24
87+
v -0.250000 -0.250000 0.250000
88+
v 0.250000 -0.250000 0.250000
89+
v -0.250000 0.250000 0.250000
90+
v 0.250000 0.250000 0.250000
91+
v -0.250000 0.250000 -0.250000
92+
v 0.250000 0.250000 -0.250000
93+
v -0.250000 -0.250000 -0.250000
94+
v 0.250000 -0.250000 -0.250000
95+
v -0.250000 -0.250000 0.250000
96+
v -0.250000 -0.250000 0.250000
97+
v 0.250000 -0.250000 0.250000
98+
v 0.250000 -0.250000 0.250000
99+
v -0.250000 0.250000 0.250000
100+
v -0.250000 0.250000 0.250000
101+
v 0.250000 0.250000 0.250000
102+
v 0.250000 0.250000 0.250000
103+
v -0.250000 0.250000 -0.250000
104+
v -0.250000 0.250000 -0.250000
105+
v 0.250000 0.250000 -0.250000
106+
v 0.250000 0.250000 -0.250000
107+
v -0.250000 -0.250000 -0.250000
108+
v -0.250000 -0.250000 -0.250000
109+
v 0.250000 -0.250000 -0.250000
110+
v 0.250000 -0.250000 -0.250000
111+
vt 0.000000 0.000000
112+
vt 1.000000 0.000000
113+
vt 0.000000 0.000000
114+
vt 0.000000 0.000000
115+
vt 1.000000 0.000000
116+
vt 1.000000 1.000000
117+
vt 1.000000 1.000000
118+
vt 0.000000 1.000000
119+
vt 0.000000 1.000000
120+
vt 1.000000 0.000000
121+
vt 1.000000 0.000000
122+
vt 1.000000 1.000000
123+
vt 0.000000 1.000000
124+
vt 0.000000 1.000000
125+
vt 0.000000 1.000000
126+
vt 0.000000 0.000000
127+
vt 1.000000 1.000000
128+
vt 1.000000 1.000000
129+
vt 1.000000 0.000000
130+
vt 0.000000 1.000000
131+
vt 0.000000 0.000000
132+
vt 1.000000 0.000000
133+
vt 0.000000 0.000000
134+
vt 1.000000 1.000000
135+
vn 0.000000 0.000000 -1.000000
136+
vn 0.000000 0.000000 -1.000000
137+
vn 0.000000 0.000000 -1.000000
138+
vn 0.000000 0.000000 -1.000000
139+
vn 0.000000 -1.000000 0.000000
140+
vn 0.000000 -1.000000 0.000000
141+
vn 0.000000 -1.000000 0.000000
142+
vn 0.000000 -1.000000 0.000000
143+
vn 0.000000 0.000000 1.000000
144+
vn 0.000000 0.000000 1.000000
145+
vn 0.000000 0.000000 1.000000
146+
vn 0.000000 0.000000 1.000000
147+
vn 0.000000 1.000000 0.000000
148+
vn 0.000000 1.000000 0.000000
149+
vn 0.000000 1.000000 0.000000
150+
vn 0.000000 1.000000 0.000000
151+
vn -1.000000 0.000000 0.000000
152+
vn -1.000000 0.000000 0.000000
153+
vn -1.000000 0.000000 0.000000
154+
vn -1.000000 0.000000 0.000000
155+
vn 1.000000 0.000000 0.000000
156+
vn 1.000000 0.000000 0.000000
157+
vn 1.000000 0.000000 0.000000
158+
vn 1.000000 0.000000 0.000000
159+
f 34/28/25 38/38/26 36/34/27
160+
f 36/34/27 38/38/26 40/36/28
161+
f 37/27/29 42/33/30 28/29/31
162+
f 28/29/31 42/33/30 44/30/32
163+
f 41/39/33 46/47/34 30/41/35
164+
f 30/41/35 46/47/34 48/46/36
165+
f 45/37/37 33/45/38 32/42/39
166+
f 32/42/39 33/45/38 26/43/40
167+
f 35/25/41 39/32/42 47/26/43
168+
f 47/26/43 39/32/42 43/31/44
169+
f 31/35/45 29/48/46 25/40/47
170+
f 25/40/47 29/48/46 27/44/48

‎src/phongmaterial.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ void PhongMaterial::setShiness(float shiness)
7171
{
7272
shiness_ = shiness;
7373
}
74-
const Texture *PhongMaterial::diffuseMap() const
75-
{
76-
return diffuseMap_;
77-
}
7874

7975
void PhongMaterial::setDiffuseMap(Texture *diffuseMap)
8076
{

‎src/phongmaterial.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class PhongMaterial : public Material
2323
float shiness() const;
2424
void setShiness(float shiness);
2525

26-
const Texture *diffuseMap() const;
2726
void setDiffuseMap(Texture *diffuseMap);
2827

2928
private:

0 commit comments

Comments
 (0)