Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix console font resizing #196

Merged
merged 7 commits into from Apr 3, 2019
Merged

Fix console font resizing #196

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f0eecf
Remove unused flag IF_ALPHA
slipher Mar 1, 2019
c7576e3
Remove unused struct field
slipher Mar 25, 2019
a270911
unused local var
slipher Mar 31, 2019
2424b30
Downgrade noisy 'sound file not found' warning to a Notice
slipher Mar 31, 2019
894d52d
Remove vestigial code related to drawing fonts from the VM
slipher Mar 31, 2019
882808e
Clean up some font registration code and fix a couple error handling …
slipher Mar 31, 2019
e75bc76
Make changing the console font size work
slipher Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/engine/renderer/tr_image.cpp
View file
Open in desktop
Expand Up @@ -1047,14 +1047,7 @@ void R_UploadImage( const byte **dataArray, int numLayers, int numMips,
}
else if ( samples == 4 )
{
if ( image->bits & IF_ALPHA )
{
internalFormat = GL_ALPHA8;
}
else
{
internalFormat = GL_RGBA8;
}
internalFormat = GL_RGBA8;
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/engine/renderer/tr_local.h
View file
Open in desktop
Expand Up @@ -512,7 +512,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
{
IF_NONE,
IF_NOPICMIP = BIT( 0 ),
IF_ALPHA = BIT( 1 ),
IF_NORMALMAP = BIT( 2 ),
IF_RGBA16F = BIT( 3 ),
IF_RGBA32F = BIT( 4 ),
Expand Down Expand Up @@ -1094,8 +1093,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )

uint32_t stateBits; // GLS_xxxx mask

bool heightMapInNormalMap;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bed!


bool isCubeMap;

int deformIndex;
Expand Down