src/scene.cc
branchpyrit
changeset 47 320d5d466864
parent 46 6493fb65f0b1
child 49 558fde7da82a
--- a/src/scene.cc	Wed Mar 26 00:52:27 2008 +0100
+++ b/src/scene.cc	Wed Mar 26 14:29:21 2008 +0100
@@ -3,7 +3,7 @@
  *
  * This file is part of Pyrit Ray Tracer.
  *
- * Copyright 2006, 2007  Radek Brich
+ * Copyright 2006, 2007, 2008  Radek Brich
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,56 +29,6 @@
 #include "common.h"
 #include "scene.h"
 
-int DefaultSampler::initSampleSet()
-{
-	if ( phase == 0 )
-	{
-		phase++;
-		return w*h;
-	}
-	else return 0;
-}
-
-Sample* DefaultSampler::nextSample(Sample *prev)
-{
-	DefaultSample *s = new DefaultSample;
-	if (prev)
-	{
-		DefaultSample *sp = static_cast<DefaultSample*>(prev);
-		s->sx = sp->sx + 1;
-		s->sy = sp->sy;
-		if (s->sx >= w)
-		{
-			s->sx = 0;
-			s->sy++;
-		}
-		if (s->sy >= h)
-		{
-			delete s;
-			return NULL;
-		}
-		s->x = (Float)s->sx/h - (Float)w/h/2.0;
-		s->y = (Float)s->sy/h - 0.5;
-	}
-	else
-	{
-		s->x = -(Float)w/h/2.0;
-		s->y = -0.5;
-		s->sx = 0;
-		s->sy = 0;
-	}
-	return s;
-}
-
-void DefaultSampler::saveSample(Sample *samp, Colour &col)
-{
-	DefaultSample *sp = static_cast<DefaultSample*>(samp);
-	Float *buf = buffer + 3*(sp->sy*w + sp->sx);
-	*(buf++) = col.r;
-	*(buf++) = col.g;
-	*(buf++) = col.b;
-}
-
 void Camera::rotate(const Quaternion &q)
 {
 	/*