Removed the config.h thing from the .h's in the source dir.
So we should be all set now :) Kent -- mein@cs.umn.edu
This commit is contained in:
@@ -44,15 +44,10 @@
|
||||
#include "BKE_osa_types.h"
|
||||
#include "DNA_material_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/* For #undefs of stupid windows defines */
|
||||
#ifdef WIN32
|
||||
#include "BLI_winstuff.h"
|
||||
|
@@ -35,17 +35,11 @@
|
||||
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_world_types.h"
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* Definitely weird: this equals 1<<21... so wtf?*/
|
||||
#define MAXVERT (2<<20)
|
||||
#define MAXVLAK (2<<20)
|
||||
|
||||
|
||||
/* This is needed to not let VC choke on near and far... old
|
||||
* proprietary MS extensions... */
|
||||
#ifdef WIN32
|
||||
|
@@ -35,10 +35,6 @@
|
||||
|
||||
#include "RE_ShadowBuffer.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
struct LampRen;
|
||||
|
||||
class RE_DummyShadowBuffer : public RE_ShadowBuffer {
|
||||
|
@@ -35,10 +35,6 @@
|
||||
|
||||
#include <iostream.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
struct ShadBuf;
|
||||
struct LampRen;
|
||||
|
||||
|
@@ -35,10 +35,6 @@
|
||||
|
||||
#include "RE_ShadowBuffer.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
struct LampRen;
|
||||
struct Lamp;
|
||||
|
||||
|
@@ -34,10 +34,6 @@
|
||||
#ifndef RE_CALLBACKS_H
|
||||
#define RE_CALLBACKS_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -35,12 +35,6 @@
|
||||
#ifndef EDGERENDER_H
|
||||
#define EDGERENDER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* Add edges to <targetbuf>, which is of size <iw> by <ih>. Use <osanr>
|
||||
* samples, and intensity <i>. <compat> indicates an extra shift in the
|
||||
|
@@ -35,13 +35,6 @@
|
||||
#ifndef ENVMAP_EXT_H
|
||||
#define ENVMAP_EXT_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* no types!!! */
|
||||
/* #include "envmap_types.h" */
|
||||
|
||||
/**
|
||||
* Make environment maps for all objects in the scene that have an
|
||||
* environment map as texture.
|
||||
|
@@ -35,11 +35,6 @@
|
||||
#ifndef ERRORHANDLER_H
|
||||
#define ERRORHANDLER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* error codes */
|
||||
enum RE_RENDER_ERROR {
|
||||
RE_NO_ERROR,
|
||||
|
@@ -35,11 +35,6 @@
|
||||
#ifndef GAMMACORRECTIONTABLES_H
|
||||
#define GAMMACORRECTIONTABLES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* Default gamma. For most CRTs, gamma ranges from 2.2 to 2.5 (Foley), so */
|
||||
/* 2.35 seems appropriate enough. Experience teaches a different number */
|
||||
/* though. Old blender: 2.0. It might be nice to make this a slider */
|
||||
|
@@ -40,10 +40,6 @@
|
||||
#include "DNA_effect_types.h" /* for PartEff type */
|
||||
#include "render_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* Functions */
|
||||
|
||||
void init_def_material(void);
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef JITTER_H
|
||||
#define JITTER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -34,12 +34,6 @@
|
||||
#ifndef OLD_ZBUFFER_TYPES_H
|
||||
#define OLD_ZBUFFER_TYPES_H "$Id$"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
typedef struct PixStr
|
||||
{
|
||||
struct PixStr *next;
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef OUTERRENDERLOOP_H
|
||||
#define OUTERRENDERLOOP_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Outer loop for rendering a single picture.
|
||||
*/
|
||||
|
@@ -42,11 +42,6 @@
|
||||
/* own include */
|
||||
#include "pixelblending_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* Samples pixel, depending on R.osa setting
|
||||
*/
|
||||
|
@@ -36,12 +36,6 @@
|
||||
#ifndef PIXELBLENDING_TYPES_H
|
||||
#define PIXELBLENDING_TYPES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* #include "blender.h" */
|
||||
|
||||
/* Threshold for a 'full' pixel: pixels with alpha above this level are */
|
||||
/* considered opaque This is the decimal value for 0xFFF0 / 0xFFFF */
|
||||
#define RE_FULL_COLOUR_FLOAT 0.9998
|
||||
|
@@ -37,15 +37,8 @@
|
||||
#ifndef PIXELSHADING_H
|
||||
#define PIXELSHADING_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#include "render.h"
|
||||
#include "vanillaRenderPipe_types.h"
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* Render the pixel at (x,y) for object ap. Apply the jitter mask.
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef RENDERHELP_EXT_H
|
||||
#define RENDERHELP_EXT_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef RENDERPREANDPOST_H
|
||||
#define RENDERPREANDPOST_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
void prepareScene(void);
|
||||
void finalizeScene(void);
|
||||
void doClipping( void (*projectfunc)(float *, float *) );
|
||||
|
@@ -33,10 +33,6 @@
|
||||
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* XXX, should die, no good reason to write
|
||||
* regular (non-file related) endian dependant
|
||||
* code.
|
||||
|
@@ -36,10 +36,6 @@
|
||||
#define RENDERCORE_H
|
||||
#include "render_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
struct HaloRen;
|
||||
|
||||
float mistfactor(float *co); /* dist en hoogte, return alpha */
|
||||
|
@@ -38,10 +38,6 @@
|
||||
#include "zbuf_types.h"
|
||||
#include "render_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* float CookTorr(float *n, float *l, float *v, int hard); */
|
||||
void do_lamphalo_tex(LampRen *lar, float *p1, float *p2, float *intens);
|
||||
void spothalo(struct LampRen *lar, float *view, float *intens);
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef SHADBUF_EXT_H
|
||||
#define SHADBUF_EXT_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include "render_types.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@@ -33,10 +33,6 @@
|
||||
#ifndef SHADOWBUFFER_H
|
||||
#define SHADOWBUFFER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -36,13 +36,6 @@
|
||||
#define TEXTURE_EXT_H "$Id$"
|
||||
#define TEXTURE_EXT_H "Copyright (C) 2001 NaN Technologies B.V.
|
||||
|
||||
/* no types!!! */
|
||||
/* #include "texture_types.h" */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
struct Tex;
|
||||
struct MTex;
|
||||
struct HaloRen;
|
||||
|
@@ -37,10 +37,6 @@
|
||||
|
||||
#include "vanillaRenderPipe_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Render pipeline with all kinds of extras.
|
||||
* status-------------------------\/
|
||||
|
@@ -38,10 +38,6 @@
|
||||
#include "vanillaRenderPipe_types.h"
|
||||
#include "zbufferdatastruct_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Z buffer initializer, for new pipeline.
|
||||
* <LI>
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef VANILLARENDERPIPE_TYPES_H
|
||||
#define VANILLARENDERPIPE_TYPES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/* Render defines */
|
||||
#define RE_MAX_OSA_COUNT 16 /* The max. number of possible oversamples */
|
||||
#define RE_MAX_FACES_PER_PIXEL 500 /* max. nr of faces rendered behind one */
|
||||
|
@@ -36,10 +36,6 @@
|
||||
#ifndef ZBUF_H
|
||||
#define ZBUF_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -40,10 +40,6 @@
|
||||
#include "render_types.h"
|
||||
#include "zbuf_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Convert a homogenous coordinate to a z buffer coordinate. The
|
||||
* function makes use of Zmulx, Zmuly, the x and y scale factors for
|
||||
|
@@ -36,10 +36,6 @@
|
||||
#ifndef ZBUF_TYPES_H
|
||||
#define ZBUF_TYPES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@@ -37,10 +37,6 @@
|
||||
|
||||
#include "zbufferdatastruct_types.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Set memory and counters for a fresh z buffer
|
||||
*/
|
||||
|
@@ -35,10 +35,6 @@
|
||||
#ifndef ZBUFFERDATASTRUCT_TYPES_H
|
||||
#define ZBUFFERDATASTRUCT_TYPES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#define RE_ZBUFLEN 64 /* number of lines in the accumulation buffer */
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user