Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Richard Gobeille
EDuke32
Commits
617ceff1
Commit
617ceff1
authored
Jun 29, 2022
by
Richard Gobeille
Browse files
engine: revert part of
e8ea24b8
parent
84484f5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/build/src/polymost.cpp
View file @
617ceff1
...
...
@@ -9763,18 +9763,18 @@ int32_t polymost_printtext256(int32_t xpos, int32_t ypos, int16_t col, int16_t b
glPolygonMode
(
GL_FRONT_AND_BACK
,
GL_FILL
);
lastglpolygonmode
=
0
;
int
const
namelen
=
Bstrlen
(
name
);
if
(
backcol
>=
0
)
{
int
const
c
=
Bstrlen
(
name
);
glColor4ub
(
b
.
r
,
b
.
g
,
b
.
b
,
255
);
glBegin
(
GL_QUADS
);
glVertex2i
(
xpos
,
ypos
);
glVertex2i
(
xpos
,
ypos
+
(
fontsize
?
6
:
8
));
glVertex2i
(
xpos
+
(
namelen
<<
(
3
-
fontsize
)),
ypos
+
(
fontsize
?
6
:
8
));
glVertex2i
(
xpos
+
(
namelen
<<
(
3
-
fontsize
)),
ypos
);
glVertex2i
(
xpos
+
(
c
<<
(
3
-
fontsize
)),
ypos
+
(
fontsize
?
6
:
8
));
glVertex2i
(
xpos
+
(
c
<<
(
3
-
fontsize
)),
ypos
);
glEnd
();
}
...
...
@@ -9786,9 +9786,9 @@ int32_t polymost_printtext256(int32_t xpos, int32_t ypos, int16_t col, int16_t b
vec2f_t
const
tc
=
{
fontsize
?
(
4.
f
/
256.
f
)
:
(
8.
f
/
256.
f
),
fontsize
?
(
6.
f
/
128.
f
)
:
(
8.
f
/
128.
f
)
};
polymost_startBufferedDrawing
(
namelen
*
4
);
glBegin
(
GL_QUADS
);
for
(
bssize_t
c
=
0
;
name
[
c
];
++
c
)
for
(
bssize_t
c
=
0
;
name
[
c
];
++
c
)
{
if
(
name
[
c
]
==
'^'
&&
isdigit
(
name
[
c
+
1
]))
{
...
...
@@ -9821,14 +9821,22 @@ int32_t polymost_printtext256(int32_t xpos, int32_t ypos, int16_t col, int16_t b
vec2f_t
const
t
=
{
(
float
)(
name
[
c
]
%
32
)
*
(
1.0
f
/
32.
f
),
(
float
)((
name
[
c
]
/
32
)
+
(
fontsize
*
8
))
*
(
1.0
f
/
16.
f
)
};
polymost_bufferVert
(
vec3f_t
{
(
float
)
xpos
,
(
float
)
ypos
,
0.
f
},
t
);
polymost_bufferVert
(
vec3f_t
{
(
float
)
xpos
+
(
8
>>
fontsize
),
(
float
)
ypos
,
0.
f
},
{
t
.
x
+
tc
.
x
,
t
.
y
});
polymost_bufferVert
(
vec3f_t
{
(
float
)(
xpos
+
(
8
>>
fontsize
)),
(
float
)(
ypos
+
(
fontsize
?
6
:
8
)),
0.
f
},
{
t
.
x
+
tc
.
x
,
t
.
y
+
tc
.
y
});
polymost_bufferVert
(
vec3f_t
{
(
float
)
xpos
,
(
float
)(
ypos
+
(
fontsize
?
6
:
8
)),
0.
f
},
{
t
.
x
,
t
.
y
+
tc
.
y
});
glTexCoord2f
(
t
.
x
,
t
.
y
);
glVertex2i
(
xpos
,
ypos
);
glTexCoord2f
(
t
.
x
+
tc
.
x
,
t
.
y
);
glVertex2i
(
xpos
+
(
8
>>
fontsize
),
ypos
);
glTexCoord2f
(
t
.
x
+
tc
.
x
,
t
.
y
+
tc
.
y
);
glVertex2i
(
xpos
+
(
8
>>
fontsize
),
ypos
+
(
fontsize
?
6
:
8
));
glTexCoord2f
(
t
.
x
,
t
.
y
+
tc
.
y
);
glVertex2i
(
xpos
,
ypos
+
(
fontsize
?
6
:
8
));
xpos
+=
(
8
>>
fontsize
);
}
polymost_finishBufferedDrawing
(
GL_QUADS
);
glEnd
(
);
glDepthMask
(
GL_TRUE
);
// re-enable writing to the z-buffer
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment