diff options
| -rw-r--r-- | libdimension-python/dimension.pxd | 1 | ||||
| -rw-r--r-- | libdimension-python/dimension.pyx | 6 | ||||
| -rw-r--r-- | libdimension/Makefile.am | 1 | ||||
| -rw-r--r-- | libdimension/dimension/patterns.h | 6 | ||||
| -rw-r--r-- | libdimension/leopard.c | 48 | ||||
| -rw-r--r-- | libdimension/prtree.c | 2 |
6 files changed, 63 insertions, 1 deletions
diff --git a/libdimension-python/dimension.pxd b/libdimension-python/dimension.pxd index cda2c59..9bfe5a9 100644 --- a/libdimension-python/dimension.pxd +++ b/libdimension-python/dimension.pxd @@ -204,6 +204,7 @@ cdef extern from "../libdimension/dimension.h": dmnsn_pattern *dmnsn_new_checker_pattern() dmnsn_pattern *dmnsn_new_gradient_pattern(dmnsn_vector orientation) + dmnsn_pattern *dmnsn_new_leopard_pattern() ######## # Maps # diff --git a/libdimension-python/dimension.pyx b/libdimension-python/dimension.pyx index 3fd64d1..2197edd 100644 --- a/libdimension-python/dimension.pyx +++ b/libdimension-python/dimension.pyx @@ -561,6 +561,12 @@ cdef class Gradient(Pattern): self._pattern = dmnsn_new_gradient_pattern(Vector(orientation)._v) Pattern.__init__(self) +cdef class Leopard(Pattern): + """A leopard pattern.""" + def __init__(self): + self._pattern = dmnsn_new_leopard_pattern() + Pattern.__init__(self) + ############ # Pigments # ############ diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index 31db52a..fbefa40 100644 --- a/libdimension/Makefile.am +++ b/libdimension/Makefile.am @@ -81,6 +81,7 @@ libdimension_la_SOURCES = $(nobase_include_HEADERS) \ inline.c \ interior.c \ lambertian.c \ + leopard.c \ light.c \ malloc.c \ map.c \ diff --git a/libdimension/dimension/patterns.h b/libdimension/dimension/patterns.h index 5506941..a9beba9 100644 --- a/libdimension/dimension/patterns.h +++ b/libdimension/dimension/patterns.h @@ -37,3 +37,9 @@ dmnsn_pattern *dmnsn_new_checker_pattern(void); * @return A gradient pattern. */ dmnsn_pattern *dmnsn_new_gradient_pattern(dmnsn_vector orientation); + +/** + * A leopard pattern. + * @return A leopard pattern. + */ +dmnsn_pattern *dmnsn_new_leopard_pattern(void); diff --git a/libdimension/leopard.c b/libdimension/leopard.c new file mode 100644 index 0000000..48986b4 --- /dev/null +++ b/libdimension/leopard.c @@ -0,0 +1,48 @@ +/************************************************************************* + * Copyright (C) 2011 Tavian Barnes <tavianator@tavianator.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/>. * + *************************************************************************/ + +/** + * @file + * Leopard pattern. + */ + +#include "dimension.h" +#include <math.h> + +/** Leopard pattern callback. */ +static double +dmnsn_leopard_pattern_fn(const dmnsn_pattern *leopard, dmnsn_vector v) +{ + double val = (sin(v.x) + sin(v.y) + sin(v.z))/3.0; + return val*val; +} + +/** The singleton instance. */ +static dmnsn_pattern dmnsn_leopard_instance = { + .pattern_fn = dmnsn_leopard_pattern_fn, + .refcount = 1, +}; + +dmnsn_pattern * +dmnsn_new_leopard_pattern(void) +{ + DMNSN_INCREF(&dmnsn_leopard_instance); + return &dmnsn_leopard_instance; +} diff --git a/libdimension/prtree.c b/libdimension/prtree.c index 06cecf9..4c7a2e5 100644 --- a/libdimension/prtree.c +++ b/libdimension/prtree.c @@ -59,7 +59,7 @@ typedef struct dmnsn_prnode { /** Construct an empty PR-node. */ static inline dmnsn_prnode * -dmnsn_new_prnode() +dmnsn_new_prnode(void) { dmnsn_prnode *node = dmnsn_malloc(sizeof(dmnsn_prnode)); node->bounding_box = dmnsn_zero_bounding_box(); |