# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1400887244 -10800
# Node ID 9621beb22694aeff3a0ad5e8526cb7370a47d924
# Parent  93894c232d650171727e6cfd655a4e53dd776e1b
huh?

diff -r 93894c232d65 -r 9621beb22694 liberebus/src/camera.cc
--- a/liberebus/src/camera.cc	Tue Apr 29 07:38:40 2014 +0300
+++ b/liberebus/src/camera.cc	Sat May 24 02:20:44 2014 +0300
@@ -10,6 +10,7 @@
 	cached_matrix_valid = false;
 
 	rdir_cache_width = rdir_cache_height = 0;
+	rdir_cache_fov = 0;
 	rdir_cache = 0;
 }
 
@@ -20,6 +21,7 @@
 	cached_matrix_valid = false;
 
 	rdir_cache_width = rdir_cache_height = 0;
+	rdir_cache_fov = 0;
 	rdir_cache = 0;
 }
 
@@ -31,9 +33,6 @@
 void Camera::set_fov(float vfov)
 {
 	this->vfov = vfov;
-
-	// invalidate the dir cache
-	delete [] rdir_cache;
 }
 
 float Camera::get_fov() const
@@ -80,8 +79,9 @@
 {
 #pragma omp single
 	{
-		if(!rdir_cache || rdir_cache_width != xsz || rdir_cache_height != ysz) {
-			printf("calculating primary ray direction cache\n");
+		if(!rdir_cache || rdir_cache_width != xsz || rdir_cache_height != ysz ||
+				fabs(rdir_cache_fov - vfov) > 1e-4) {
+			printf("calculating primary ray direction cache (%dx%d)\n", xsz, ysz);
 
 			delete [] rdir_cache;
 			rdir_cache = new Vector3[xsz * ysz];
@@ -102,6 +102,7 @@
 			}
 			rdir_cache_width = xsz;
 			rdir_cache_height = ysz;
+			rdir_cache_fov = vfov;
 		}
 	}
 
diff -r 93894c232d65 -r 9621beb22694 liberebus/src/camera.h
--- a/liberebus/src/camera.h	Tue Apr 29 07:38:40 2014 +0300
+++ b/liberebus/src/camera.h	Sat May 24 02:20:44 2014 +0300
@@ -13,6 +13,7 @@
 
 	mutable Vector3 *rdir_cache;
 	mutable int rdir_cache_width, rdir_cache_height;
+	mutable float rdir_cache_fov;
 
 	virtual void calc_matrix(Matrix4x4 *mat) const = 0;
 
diff -r 93894c232d65 -r 9621beb22694 liberebus/src/color.h
--- a/liberebus/src/color.h	Tue Apr 29 07:38:40 2014 +0300
+++ b/liberebus/src/color.h	Sat May 24 02:20:44 2014 +0300
@@ -3,7 +3,7 @@
 
 #include "vmath/vector.h"
 
-typedef Vector3 Color;
+typedef Vector4 Color;
 
 inline float color_luminance(const Color &c) { return c[0] * 0.2126 + c[1] * 0.7152 + c[2] * 0.0722; }
 
diff -r 93894c232d65 -r 9621beb22694 liberebus/src/erebus.cc
--- a/liberebus/src/erebus.cc	Tue Apr 29 07:38:40 2014 +0300
+++ b/liberebus/src/erebus.cc	Sat May 24 02:20:44 2014 +0300
@@ -7,6 +7,7 @@
 #include "image.h"
 #include "scene.h"
 #include "geomobj.h"
+#include "rt.h"
 
 using namespace std::chrono;
 
@@ -175,7 +176,18 @@
 
 static void render_pixel(struct erebus *ctx, int x, int y)
 {
-	float *pix = ctx->fbimg.get_pixels() + (y * ctx->fbimg.get_width() + x) * 4;
-	pix[0] = pix[1] = pix[2] = 0.0f;
-	pix[3] = 1.0f;
+	Camera *cam = ctx->scn->get_active_camera();
+	if(!cam) return;
+
+	int xsz = ctx->fbimg.get_width();
+	int ysz = ctx->fbimg.get_height();
+	float *pix = ctx->fbimg.get_pixels() + (y * xsz + x) * 4;
+
+	Ray ray = cam->get_primary_ray(x, y, xsz, ysz, 0);
+	//Color c = ray_trace(ray, ctx->scn, 0);
+	Color c = ray.dir.normalized() * 0.5 + Vector3(0.5, 0.5, 0.5);
+	pix[0] = 1.0;//c.x;
+	pix[1] = c.y;
+	pix[2] = c.z;
+	pix[3] = c.w;
 }
diff -r 93894c232d65 -r 9621beb22694 src/main.cc
--- a/src/main.cc	Tue Apr 29 07:38:40 2014 +0300
+++ b/src/main.cc	Sat May 24 02:20:44 2014 +0300
@@ -44,6 +44,9 @@
 
 static bool init()
 {
+	width = glutGet(GLUT_WINDOW_WIDTH);
+	height = glutGet(GLUT_WINDOW_HEIGHT);
+
 	if(!(erb = erb_init())) {
 		return false;
 	}