head	1.17;
access;
symbols
	ansi-20040405-merged:1.12.4.1
	premerge-autoconf:1.16
	ansi-20040316-freeze:1.12
	postmerge-20040315-windows:1.16
	premerge-20040315-windows:1.16
	windows-20040315-freeze:1.12.6.1
	autoconf-20031203:1.16
	autoconf-20031202:1.16
	phong-branch:1.14.0.2
	photonmap-branch:1.12.0.8
	rel-6-1-DP:1.12
	windows-branch:1.12.0.6
	rel-6-0-2:1.12
	ansi-branch:1.12.0.4
	rel-6-0-1-branch:1.12.0.2
	hartley-6-0-post:1.12
	hartley-6-0-pre:1.12
	rel-6-0-1:1.12
	rel-6-0:1.12
	rel-5-4:1.10
	offsite-5-3-pre:1.11
	rel-5-3:1.10
	rel-5-2:1.10
	rel-5-1-branch:1.10.0.2
	rel-5-1:1.10
	rel-5-0:1.7
	rel-5-0-beta:1.7
	AUTOCONF:1.16.0.2;
locks; strict;
comment	@# @;


1.17
date	2004.03.18.18.25.15;	author erikg;	state dead;
branches;
next	1.16;

1.16
date	2003.10.01.16.19.34;	author morrison;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2003.09.27.01.05.57;	author morrison;	state Exp;
branches;
next	1.14;

1.14
date	2003.09.03.06.11.33;	author butler;	state Exp;
branches;
next	1.13;

1.13
date	2003.08.27.19.17.51;	author justin;	state Exp;
branches;
next	1.12;

1.12
date	2002.03.07.23.07.09;	author morrison;	state Exp;
branches
	1.12.4.1
	1.12.6.1
	1.12.8.1;
next	1.11;

1.11
date	2000.08.20.01.19.17;	author butler;	state Exp;
branches;
next	1.10;

1.10
date	2000.02.22.09.26.07;	author butler;	state Exp;
branches;
next	1.9;

1.9
date	2000.01.21.20.32.00;	author butler;	state Exp;
branches;
next	1.8;

1.8
date	99.12.02.21.40.23;	author mike;	state Exp;
branches;
next	1.7;

1.7
date	99.02.19.03.38.10;	author butler;	state Exp;
branches;
next	1.6;

1.6
date	99.02.04.06.47.11;	author butler;	state Exp;
branches;
next	1.5;

1.5
date	99.02.04.02.29.23;	author butler;	state Exp;
branches;
next	1.4;

1.4
date	99.02.04.02.27.13;	author butler;	state Exp;
branches;
next	1.3;

1.3
date	99.01.30.08.45.55;	author butler;	state Exp;
branches;
next	1.2;

1.2
date	98.09.22.01.29.53;	author mike;	state Exp;
branches;
next	1.1;

1.1
date	98.09.21.22.58.54;	author mike;	state Exp;
branches;
next	;

1.12.4.1
date	2004.03.17.21.18.30;	author morrison;	state Exp;
branches;
next	;

1.12.6.1
date	2004.03.11.23.43.01;	author morrison;	state Exp;
branches;
next	;

1.12.8.1
date	2003.08.07.22.30.16;	author justin;	state Exp;
branches;
next	;

1.16.2.1
date	2004.03.18.18.10.28;	author erikg;	state dead;
branches;
next	;


desc
@@


1.17
log
@merge of AUTOCONF branch in to HEAD
@
text
@/*
 *			liboptical/Cakefile
 */
#define SRCDIR	liboptical
#define PRODUCTS	liboptical.ARCH_SUF
#define	SRCSUFF	.c
#define MANSECTION	3

#include "../Cakefile.defs"

#if defined(RESOLVE_LIBRARIES)
#	define EXTRA_OBJ_NO_DEPENDENCY -lc -lm -brtl -L../.libbu.sp3 -lbu -L../.libbn.sp3 -lbn -L../.libtcl8.4.sp3 -ltcl8.4 -L../.librt.sp3 -lrt
#endif

#define FILES	\
	init \
	refract \
	wray \
	shade \
	material \
	photonmap \
	sh_air \
	sh_brdf \
	sh_billboard \
	sh_camo \
	sh_cloud \
	sh_cook \
	sh_fire \
	sh_flat \
	sh_gauss \
	sh_grass \
	sh_light \
	sh_noise \
	sh_null \
	sh_plastic \
	sh_points \
	sh_prj \
	sh_rtrans \
	sh_scloud \
	sh_spm \
	sh_stack \
	sh_stxt \
	sh_tcl\
	sh_text \
	sh_toyota \
	sh_treetherm \
	sh_wood \
	turb

#define VERSION_VARIABLE	liboptical_version
#define LIBRARY_TITLE		"The BRL-CAD Optical Shader Library"

#include "../Cakefile.lib"
#include "../Cakefile.rules"
@


1.16
log
@use -ltcl8.4 and -ltk8.4 to prevent getting a system /usr/lib/libtcl...
@
text
@@


1.16.2.1
log
@merge from head
@
text
@@


1.15
log
@added refract, wray, shade, and material from the rt back-end; added initial RESOLVE_LIBRARIES section
@
text
@d12 1
a12 1
#	define EXTRA_OBJ_NO_DEPENDENCY -lc -lm -brtl -L../.libbu.sp3 -lbu -L../.libbn.sp3 -lbn -L../.libtcl8.4.sp3 -ltcl -L../.librt.sp3 -lrt
@


1.14
log
@Added "billboard" shader
@
text
@d11 4
d17 4
@


1.13
log
@The nuts and bolts of photon mapping.
@
text
@d16 1
@


1.12
log
@added the null and flat shaders
@
text
@d13 1
@


1.12.4.1
log
@sync branch with HEAD
@
text
@a10 4
#if defined(RESOLVE_LIBRARIES)
#	define EXTRA_OBJ_NO_DEPENDENCY -lc -lm -brtl -L../.libbu.sp3 -lbu -L../.libbn.sp3 -lbn -L../.libtcl8.4.sp3 -ltcl8.4 -L../.librt.sp3 -lrt
#endif

a12 5
	refract \
	wray \
	shade \
	material \
	photonmap \
a14 1
	sh_billboard \
@


1.12.6.1
log
@sync to HEAD...
@
text
@a10 4
#if defined(RESOLVE_LIBRARIES)
#	define EXTRA_OBJ_NO_DEPENDENCY -lc -lm -brtl -L../.libbu.sp3 -lbu -L../.libbn.sp3 -lbn -L../.libtcl8.4.sp3 -ltcl8.4 -L../.librt.sp3 -lrt
#endif

a12 5
	refract \
	wray \
	shade \
	material \
	photonmap \
a14 1
	sh_billboard \
@


1.12.8.1
log
@photon mapping added to cakefile
@
text
@a12 1
	photonmap \
@


1.11
log
@alphabetized files for ease of compilation filtering
@
text
@d19 1
d24 1
@


1.10
log
@Added a shader which evaluates a Tcl script to determine the shading results.
@
text
@d13 16
a28 1
	sh_text sh_cloud \
d30 6
a35 4
	sh_plastic sh_cook sh_spm sh_light \
	sh_wood sh_stxt sh_points sh_toyota \
	sh_camo sh_scloud sh_air sh_fire sh_rtrans sh_brdf \
	sh_gauss sh_noise sh_prj sh_grass sh_treetherm sh_tcl\
@


1.9
log
@Removed two experiment shaders from the distribution
@
text
@d18 1
a18 1
	sh_gauss sh_noise sh_prj sh_grass sh_treetherm \
@


1.8
log
@
Mike Caruso added two shaders!
@
text
@d18 1
a18 1
	sh_gauss sh_noise sh_prj sh_grass sh_treetherm sh_brick sh_noiseperlin\
@


1.7
log
@Added treetherm shader
@
text
@d18 1
a18 1
	sh_gauss sh_noise sh_prj sh_grass sh_treetherm \
@


1.6
log
@cs shader was never completed, and is kinda stupid anyway.
@
text
@d18 1
a18 1
	sh_gauss sh_noise sh_prj sh_grass \
@


1.5
log
@sh_xxx.c is no longer compiled each time.  It's not added to the library.
@
text
@d17 1
a17 1
	sh_camo sh_scloud sh_air sh_fire sh_cs sh_rtrans sh_brdf \
@


1.4
log
@The "marble" shader has been deleted and re-implemented using the new noise
functions.  The new marble shader is in sh_camo.c
@
text
@a20 6
/*
 *  sh_xxx is included at the end of the list to ensure that it compiles.
 *  However, it is not added to the list of actual shaders in init.c,
 *  so there is no runtime overhead from this.
 */

@


1.3
log
@turb.c moved in to support marble/wood shaders
@
text
@d16 1
a16 1
	sh_marble sh_wood sh_stxt sh_points sh_toyota \
@


1.2
log
@Moved optical shaders from rt/ to liboptical/
The only modifications involved moving and splitting
rt/material.h into h/shadefuncs.h and h/shadework.h,
and in changing the calling sequence to mlib_setup() in rt/material.c

Now the only shader function called directly by RT is
in liboptical/init.c: optical_shader_init().
It adds all the individual shaders to the "mfuncs" shader list.
@
text
@d19 1
a19 1
	sh_xxx
@


1.1
log
@liboptical Cakefile
@
text
@d12 1
d18 8
a25 1
	sh_gauss sh_noise sh_prj sh_grass
@
