Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
a94a9232
Commit
a94a9232
authored
13 years ago
by
Alissa Sabre
Browse files
Options
Downloads
Patches
Plain Diff
storm-1723: fix character display when a lot of different characters are used
parent
dbc91a7f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/llrender/llfontgl.cpp
+12
-0
12 additions, 0 deletions
indra/llrender/llfontgl.cpp
with
13 additions
and
0 deletions
doc/contributions.txt
+
1
−
0
View file @
a94a9232
...
@@ -159,6 +159,7 @@ Alissa Sabre
...
@@ -159,6 +159,7 @@ Alissa Sabre
VWR-12620
VWR-12620
VWR-12789
VWR-12789
SNOW-322
SNOW-322
STORM-1723
Alliez Mysterio
Alliez Mysterio
Angus Boyd
Angus Boyd
VWR-592
VWR-592
...
...
This diff is collapsed.
Click to expand it.
indra/llrender/llfontgl.cpp
+
12
−
0
View file @
a94a9232
...
@@ -304,6 +304,18 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
...
@@ -304,6 +304,18 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
S32
next_bitmap_num
=
fgi
->
mBitmapNum
;
S32
next_bitmap_num
=
fgi
->
mBitmapNum
;
if
(
next_bitmap_num
!=
bitmap_num
)
if
(
next_bitmap_num
!=
bitmap_num
)
{
{
// Actually draw the queued glyphs before switching their texture;
// otherwise the queued glyphs will be taken from wrong textures.
if
(
glyph_count
>
0
)
{
gGL
.
begin
(
LLRender
::
QUADS
);
{
gGL
.
vertexBatchPreTransformed
(
vertices
,
uvs
,
colors
,
glyph_count
*
4
);
}
gGL
.
end
();
glyph_count
=
0
;
}
bitmap_num
=
next_bitmap_num
;
bitmap_num
=
next_bitmap_num
;
LLImageGL
*
font_image
=
font_bitmap_cache
->
getImageGL
(
bitmap_num
);
LLImageGL
*
font_image
=
font_bitmap_cache
->
getImageGL
(
bitmap_num
);
gGL
.
getTexUnit
(
0
)
->
bind
(
font_image
);
gGL
.
getTexUnit
(
0
)
->
bind
(
font_image
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment