Begin dmnsn_texture* type.

3 files changed, 95 insertions, 2 deletions

diff --git a/libdimension/dimension/object.h b/libdimension/dimension/object.h
index 314a543..2da3ac7 100644
--- a/libdimension/dimension/object.h
+++ b/libdimension/dimension/object.h
@@ -35,8 +35,7 @@ typedef int dmnsn_object_inside_fn(const dmnsn_object *object,
                                    dmnsn_vector point);
 
 struct dmnsn_object {
-  /* Generic pointer for object info */
-  void *ptr;
+  dmnsn_texture *texture;
 
   /* Transformation matrix */
   dmnsn_matrix trans;
@@ -44,6 +43,9 @@ struct dmnsn_object {
   /* Callback functions */
   dmnsn_object_intersections_fn *intersections_fn;
   dmnsn_object_inside_fn        *inside_fn;
+
+  /* Generic pointer for object info */
+  void *ptr;
 };
 
 /* Allocate a dummy object */
diff --git a/libdimension/dimension/pigments.h b/libdimension/dimension/pigments.h
new file mode 100644
index 0000000..ed0c3b2
--- /dev/null
+++ b/libdimension/dimension/pigments.h
@@ -0,0 +1,32 @@
+/*************************************************************************
+ * Copyright (C) 2009 Tavian Barnes <tavianator@gmail.com>               *
+ *                                                                       *
+ * This file is part of The Dimension Library.                           *
+ *                                                                       *
+ * The Dimension Library is free software; you can redistribute it and/  *
+ * or modify it under the terms of the GNU Lesser General Public License *
+ * as published by the Free Software Foundation; either version 3 of the *
+ * License, or (at your option) any later version.                       *
+ *                                                                       *
+ * The Dimension Library is distributed in the hope that it will be      *
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty   *
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  *
+ * Lesser General Public License for more details.                       *
+ *                                                                       *
+ * You should have received a copy of the GNU Lesser General Public      *
+ * License along with this program.  If not, see                         *
+ * <http://www.gnu.org/licenses/>.                                       *
+ *************************************************************************/
+
+/*
+ * Custom pigments.
+ */
+
+#ifndef DIMENSION_PIGMENTS_H
+#define DIMENSION_PIGMENTS_H
+
+/* A solid color */
+dmnsn_pigment *dmnsn_new_solid_pigment(dmnsn_color color);
+void dmnsn_delete_solid_pigment(dmnsn_pigment *pigment);
+
+#endif /* DIMENSION_PIGMENTS_H */
diff --git a/libdimension/dimension/texture.h b/libdimension/dimension/texture.h
new file mode 100644
index 0000000..2eabe84
--- /dev/null
+++ b/libdimension/dimension/texture.h
@@ -0,0 +1,59 @@
+/*************************************************************************
+ * Copyright (C) 2009 Tavian Barnes <tavianator@gmail.com>               *
+ *                                                                       *
+ * This file is part of The Dimension Library.                           *
+ *                                                                       *
+ * The Dimension Library is free software; you can redistribute it and/  *
+ * or modify it under the terms of the GNU Lesser General Public License *
+ * as published by the Free Software Foundation; either version 3 of the *
+ * License, or (at your option) any later version.                       *
+ *                                                                       *
+ * The Dimension Library is distributed in the hope that it will be      *
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty   *
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  *
+ * Lesser General Public License for more details.                       *
+ *                                                                       *
+ * You should have received a copy of the GNU Lesser General Public      *
+ * License along with this program.  If not, see                         *
+ * <http://www.gnu.org/licenses/>.                                       *
+ *************************************************************************/
+
+/*
+ * Object textures.
+ */
+
+#ifndef DIMENSION_TEXTURE_H
+#define DIMENSION_TEXTURE_H
+
+/*
+ * Pigments
+ */
+
+/* Forward-declare dmnsn_pigment */
+typedef struct dmnsn_pigment dmnsn_pigment;
+
+/* Pigment callback */
+typedef dmnsn_color dmnsn_pigment_fn(const dmnsn_pigment *pigment,
+                                     dmnsn_vector v);
+
+/* dmnsn_pigment definition */
+struct dmnsn_pigment {
+  dmnsn_pigment_fn *pigment_fn;
+  void *ptr;
+};
+
+dmnsn_pigment *dmnsn_new_pigment();
+void dmnsn_delete_pigment(dmnsn_pigment *pigment);
+
+/*
+ * A complete texture
+ */
+
+typedef struct {
+  dmnsn_pigment *pigment;
+} dmnsn_texture;
+
+dmnsn_texture *dmnsn_new_texture();
+void dmnsn_delete_texture(dmnsn_texture *texture);
+
+#endif /* DIMENSION_TEXTURE_H */