begin work on ray tracer project

[chaz/rasterize] / raster.hh

diff --git a/raster.h b/raster.hh
similarity index 54%
rename from raster.h
rename to raster.hh
index 3b5a5502e2d9fef221806c40bd6210d59078c03b..56a9c922709f02b87539e9ea475007fae066e4eb 100644 (file)
--- a/raster.h
+++ b/raster.hh
@@ -5,14 +5,11 @@
  * mcgarvey@eng.utah.edu
  */
 
-#ifndef _RASTER_H_
-#define _RASTER_H_
+#ifndef _RASTER_HH_
+#define _RASTER_HH_
 
-#include "color.h"
-#include "common.h"
-#include "light.h"
-#include "model.h"
-#include "tri.h"
+#include "color.hh"
+#include "common.hh"
 
 
 /*
@@ -32,16 +29,10 @@ raster_t* raster_alloc(int width, int height, color_t fill);
 void raster_destroy(raster_t* p);
 
 
-/*
- * Print some optimization statistics.
- */
-void raster_printstats(raster_t* p);
-
-
 /*
  * Get the color value at a particular point.
  */
-color_t raster_color(const raster_t* p, vec_t pt);
+color_t* raster_color(const raster_t* p, int x, int y);
 
 /*
  * Get the width of the raster.
@@ -67,46 +58,6 @@ void* raster_data(const raster_t* p);
  */
 void raster_viewport(raster_t* p, int x, int y, int width, int height);
 
-/*
- * Set the model matrix.  This positions the model, providing the
- * transformation for converting to eye coordinates.
- */
-void raster_model(raster_t* p, const mat_t* transform);
-
-/*
- * Set the view matrix.  This positions the camera, providing the
- * transformation for converting to world coordinates.
- */
-void raster_view(raster_t* p, const mat_t* transform);
-
-/*
- * Set the projection matrix.  This provides the transformation for converting
- * to canonical coordinates.
- */
-void raster_projection(raster_t* p, const mat_t* transform);
-
-
-/*
- * Set the location of the viewer in world coordinates.  This is used in
- * specular lighting calculations.
- */
-void raster_eye(raster_t* p, vec_t eye);
-
-/*
- * Set the ambient light for the scene.
- */
-void raster_ambient(raster_t* p, color_t ambient);
-
-/*
- * Add a light to the scene.
- */
-void raster_light(raster_t* p, light_t light);
-
-/*
- * Set the material properties for the scene.
- */
-void raster_material(raster_t* p, color_t specular, scal_t shininess);
-
 
 /*
  * Save the raster to a PPM file.
@@ -141,16 +92,6 @@ raster_t* raster_import_bmp(const char* filename);
  */
 void raster_clear(raster_t* p, color_t fill);
 
-/*
- * Draw a model to the raster.
- */
-void raster_draw_model(raster_t* p, const model_t* model);
-
-/*
- * Draw a triangle to the raster.
- */
-void raster_draw_tri(raster_t* p, const tri_t* triangle);
-
 
-#endif // _RASTER_H_
+#endif // _RASTER_HH_