Added much nicer scene

2 files changed, 24 insertions, 15 deletions

diff --git a/main.c b/main.c
index 3b7218c..78117d5 100644
--- a/main.c
+++ b/main.c
@@ -20,22 +20,29 @@ int main()
 	// Currently havin issues with white background
 	// color_set(&s.back, 255, 255, 255);
 	color_set(&s.back, 0.8, 0.8, 0.8);
-	color_set(&s.env_color, 0.1, 0.1, 0.1);
+	color_set(&s.env_color, 0.13, 0.13, 0.13);
 	s.env_samples = 256;
 
 	material_t m;
-	vector_set(&m.color, 1, 1, 1);
-	m.defuse = 0.0;
+	vector_set(&m.color, 0.4, 0.4, 1);
+	m.defuse = 1;
 	m.specular = 0.0;
 	m.shine = 80;
-	m.reflective = 0.5;
+	m.reflective = 0.0;
+
+	material_t m3;
+	vector_set(&m3.color, 1, 0.3, 0.1);
+	m3.defuse = 0.95;
+	m3.specular = 0.0;
+	m3.shine = 80;
+	m3.reflective = 0.05;
 
 	material_t m2;
-	vector_set(&m2.color, 0.1, 1, 0.7);
-	m2.defuse = 0.9;
-	m2.specular = 1;
-	m2.shine = 60;
-	m2.reflective = 0.1;
+	vector_set(&m2.color, 1, 1, 1);
+	m2.defuse = 0.0;
+	m2.specular = 0.5;
+	m2.shine = 80;
+	m2.reflective = 1;
 
 	material_t mpl;
 	//vector_set(&mpl.color, 0, 0.396, 0.7019);
@@ -45,20 +52,22 @@ int main()
 	mpl.shine = 50;
 	mpl.reflective = 0.0;
 
-	vector_set(&s.view.position, 0, 14, 5);
-	vector_set(&s.view.target, 0, 0, 5);
+	vector_set(&s.view.position, 0, 16, 6);
+	vector_set(&s.view.target, 0, 0, 6);
 	s.view.width = TESTW;
 	s.view.height = TESTH;
 
 	viewpoint_init(&s.view);
 	
 	// Setup plane
-	add_sphere(&s, vector_set(NULL, 0, 4, 5), 5, &m2);
-	add_sphere(&s, vector_set(NULL, 8, 8, 3), 2, &m2);
+	add_sphere(&s, vector_set(NULL, 0, 4, 7), 5, &m2);
+	add_sphere(&s, vector_set(NULL, 8, 8, 4), 2, &m3);
+	add_sphere(&s, vector_set(NULL, -10, 9, 5), 3, &m);
+	add_sphere(&s, vector_set(NULL, -10, -5, 5), 3, &m);
 	add_plane(&s, vector_set(NULL, 0, 0, 2), vector_set(NULL, 0, 0, 1), &mpl);
 	//add_plane(&s, vector_set(NULL, 0, -20, 0), vector_set(NULL, 0, 1, 0), &mpl);
-	add_light(&s, vector_set(NULL, 20, 10, 30), color_set(NULL, 0.2, 0.2, 0.2), color_set(NULL, 0.5, 0.5, 0.5));
-	add_light(&s, vector_set(NULL, 0, 10, 20), color_set(NULL, 0.5, 0.5, 0.5), color_set(NULL, 0.5, 0.5, 0.5));
+	add_light(&s, vector_set(NULL, 20, 10, 30), color_set(NULL, 0.3, 0.3, 0.3), color_set(NULL, 0.5, 0.5, 0.5));
+	//add_light(&s, vector_set(NULL, 0, 10, 20), color_set(NULL, 0.5, 0.5, 0.5), color_set(NULL, 0.5, 0.5, 0.5));
 
 	pgm_write_header(stdout, TESTW, TESTH);
 
diff --git a/test.png b/test.png
index 1f32799..ebf847f 100644
--- a/test.png
+++ b/test.png