Modularize the libdimension codebase.

1 files changed, 16 insertions, 98 deletions

diff --git a/libdimension/dimension/canvas.h b/libdimension/dimension/canvas.h
index e325364..53bbda3 100644
--- a/libdimension/dimension/canvas.h
+++ b/libdimension/dimension/canvas.h
@@ -1,5 +1,5 @@
 /*************************************************************************
- * Copyright (C) 2009-2014 Tavian Barnes <tavianator@tavianator.com>     *
+ * Copyright (C) 2014 Tavian Barnes <tavianator@tavianator.com>          *
  *                                                                       *
  * This file is part of The Dimension Library.                           *
  *                                                                       *
@@ -20,108 +20,26 @@
 
 /**
  * @file
- * A canvas which is rendered to.
+ * Using, importing, and exporting canvases.
  */
 
-#include <stddef.h>
+#ifndef DMNSN_CANVAS_H
+#define DMNSN_CANVAS_H
 
-/** A canvas, or image. */
-typedef struct dmnsn_canvas {
-  size_t width;  /**< Canvas width. */
-  size_t height; /**< Canvas height. */
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-  /** An array of <tt>dmnsn_canvas_optimizer</tt>s. */
-  dmnsn_array *optimizers;
+#include <dimension/base.h>
+#include <dimension/concurrency.h>
+#include <dimension/color.h>
 
-  /**
-   * @internal
-   * Stored in first-quadrant representation (origin is bottom-left).  The pixel
-   * at (a,b) is accessible as pixels[b*width + a].
-   */
-  dmnsn_tcolor *pixels;
-} dmnsn_canvas;
+#include <dimension/canvas/canvas.h>
+#include <dimension/canvas/png.h>
+#include <dimension/canvas/gl.h>
 
-/* Forward-declare dmnsn_canvas_optimizer. */
-typedef struct dmnsn_canvas_optimizer dmnsn_canvas_optimizer;
-
-/**
- * Canvas optimizer callback type.
- * @param[in] optimizer  The canvas optimizer.
- * @param[in] canvas  The canvas that was just updated.
- * @param[in] x  The x-coordinate that was just updated.
- * @param[in] y  The y-coordinate that was just updated.
- */
-typedef void dmnsn_canvas_optimizer_fn(dmnsn_canvas_optimizer *optimizer, const dmnsn_canvas *canvas, size_t x, size_t y);
-
-/** Canvas optimizer. */
-struct dmnsn_canvas_optimizer {
-  dmnsn_canvas_optimizer_fn *optimizer_fn; /**< Optimizer callback. */
-};
-
-/**
- * Allocate a new canvas.
- * @param[in] pool  The memory pool to allocate from.
- * @param[in] width  The width of the canvas to allocate (in pixels).
- * @param[in] height  The height of the canvas to allocate (in pixels).
- * @return The allocated canvas.
- */
-dmnsn_canvas *dmnsn_new_canvas(dmnsn_pool *pool, size_t width, size_t height);
-
-/**
- * Initialize a dmnsn_canvas_optimizer field
- * @param[in] optimizer  The optimizer to initialize.
- */
-void dmnsn_init_canvas_optimizer(dmnsn_canvas_optimizer *optimizer);
-
-/**
- * Set a canvas optimizer
- * @param[in,out] canvas    The canvas to optimize.
- * @param[in]     optimizer The optimizer to use.
- */
-void dmnsn_canvas_optimize(dmnsn_canvas *canvas,
-                           const dmnsn_canvas_optimizer *optimizer);
-
-/**
- * Find a canvas optimizer by its callback.
- * @param[in] canvas        The canvas to check.
- * @param[in] optimizer_fn  The callback to search for for.
- * @return A pointer to the canvas optimizer with the callback \p optimizer_fn,
- *         or NULL if none is found.
- */
-dmnsn_canvas_optimizer *
-dmnsn_canvas_find_optimizer(const dmnsn_canvas *canvas,
-                            dmnsn_canvas_optimizer_fn *optimizer_fn);
-
-/* Pixel accessors */
-
-/**
- * Get the color of a pixel.
- * @param[in] canvas  The canvas to access.
- * @param[in] x       The x coordinate.
- * @param[in] y       The y coordinate.
- * @return The color of the pixel at (\p x, \p y).
- */
-DMNSN_INLINE dmnsn_tcolor
-dmnsn_canvas_get_pixel(const dmnsn_canvas *canvas, size_t x, size_t y)
-{
-  dmnsn_assert(x < canvas->width && y < canvas->height,
-               "Canvas access out of bounds.");
-  return canvas->pixels[y*canvas->width + x];
+#ifdef __cplusplus
 }
+#endif
 
-/**
- * Set the value of a pixel.
- * @param[in,out] canvas  The canvas to modify.
- * @param[in]     x       The x coordinate of the pixel.
- * @param[in]     y       The y coordinate of the pixel.
- * @param[in]     tcolor  The value to set the pixel at (\p x, \p y) to.
- */
-void dmnsn_canvas_set_pixel(dmnsn_canvas *canvas, size_t x, size_t y,
-                            dmnsn_tcolor tcolor);
-
-/**
- * Clear a canvas uniformly with a given color.
- * @param[in,out] canvas  The canvas to erase.
- * @param[in]     tcolor  The color to paint it with.
- */
-void dmnsn_canvas_clear(dmnsn_canvas *canvas, dmnsn_tcolor tcolor);
+#endif /* DMNSN_CANVAS_H */