pyrit: comparison include/scene.h

equal deleted inserted replaced

-:76b254ce92cf
+:6493fb65f0b1
 	Vector3 o, dir;
 	Ray(const Vector3 &ao, const Vector3 &adir):
 		o(ao), dir(adir) {};
 };
+/**
+* sample
+*/
+class Sample
+{
+public:
+	Float x,y;
+};
+/**
+* A abstract sampler.
+* It generates screen samples in coordinates between [-1..1] for height
+* and [-w/h..w/h] for width. It works in phases: initSampleSet returns
+* number of samples for each phase, then samples can be generated using
+* nextSample method. The resulting colour of each sample should be returned
+* via saveSample method. The sampler should save the results to given buffer
+* and decide if other phase is needed. When the picture is complete,
+* initSampleSet returns zero and picture can be read from buffer.
+*/
+class Sampler
+{
+public:
+	Float *buffer;
+	int w,h;
+	Sampler(Float *abuffer, int &aw, int &ah): buffer(abuffer), w(aw), h(ah) {};
+	void resetBuffer(Float *abuffer, int &aw, int &ah) { buffer = abuffer; w = aw; h = ah; };
+	virtual void init() = 0;
+	virtual int initSampleSet() = 0;
+	virtual Sample *nextSample(Sample *prev) = 0;
+	virtual void saveSample(Sample *samp, Colour &col) = 0;
+};
+/**
+* default sample
+*/
+class DefaultSample: public Sample
+{
+	friend class DefaultSampler;
+	int sx,sy;
+};
+/**
+* Default sampler.
+*/
+class DefaultSampler: public Sampler
+{
+	int phase;
+public:
+	DefaultSampler(Float *abuffer, int &aw, int &ah): Sampler(abuffer, aw, ah), phase(-1) {};
+	void init() { phase = 0; };
+	int initSampleSet();
+	Sample *nextSample(Sample *prev);
+	void saveSample(Sample *samp, Colour &col);
+};
+/**
+* a camera
+*/
 class Camera
 {
 public:
 	Vector3 eye, p, u, v;
 	Float f;
 		eye(C), p(ap), u(au), v(av), f(3.14/4.0) {};
 	void setEye(const Vector3 &aeye) { eye = aeye; };
 	void setFocalLength(const Float af) { f = af; };
 	void rotate(const Quaternion &q);
 	void move(const Float fw, const Float left, const Float up);
-};
+	Ray makeRay(Sample *samp);
-/* axis-aligned bounding box */
+};
+/**
+* axis-aligned bounding box
+*/
 class BBox
 {
 public:
 	Vector3 L;
 	Vector3 H;
 	Float h() { return H.y-L.y; };
 	Float d() { return H.z-L.z; };
 	bool intersect(const Ray &ray, Float &a, Float &b);
 };
+/**
+* light object
+*/
 class Light
 {
 public:
 	Vector3 pos;
 	Colour colour;
 	Light(const Vector3 &position, const Colour &acolour):
 		pos(position), colour(acolour), cast_shadows(true) {};
 	void castShadows(bool cast) { cast_shadows = cast; };
 };
+/**
+* texture
+*/
 class Texture
 {
 public:
 	virtual Colour evaluate(Vector3 point) = 0;
 };
+/**
+* material
+*/
 class Material
 {
 public:
 	Colour colour;
 	Float ambient, diffuse, specular, shininess; // Phong constants
 	void setReflectivity(const Float refl) { reflectivity = refl; };
 	void setTransmissivity(const Float trans, const Float rindex)
 		{ transmissivity = trans; refract_index = rindex; };
 };
+/**
+* shape
+*/
 class Shape
 {
 public:
 	Material *material;
 	Shape() {};
 	virtual const Vector3 normal(const Vector3 &P) const = 0;
 	virtual BBox get_bbox() const = 0;
 };
+/**
+* list of shapes
+*/
 class ShapeList: public vector<Shape*>
 {
 };
+/**
+* sphere shape
+*/
 class Sphere: public Shape
 {
 	Float sqr_radius;
 	Float inv_radius;
 public:
 	bool intersect_bbox(const BBox &bbox) const;
 	const Vector3 normal(const Vector3 &P) const { return (P - center) * inv_radius; };
 	BBox get_bbox() const;
 };
+/**
+* box shape
+*/
 class Box: public Shape
 {
 	Vector3 L;
 	Vector3 H;
 public:
 	bool intersect_bbox(const BBox &bbox) const;
 	const Vector3 normal(const Vector3 &P) const;
 	BBox get_bbox() const { return BBox(L, H); };
 };
+/**
+* triangle vertex
+*/
 class Vertex
 {
 public:
 	Vector3 P;
 	Vertex(const Vector3 &aP): P(aP) {};
 };
+/**
+* triangle vertex with normal
+*/
 class NormalVertex: public Vertex
 {
 public:
 	Vector3 N;
 	NormalVertex(const Vector3 &aP): Vertex(aP) {};
 	NormalVertex(const Vector3 &aP, const Vector3 &aN): Vertex(aP), N(aN) {};
 	const Vector3 &getNormal() { return N; };
 	void setNormal(const Vector3 &aN) { N = aN; };
 };
+/**
+* triangle shape
+*/
 class Triangle: public Shape
 {
 #ifdef TRI_BARI_PRE
 	Float nu, nv, nd;
 	int k; // dominant axis

branch	pyrit
changeset 46	6493fb65f0b1
parent 44	3763b26244f0
child 47	320d5d466864