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
|
diff -ur riceplugin.orig/DaedalusGraphics.cpp riceplugin/DaedalusGraphics.cpp
--- riceplugin.orig/DaedalusGraphics.cpp 2003-09-19 01:22:36.335328472 -0400
+++ riceplugin/DaedalusGraphics.cpp 2003-09-19 01:22:36.470307952 -0400
@@ -18,6 +18,7 @@
*/
#include "stdafx.h"
#include "_BldNum.h"
+#include <assert.h>
#ifndef _WIN32
#include <unistd.h>
diff -ur riceplugin.orig/DecodedMux.cpp riceplugin/DecodedMux.cpp
--- riceplugin.orig/DecodedMux.cpp 2003-09-19 01:22:36.366323760 -0400
+++ riceplugin/DecodedMux.cpp 2003-09-19 01:22:48.379497480 -0400
@@ -760,7 +760,7 @@
ShadeConstMergeMapType MergeShadeWithConstantsMaps[] =
{
0, SHADE_DO_NOTHING,
- 0x0007000600070006, SHADE_MOD_ENV, // SHADE * ENV
+ SHADE_DO_NOTHING, SHADE_MOD_ENV, // SHADE * ENV
};
// 0x05070501, 0x00070006 //(1 - PRIM) * ENV + PRIM
diff -ur riceplugin.orig/OGLCombinerTNT2.cpp riceplugin/OGLCombinerTNT2.cpp
--- riceplugin.orig/OGLCombinerTNT2.cpp 2003-09-19 01:22:36.340327712 -0400
+++ riceplugin/OGLCombinerTNT2.cpp 2003-09-19 01:25:36.859884568 -0400
@@ -120,22 +120,22 @@
GLenum COGLColorCombinerTNT2::RGBArgsMap[] =
{
- {GL_ZERO, }, //MUX_0
- {GL_ZERO, }, //MUX_1
- {GL_PREVIOUS_EXT, }, //MUX_COMBINED,
- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0,
- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1,
- {GL_CONSTANT_EXT, }, //MUX_PRIM,
- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE,
- {GL_CONSTANT_EXT, }, //MUX_ENV,
- {GL_PREVIOUS_EXT, }, //MUX_COMBALPHA,
- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA,
- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA,
- {GL_CONSTANT_EXT, }, //MUX_PRIM_ALPHA,
- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE_ALPHA,
- {GL_CONSTANT_EXT, }, //MUX_ENV_ALPHA,
- {GL_CONSTANT_EXT, }, //MUX_LODFRAC,
- {GL_CONSTANT_EXT, }, //MUX_PRIMLODFRAC,
+ GL_ZERO,
+ GL_ZERO,
+ GL_PREVIOUS_EXT,
+ GL_TEXTURE0_ARB,
+ GL_TEXTURE1_ARB,
+ GL_CONSTANT_EXT,
+ GL_PRIMARY_COLOR_EXT,
+ GL_CONSTANT_EXT,
+ GL_PREVIOUS_EXT,
+ GL_TEXTURE0_ARB,
+ GL_TEXTURE1_ARB,
+ GL_CONSTANT_EXT,
+ GL_PRIMARY_COLOR_EXT,
+ GL_CONSTANT_EXT,
+ GL_CONSTANT_EXT,
+ GL_CONSTANT_EXT,
};
diff -ur riceplugin.orig/OGLExtCombiner.cpp riceplugin/OGLExtCombiner.cpp
--- riceplugin.orig/OGLExtCombiner.cpp 2003-09-19 01:22:36.371323000 -0400
+++ riceplugin/OGLExtCombiner.cpp 2003-09-19 01:24:56.994944960 -0400
@@ -474,22 +474,22 @@
GLenum COGLExtColorCombiner::RGBArgsMap[] =
{
- {GL_PRIMARY_COLOR_ARB, }, //MUX_0
- {GL_PRIMARY_COLOR_ARB, }, //MUX_1
- {GL_PREVIOUS_ARB, }, //MUX_COMBINED,
- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0,
- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1,
- {GL_CONSTANT_ARB, }, //MUX_PRIM,
- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE,
- {GL_CONSTANT_ARB, }, //MUX_ENV,
- {GL_PREVIOUS_ARB, }, //MUX_COMBALPHA,
- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA,
- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA,
- {GL_CONSTANT_ARB, }, //MUX_PRIM_ALPHA,
- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE_ALPHA,
- {GL_CONSTANT_ARB, }, //MUX_ENV_ALPHA,
- {GL_CONSTANT_ARB, }, //MUX_LODFRAC,
- {GL_CONSTANT_ARB, }, //MUX_PRIMLODFRAC,
+ GL_PRIMARY_COLOR_ARB,
+ GL_PRIMARY_COLOR_ARB,
+ GL_PREVIOUS_ARB,
+ GL_TEXTURE0_ARB,
+ GL_TEXTURE1_ARB,
+ GL_CONSTANT_ARB,
+ GL_PRIMARY_COLOR_ARB,
+ GL_CONSTANT_ARB,
+ GL_PREVIOUS_ARB,
+ GL_TEXTURE0_ARB,
+ GL_TEXTURE1_ARB,
+ GL_CONSTANT_ARB,
+ GL_PRIMARY_COLOR_ARB,
+ GL_CONSTANT_ARB,
+ GL_CONSTANT_ARB,
+ GL_CONSTANT_ARB,
};
diff -ur riceplugin.orig/unique.h riceplugin/unique.h
--- riceplugin.orig/unique.h 2003-09-19 01:22:36.336328320 -0400
+++ riceplugin/unique.h 2003-09-19 01:22:36.473307496 -0400
@@ -39,6 +39,7 @@
//
//
+#include <assert.h>
#ifdef _MSC_VER
#include <crtdbg.h>
#endif
|
GitWeb