[Brlcad-commits] CVS: brlcad/src/adrt/libtexture texture_internal.h,NONE,1.1 Makefile.am,1.2,1.3 tex
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Update of /cvsroot/brlcad/brlcad/src/adrt/libtexture In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27633/libtexture Modified Files: Makefile.am texture.h texture_blend.c texture_blend.h texture_bump.c texture_bump.h texture_camo.c texture_camo.h texture_checker.c texture_checker.h texture_clouds.c texture_clouds.h texture_gradient.c texture_gradient.h texture_image.c texture_image.h texture_mix.c texture_mix.h texture_perlin.c texture_perlin.h texture_stack.c texture_stack.h Added Files: texture_internal.h Removed Files: texture_includes.h Log Message: Added licensing info to libtexture files. --- NEW FILE: texture_internal.h --- /* T E X T U R E _ I N T E R N A L . H * * @file texture_internal.h * * BRL-CAD * * Copyright (C) 2002-2005 United States Government as represented by * the U.S. Army Research Laboratory. * * This 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 2 of * the License, or (at your option) any later version. * * This 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 * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this file; see the file named COPYING for more * information. * * Comments - * Texture Library - Internal texture include * * Author - * Justin L. Shumaker * * Source - * The U. S. Army Research Laboratory * Aberdeen Proving Ground, Maryland 21005-5068 USA * * $Id: texture_internal.h,v 1.1 2005/06/18 21:58:58 twingy Exp $ */ #ifndef _TEXTURE_INTERNAL_H #define _TEXTURE_INTERNAL_H #include "tie.h" #include "adrt_common.h" struct texture_s; struct mesh_s; typedef void texture_init_t(struct texture_s *texture); typedef void texture_free_t(struct texture_s *texture); typedef void texture_work_t(struct texture_s *texture, struct mesh_s *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); typedef struct texture_s { texture_free_t *free; texture_work_t *work; void *data; } texture_t; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -w -u -r1.2 -r1.3 --- Makefile.am 17 Jun 2005 19:10:47 -0000 1.2 +++ Makefile.am 18 Jun 2005 21:58:58 -0000 1.3 @@ -6,4 +6,4 @@ AM_CFLAGS = -I${top_srcdir}/src/adrt/libtie -I${top_srcdir}/src/adrt/libtienet -I${top_srcdir}/src/adrt/libcommon -I${top_srcdir}/src/adrt/librender -I${top_srcdir}/src/adrt/libutil -noinst_HEADERS = texture_blend.h texture_bump.h texture_camo.h texture_checker.h texture_clouds.h texture_gradient.h texture.h texture_image.h texture_includes.h texture_mix.h texture_perlin.h texture_stack.h +noinst_HEADERS = texture_blend.h texture_bump.h texture_camo.h texture_checker.h texture_clouds.h texture_gradient.h texture.h texture_image.h texture_internal.h texture_mix.h texture_perlin.h texture_stack.h Index: texture.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture.h,v retrieving revision 1.2 retrieving revision 1.3 diff -w -u -r1.2 -r1.3 --- texture.h 17 Jun 2005 19:10:47 -0000 1.2 +++ texture.h 18 Jun 2005 21:58:58 -0000 1.3 @@ -1,23 +1,61 @@ +/* T E X T U R E _ B U M P . H + * + * @file texture.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Main Include + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_H #define _TEXTURE_H - -#include "tie.h" -#include "adrt_common.h" - - -struct texture_s; -struct mesh_s; -typedef void texture_init_t(struct texture_s *texture); -typedef void texture_free_t(struct texture_s *texture); -typedef void texture_work_t(struct texture_s *texture, struct mesh_s *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); - - -typedef struct texture_s { - texture_free_t *free; - texture_work_t *work; - void *data; -} texture_t; - +#include "texture_blend.h" +#include "texture_bump.h" +#include "texture_camo.h" +#include "texture_checker.h" +#include "texture_clouds.h" +#include "texture_gradient.h" +#include "texture_image.h" +#include "texture_mix.h" +#include "texture_stack.h" + +#define TEXTURE_BLEND 0x0200 +#define TEXTURE_BUMP 0x0201 +#define TEXTURE_CAMO 0x0202 +#define TEXTURE_CHECKER 0x0203 +#define TEXTURE_CLOUDS 0x0204 +#define TEXTURE_GRADIENT 0x0205 +#define TEXTURE_IMAGE 0x0206 +#define TEXTURE_MIX 0x0207 +#define TEXTURE_REFLECT 0x0208 +#define TEXTURE_STACK 0x0209 #endif Index: texture_blend.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_blend.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_blend.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_blend.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ B L E N D . C + * + * @file texture_blend.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Uses the R and B channels to blend 2 colors + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_blend.h" #include <stdlib.h> Index: texture_blend.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_blend.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_blend.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_blend.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,8 +1,44 @@ +/* T E X T U R E _ B L E N D . H + * + * @file texture_blend.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Blend Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_BLEND_H #define _TEXTURE_BLEND_H -#include "texture.h" +#include "texture_internal.h" typedef struct texture_blend_s { @@ -11,9 +47,9 @@ } texture_blend_t; -extern void texture_blend_init(texture_t *shader, TIE_3 color1, TIE_3 color2); -extern void texture_blend_free(texture_t *shader); -extern void texture_blend_work(texture_t *shader, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); +extern void texture_blend_init(texture_t *texture, TIE_3 color1, TIE_3 color2); +extern void texture_blend_free(texture_t *texture); +extern void texture_blend_work(texture_t *texture, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); #endif Index: texture_bump.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_bump.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_bump.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_bump.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ B U M P . C + * + * @file texture_bump.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Bump Mapping maps R,G,Z to surface normal X,Y,Z + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_bump.h" #include <stdlib.h> #include "umath.h" Index: texture_bump.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_bump.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_bump.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_bump.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,8 +1,44 @@ +/* T E X T U R E _ B U M P . H + * + * @file texture_bump.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Bump Mapping Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_BUMP_H #define _TEXTURE_BUMP_H -#include "texture.h" +#include "texture_internal.h" typedef struct texture_bump_s { Index: texture_camo.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_camo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_camo.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_camo.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ C A M O . C + * + * @file texture_camo.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Applies a 3 color camoflauge + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_camo.h" #include <stdlib.h> #include "umath.h" Index: texture_camo.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_camo.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_camo.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_camo.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,8 +1,44 @@ +/* T E X T U R E _ C A M O . H + * + * @file texture_camo.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Camoflauge Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_CAMO_H #define _TEXTURE_CAMO_H -#include "texture.h" +#include "texture_internal.h" #include "texture_perlin.h" Index: texture_checker.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_checker.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_checker.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_checker.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ C H E C K E R . C + * + * @file texture_checker.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Checker pattern with tile parameter + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_checker.h" #include <stdlib.h> #include "umath.h" Index: texture_checker.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_checker.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_checker.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_checker.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ C H E C K E R . H + * + * @file texture_checker.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Checker Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef TEXTURE_CHECKER_H #define TEXTURE_CHECKER_H Index: texture_clouds.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_clouds.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_clouds.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_clouds.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ C L O U D S . C + * + * @file texture_clouds.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Perlin Clouds + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_clouds.h" #include <stdlib.h> #include "umath.h" Index: texture_clouds.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_clouds.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_clouds.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_clouds.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ C L O U D S . H + * + * @file texture_clouds.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Perlin Clouds Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_CLOUDS_H #define _TEXTURE_CLOUDS_H Index: texture_gradient.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_gradient.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_gradient.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_gradient.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ G R A D I E N T . C + * + * @file texture_gradient.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Produces Gradient to be used with Blend + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_gradient.h" #include <stdlib.h> #include "umath.h" Index: texture_gradient.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_gradient.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_gradient.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_gradient.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ G R A D I E N T . H + * + * @file texture_gradient.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Gradient Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_GRADIENT_H #define _TEXTURE_GRADIENT_H @@ -10,9 +46,9 @@ } texture_gradient_t; -extern void texture_gradient_init(texture_t *shader, int axis); -extern void texture_gradient_free(texture_t *shader); -extern void texture_gradient_work(texture_t *shader, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); +extern void texture_gradient_init(texture_t *texture, int axis); +extern void texture_gradient_free(texture_t *texture); +extern void texture_gradient_work(texture_t *texture, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); #endif Index: texture_image.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_image.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_image.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_image.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ I M A G E . C + * + * @file texture_image.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Projects an Image onto a Surface + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_image.h" #include <stdlib.h> #include "umath.h" Index: texture_image.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_image.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_image.h 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_image.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ I M A G E . H + * + * @file texture_image.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Image Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_IMAGE_H #define _TEXTURE_IMAGE_H Index: texture_mix.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_mix.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_mix.c 17 Jun 2005 15:09:26 -0000 1.1 +++ texture_mix.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ M I X . C + * + * @file texture_mix.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Mix two textures + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_mix.h" #include <stdlib.h> #include "umath.h" Index: texture_mix.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_mix.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_mix.h 17 Jun 2005 15:09:27 -0000 1.1 +++ texture_mix.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ M I X . H + * + * @file texture_mix.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Mix Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_MIX_H #define _TEXTURE_MIX_H @@ -12,9 +48,9 @@ } texture_mix_t; -extern void texture_mix_init(texture_t *shader, texture_t *shader1, texture_t *shader2, tfloat coef); -extern void texture_mix_free(texture_t *shader); -extern void texture_mix_work(texture_t *shader, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); +extern void texture_mix_init(texture_t *texture, texture_t *texture1, texture_t *texture2, tfloat coef); +extern void texture_mix_free(texture_t *texture); +extern void texture_mix_work(texture_t *texture, common_mesh_t *mesh, tie_ray_t *ray, tie_id_t *id, TIE_3 *pixel); #endif Index: texture_perlin.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_perlin.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_perlin.c 17 Jun 2005 15:09:27 -0000 1.1 +++ texture_perlin.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ P E R L I N . C + * + * @file texture_perlin.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Perlin Utility + * + * Author - + * Kenneth Perlin + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_perlin.h" #include <stdlib.h> #include "umath.h" Index: texture_perlin.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_perlin.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_perlin.h 17 Jun 2005 15:09:27 -0000 1.1 +++ texture_perlin.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,7 +1,43 @@ +/* T E X T U R E _ P E R L I N . H + * + * @file texture_perlin.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Perlin Utility Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_PERLIN_H #define _TEXTURE_PERLIN_H -#include "texture.h" +#include "texture_internal.h" typedef struct texture_perlin_s { int *PV; Index: texture_stack.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_stack.c,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_stack.c 17 Jun 2005 15:09:27 -0000 1.1 +++ texture_stack.c 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ S T A C K . C + * + * @file texture_stack.c + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Stack textures to pipe output of one into another + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #include "texture_stack.h" #include <stdlib.h> Index: texture_stack.h =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/adrt/libtexture/texture_stack.h,v retrieving revision 1.1 retrieving revision 1.2 diff -w -u -r1.1 -r1.2 --- texture_stack.h 17 Jun 2005 15:09:27 -0000 1.1 +++ texture_stack.h 18 Jun 2005 21:58:58 -0000 1.2 @@ -1,3 +1,39 @@ +/* T E X T U R E _ S T A C K . H + * + * @file texture_stack.h + * + * BRL-CAD + * + * Copyright (C) 2002-2005 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This 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 2 of + * the License, or (at your option) any later version. + * + * This 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + * + * Comments - + * Texture Library - Stack Header + * + * Author - + * Justin L. Shumaker + * + * Source - + * The U. S. Army Research Laboratory + * Aberdeen Proving Ground, Maryland 21005-5068 USA + * + * $Id$ + */ + #ifndef _TEXTURE_STACK_H #define _TEXTURE_STACK_H --- texture_includes.h DELETED --- |