eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add back a bunch of the programatic scene stuff

Browse source
This commit is contained in:
Eryn Wells 2014-07-13 20:11:37 -07:00
parent 3687029bcd
commit 6a8bcc4973
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/charles.cc
View file

@ -29,9 +29,8 @@ int
main(int argc, main(int argc,
const char *argv[]) const char *argv[])
{ {
Scene scene = Scene(); Scene scene;
#if 0
scene.get_ambient().set_intensity(1.0); scene.get_ambient().set_intensity(1.0);
Material *m1 = new Material(); Material *m1 = new Material();
@ -56,24 +55,18 @@ main(int argc,
scene.add_shape(s2); scene.add_shape(s2);
scene.add_shape(s3); scene.add_shape(s3);
scene.add_shape(s4); scene.add_shape(s4);
#if 0
// Make a plane // Make a plane
/* /*
Plane *p1 = new Plane(Vector3(0, 460, 400), Vector3(0, 1, 0.01)); Plane *p1 = new Plane(Vector3(0, 460, 400), Vector3(0, 1, 0.01));
p1->set_material(m1); p1->set_material(m1);
scene.add_shape(p1); scene.add_shape(p1);
*/ */
#endif
PointLight *l1 = new PointLight(Vector3(0.0, 240.0, 100.0), Color::White, 1.0); PointLight *l1 = new PointLight(Vector3(0.0, 240.0, 100.0), Color::White, 1.0);
scene.add_light(l1); scene.add_light(l1);
// Render.
scene.render();
Writer *writer = new PNGWriter();
scene.write(*writer, OUT_FILE);
#endif
std::string outfile, infile; std::string outfile, infile;
int opt; int opt;
@ -104,8 +97,13 @@ main(int argc,
for (int i = optind; i < argc; i++) { for (int i = optind; i < argc; i++) {
reader.read_file(infile); reader.read_file(infile);
} }
/* TODO: Call tracer. */
/* TODO: Write rendered scene to PNG file. */ /* Call tracer. */
scene.render();
/* Write rendered scene to PNG file. */
PNGWriter writer;
scene.write(writer, outfile);
return 0; return 0;
} }