1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
diff -Naur Pixie.orig/src/common/containers.h Pixie.gcc34/src/common/containers.h
--- Pixie.orig/src/common/containers.h 2004-06-13 20:00:09.000000000 -0700
+++ Pixie.gcc34/src/common/containers.h 2004-06-14 19:02:34.133763870 -0700
@@ -53,13 +53,13 @@
virtual ~CDictionary() { }
// inserts an entity into the dictionary
- virtual void insert(keyType,valType) = NULL;
+ virtual void insert(keyType,valType) = 0;
// return 1 if the entity is found in the dictionary
- virtual int find(keyType,valType &) const = NULL;
+ virtual int find(keyType,valType &) const = 0;
// return 1 if the entity is found in the dictionary and erase it
- virtual int erase(keyType,valType &) = NULL;
+ virtual int erase(keyType,valType &) = 0;
// Delete the dictionary including everything in it
- virtual void destroy() = NULL;
+ virtual void destroy() = 0;
};
///////////////////////////////////////////////////////////////////////
diff -Naur Pixie.orig/src/framebuffer/framebuffer.h Pixie.gcc34/src/framebuffer/framebuffer.h
--- Pixie.orig/src/framebuffer/framebuffer.h 2004-06-13 20:00:09.000000000 -0700
+++ Pixie.gcc34/src/framebuffer/framebuffer.h 2004-06-14 19:01:19.992178690 -0700
@@ -50,8 +50,8 @@
char *name; // Name of the display
char *samples; // Samples for the display
- virtual int data(int,int,int,int,float *) = NULL; // Store data
- virtual void finish() = NULL; // Finish displaying the data
+ virtual int data(int,int,int,int,float *) = 0; // Store data
+ virtual void finish() = 0; // Finish displaying the data
void clampData(int,int,float *); // Clamp the data so that everything is between 0 and 1
};
diff -Naur Pixie.orig/src/ri/cache.h Pixie.gcc34/src/ri/cache.h
--- Pixie.orig/src/ri/cache.h 2004-06-13 20:00:06.000000000 -0700
+++ Pixie.gcc34/src/ri/cache.h 2004-06-14 19:02:59.297550257 -0700
@@ -52,8 +52,8 @@
CCache(const char *,unsigned int);
~CCache();
- virtual void lookup(float *,const float *,const float *,const CGlobalIllumLookup *) = NULL;
- virtual void cachesample(float *,const float *,const float *,float) = NULL;
+ virtual void lookup(float *,const float *,const float *,const CGlobalIllumLookup *) = 0;
+ virtual void cachesample(float *,const float *,const float *,float) = 0;
virtual void finalize(const CGlobalIllumLookup *) { }
protected:
diff -Naur Pixie.orig/src/ri/hierarchy.h Pixie.gcc34/src/ri/hierarchy.h
--- Pixie.orig/src/ri/hierarchy.h 2004-06-13 20:00:06.000000000 -0700
+++ Pixie.gcc34/src/ri/hierarchy.h 2004-06-14 19:04:02.661940051 -0700
@@ -49,9 +49,9 @@
// Date last edited : 3/18/2002
class CTracable {
public:
- virtual void bound(float *,float *) const = NULL;
- virtual void intersect(CRay *) = NULL;
- virtual int intersect(const float *,const float *) const = NULL;
+ virtual void bound(float *,float *) const = 0;
+ virtual void intersect(CRay *) = 0;
+ virtual int intersect(const float *,const float *) const = 0;
int ID;
};
diff -Naur Pixie.orig/src/ri/reyes.h Pixie.gcc34/src/ri/reyes.h
--- Pixie.orig/src/ri/reyes.h 2004-06-13 20:00:07.000000000 -0700
+++ Pixie.gcc34/src/ri/reyes.h 2004-06-14 19:03:21.869770596 -0700
@@ -123,10 +123,10 @@
void renderFrame(); // Right after world end to force rendering of the entire frame
// The following functions must be overriden by the child rasterizer
- virtual void rasterBegin(int,int,int,int) = NULL;
- virtual void rasterDrawPrimitives(TRasterPrimitive *,int)= NULL;
- virtual int rasterProbeTri(TRasterPrimitive *) = NULL;
- virtual void rasterEnd(float *) = NULL;
+ virtual void rasterBegin(int,int,int,int) = 0;
+ virtual void rasterDrawPrimitives(TRasterPrimitive *,int)= 0;
+ virtual int rasterProbeTri(TRasterPrimitive *) = 0;
+ virtual void rasterEnd(float *) = 0;
void drawObject(CObject *,const float *,const float *); // Draw an object
diff -Naur Pixie.orig/src/ri/shader.h Pixie.gcc34/src/ri/shader.h
--- Pixie.orig/src/ri/shader.h 2004-06-13 20:00:07.000000000 -0700
+++ Pixie.gcc34/src/ri/shader.h 2004-06-14 19:03:45.208862524 -0700
@@ -211,7 +211,7 @@
// Date last edited : 3/23/2003
class CGatherVariable {
public:
- virtual void record(int,CGatherRay **,float **varying) = NULL;
+ virtual void record(int,CGatherRay **,float **varying) = 0;
CGatherVariable *next; // The next item in the linked list
int shade; // TRUE if this variable requires shading
@@ -395,12 +395,12 @@
void detach() { refCount--; if (refCount == 0) delete this; }
void check() { if (refCount == 0) delete this; }
- virtual void illuminate(CShadingContext *) = NULL;
- virtual void setParameters(int,char **,void **) = NULL;
- virtual int getParameter(const char *,void *) = NULL;
- virtual void execute(CShadingContext *) = NULL;
- virtual unsigned int requiredParameters() = NULL;
- virtual const char *getName() = NULL;
+ virtual void illuminate(CShadingContext *) = 0;
+ virtual void setParameters(int,char **,void **) = 0;
+ virtual int getParameter(const char *,void *) = 0;
+ virtual void execute(CShadingContext *) = 0;
+ virtual unsigned int requiredParameters() = 0;
+ virtual const char *getName() = 0;
int refCount; // The refcount to manage the clones
CXform *xform;
diff -Naur Pixie.orig/src/ri/shading.h Pixie.gcc34/src/ri/shading.h
--- Pixie.orig/src/ri/shading.h 2004-06-13 20:00:07.000000000 -0700
+++ Pixie.gcc34/src/ri/shading.h 2004-06-14 19:04:38.863878128 -0700
@@ -176,10 +176,10 @@
int depth; // The transparency depth of the bundle
CShaderInstance *postShader; // The shader to execute after the raytrace
- virtual int postTraceAction() = NULL; // The function to be called after the rays are traced
- virtual void postShade(int,CRay **,float **) = NULL; // The function that's called with the shade results
- virtual void postShade(int,CRay **) = NULL; // The function that's called with the rays that don't intersect anything
- virtual void post() = NULL; // The function that's called after each pass
+ virtual int postTraceAction() = 0; // The function to be called after the rays are traced
+ virtual void postShade(int,CRay **,float **) = 0; // The function that's called with the shade results
+ virtual void postShade(int,CRay **) = 0; // The function that's called with the rays that don't intersect anything
+ virtual void post() = 0; // The function that's called after each pass
};
@@ -201,17 +201,17 @@
void beginWorld(); // We're starting to specify geometry
void endWorld(); // We're done specifying geometry
- virtual void renderFrame() = NULL; // Right after world end to force rendering of the entire frame
+ virtual void renderFrame() = 0; // Right after world end to force rendering of the entire frame
// Delayed rendering functions
- virtual void drawObject(CObject *,const float *,const float *) = NULL;
- virtual void drawTriangle(CObject *,const float *,const float *,const float *) = NULL;
- virtual void drawQuad(CObject *,const float *,const float *,const float *,const float *) = NULL;
+ virtual void drawObject(CObject *,const float *,const float *) = 0;
+ virtual void drawTriangle(CObject *,const float *,const float *,const float *) = 0;
+ virtual void drawQuad(CObject *,const float *,const float *,const float *,const float *) = 0;
// Primitive creation functions
- virtual void drawGrid(CSurface *,int,int,float,float,float,float) = NULL;
- virtual void drawRibbon(CSurface *,int,float,float) = NULL;
- virtual void drawPoints(CSurface *,int) = NULL;
+ virtual void drawGrid(CSurface *,int,int,float,float,float,float) = 0;
+ virtual void drawRibbon(CSurface *,int,float,float) = 0;
+ virtual void drawPoints(CSurface *,int) = 0;
// Some shading functions
CShadingState *currentShadingState; // The current shading state
diff -Naur Pixie.orig/src/ri/texture.h Pixie.gcc34/src/ri/texture.h
--- Pixie.orig/src/ri/texture.h 2004-06-13 20:00:08.000000000 -0700
+++ Pixie.gcc34/src/ri/texture.h 2004-06-14 19:04:53.404443347 -0700
@@ -83,7 +83,7 @@
int fileWidth,fileHeight; // The physical size in the file
protected:
// This function must be overriden by the child class
- virtual void lookupPixel(float *,int,int,const CTextureLookup *) = NULL; // Lookup 4 pixel values
+ virtual void lookupPixel(float *,int,int,const CTextureLookup *) = 0; // Lookup 4 pixel values
};
|
GitWeb