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
|
Index: code/renderer/tr_shadows.c
===================================================================
--- code/renderer/tr_shadows.c (revision 1305)
+++ code/renderer/tr_shadows.c (working copy)
Index: code/renderer/tr_surface.c
===================================================================
--- code/renderer/tr_surface.c (revision 1305)
+++ code/renderer/tr_surface.c (working copy)
Index: code/renderer/tr_sky.c
===================================================================
--- code/renderer/tr_sky.c (revision 1305)
+++ code/renderer/tr_sky.c (working copy)
Index: code/renderer/tr_shade.c
===================================================================
--- code/renderer/tr_shade.c (revision 1305)
+++ code/renderer/tr_shade.c (working copy)
Index: code/renderer/tr_backend.c
===================================================================
--- code/renderer/tr_backend.c (revision 1305)
+++ code/renderer/tr_backend.c (working copy)
@@ -700,6 +700,9 @@
void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
int i, j;
int start, end;
+ vec2_t texcoords[4];
+ vec2_t verts[4];
+ glIndex_t indicies[6] = {0, 1, 2, 0, 3, 2};
if ( !tr.registered ) {
return;
@@ -729,7 +732,7 @@
if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
- qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
+ qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
@@ -749,18 +752,23 @@
RB_SetGL2D();
- qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight );
+ qglColor4f( tr.identityLight, tr.identityLight, tr.identityLight, 1.0f );
- qglBegin (GL_QUADS);
- qglTexCoord2f ( 0.5f / cols, 0.5f / rows );
- qglVertex2f (x, y);
- qglTexCoord2f ( ( cols - 0.5f ) / cols , 0.5f / rows );
- qglVertex2f (x+w, y);
- qglTexCoord2f ( ( cols - 0.5f ) / cols, ( rows - 0.5f ) / rows );
- qglVertex2f (x+w, y+h);
- qglTexCoord2f ( 0.5f / cols, ( rows - 0.5f ) / rows );
- qglVertex2f (x, y+h);
- qglEnd ();
+ verts[0][0] = x; verts[0][1] = y;
+ verts[1][0] = x+w; verts[1][1] = y;
+ verts[2][0] = x+w; verts[2][1] = y+h;
+ verts[3][0] = x; verts[3][1] = y+h;
+
+ texcoords[0][0] = 0.5f/cols; texcoords[0][1] = 0.5f/rows;
+ texcoords[1][0] = (cols-0.5f)/cols; texcoords[1][1] = 0.5f/rows;
+ texcoords[2][0] = (cols-0.5f)/cols; texcoords[2][1] = (rows-0.5f)/rows;
+ texcoords[3][0] = 0.5f/cols; texcoords[3][1] = (rows-0.5f)/rows;
+
+ qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
+ qglTexCoordPointer( 2, GL_FLOAT, 0, texcoords );
+ qglVertexPointer ( 2, GL_FLOAT, 0, verts );
+ qglDrawElements( GL_TRIANGLE_STRIP, 6, GL_INDEX_TYPE, indicies );
+ qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
}
void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
@@ -771,7 +779,7 @@
if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
- qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
+ qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
@@ -943,6 +951,9 @@
image_t *image;
float x, y, w, h;
int start, end;
+ vec2_t texcoords[4] = { {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f} };
+ vec2_t verts[4];
+ glIndex_t indicies[6] = { 0, 1, 2, 0, 3, 2};
if ( !backEnd.projection2D ) {
RB_SetGL2D();
@@ -954,6 +965,8 @@
start = ri.Milliseconds();
+ qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
+
for ( i=0 ; i<tr.numImages ; i++ ) {
image = tr.images[i];
@@ -968,19 +981,17 @@
h *= image->uploadHeight / 512.0f;
}
- GL_Bind( image );
- qglBegin (GL_QUADS);
- qglTexCoord2f( 0, 0 );
- qglVertex2f( x, y );
- qglTexCoord2f( 1, 0 );
- qglVertex2f( x + w, y );
- qglTexCoord2f( 1, 1 );
- qglVertex2f( x + w, y + h );
- qglTexCoord2f( 0, 1 );
- qglVertex2f( x, y + h );
- qglEnd();
+ verts[0][0] = x; verts[0][1] = y;
+ verts[1][0] = x+w; verts[1][1] = y;
+ verts[2][0] = x+w; verts[2][1] = y+h;
+ verts[3][0] = x; verts[3][1] = y+h;
+
+ qglTexCoordPointer( 2, GL_FLOAT, 0, texcoords );
+ qglVertexPointer ( 2, GL_FLOAT, 0, verts );
+ qglDrawElements( GL_TRIANGLE_STRIP, 6, GL_INDEX_TYPE, indicies );
}
+ qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
qglFinish();
end = ri.Milliseconds();
|
