Skip to content

Commit 8f4879e

Browse files
committed
Update scene
1 parent d9fa820 commit 8f4879e

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

sample/scene/furnace_test.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ std::unique_ptr<Camera> FurnacePrincipled(Scene& scene)
7676
// Float aspect_ratio = 3.f / 2.f;
7777
// Float aspect_ratio = 4.f / 3.f;
7878
// Float aspect_ratio = 1.f;
79-
int32 width = 1000;
79+
int32 width = 1600;
8080
int32 height = int32(width / aspect_ratio);
8181

8282
Point3 lookfrom = Point3{ 0, 1.0, 2.28 };
@@ -124,10 +124,10 @@ std::unique_ptr<Camera> FurnaceDielectric(Scene& scene)
124124
bool energy_compensation = true;
125125

126126
outers[3] = CreateDielectricMaterial(scene, ior, 0.0f, color, energy_compensation);
127-
outers[1] = CreateDielectricMaterial(scene, ior, 0.25f, color, energy_compensation);
128-
outers[0] = CreateDielectricMaterial(scene, ior, 0.5f, color, energy_compensation);
129-
outers[2] = CreateDielectricMaterial(scene, ior, 0.75f, color, energy_compensation);
130-
outers[4] = CreateDielectricMaterial(scene, ior, 1.0f, color, energy_compensation);
127+
outers[1] = CreateDielectricMaterial(scene, ior, 0.01f, color, energy_compensation);
128+
outers[0] = CreateDielectricMaterial(scene, ior, 0.05f, color, energy_compensation);
129+
outers[2] = CreateDielectricMaterial(scene, ior, 0.1f, color, energy_compensation);
130+
outers[4] = CreateDielectricMaterial(scene, ior, 0.2f, color, energy_compensation);
131131

132132
const Material* inners[count];
133133
for (int32 i = 0; i < count; ++i)
@@ -158,16 +158,16 @@ std::unique_ptr<Camera> FurnaceDielectric(Scene& scene)
158158
}
159159
}
160160

161-
CreateUniformInfiniteLight(scene, Spectrum(1));
162-
// CreateImageInfiniteLight(scene, "res/HDR/aerodynamics_workshop_1k.hdr", Transform(Quat(pi, y_axis)));
161+
// CreateUniformInfiniteLight(scene, Spectrum(1));
162+
CreateImageInfiniteLight(scene, "res/HDR/aerodynamics_workshop_1k.hdr", Transform(Quat(pi, y_axis)));
163163
// CreateImageInfiniteLight(scene, "res/HDR/peppermint_powerplant_4k.hdr", Transform(Quat(pi / 2, y_axis)));
164164

165165
Float aspect_ratio = 4.f / 1.f;
166166
// Float aspect_ratio = 9.f / 16.f;
167167
// Float aspect_ratio = 3.f / 2.f;
168168
// Float aspect_ratio = 4.f / 3.f;
169169
// Float aspect_ratio = 1.f;
170-
int32 width = 1000;
170+
int32 width = 1600;
171171
int32 height = int32(width / aspect_ratio);
172172

173173
Point3 lookfrom = Point3{ 0, 1.0, 2.28 };
@@ -259,7 +259,7 @@ std::unique_ptr<Camera> FurnaceConductor(Scene& scene)
259259
// Float aspect_ratio = 3.f / 2.f;
260260
// Float aspect_ratio = 4.f / 3.f;
261261
// Float aspect_ratio = 1.f;
262-
int32 width = 1000;
262+
int32 width = 1600;
263263
int32 height = int32(width / aspect_ratio);
264264

265265
Point3 lookfrom = Point3{ 0, 1.0, 2.28 };

sample/scene/material_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ std::unique_ptr<Camera> MaterialTest(Scene& scene)
2222
const Material* white = CreateDiffuseMaterial(scene, 1.0f);
2323
const Material* air = CreateDielectricMaterial(scene, 1.0f);
2424
const Material* glass = CreateDielectricMaterial(scene, 1.5f);
25-
const Material* rough_glass = CreateDielectricMaterial(scene, 1.5f, 0.05f);
25+
const Material* rough_glass = CreateDielectricMaterial(scene, 1.5f, 0.01f);
2626
const Material* copper = CreateConductorMaterial(scene, { 0.21100, 1.1274, 1.2444 }, { 4.1592, 2.5978, 2.433 }, 0.2f);
2727
const Material* patina = CreateLayeredMaterial(scene, air, copper, true, { 0.25f, 0.95f, 0.45f }, 0.2, 0.1f);
2828
const Material* gold = CreateConductorMaterial(scene, { 0.161, 0.492, 1.426 }, { 4.08769, 2.32625, 1.846 }, 0.1f);
2929
const Material* platinum = CreateConductorMaterial(scene, { 0.49745, 0.48267, 0.60399 }, { 6.9266, 4.8444, 3.8895 }, 0.1f);
3030

31-
const Material* outer = CreateLayeredMaterial(scene, glass, platinum, true, Spectrum(0.7, 0, 0), 0.2f);
31+
const Material* outer = CreateLayeredMaterial(scene, rough_glass, gold, true, Spectrum(0.7, 0, 0), 0.2f, -0.3f);
3232
const Material* inner = CreateDiffuseMaterial(scene, 0.8f, 0.0f);
3333

3434
// auto tf = Transform{ o, Quat::FromEuler({ 0, pi / 6, 0 }), Vec3(2) };

0 commit comments

Comments
 (0)