mirror of
https://github.com/bkaradzic/bgfx.git
synced 2026-02-17 20:52:36 +01:00
Format files to remove trailing spaces (#3384)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* Copyright 2013 Jeremie Roy. All rights reserved.
|
||||
* License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
@@ -522,7 +522,7 @@ float FontManager::getKerning(FontHandle _handle, CodePoint _prevCodePoint, Code
|
||||
if (isValid(cachedFont.masterFontHandle))
|
||||
{
|
||||
CachedFont& baseFont = m_cachedFonts[cachedFont.masterFontHandle.idx];
|
||||
return baseFont.trueTypeFont->m_scale
|
||||
return baseFont.trueTypeFont->m_scale
|
||||
* stbtt_GetCodepointKernAdvance(&baseFont.trueTypeFont->m_font, _prevCodePoint, _codePoint)
|
||||
* cachedFont.fontInfo.scale;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ uniform vec4 u_params;
|
||||
#define u_distanceMultiplier u_params.y
|
||||
|
||||
void main()
|
||||
{
|
||||
{
|
||||
vec4 color = textureCube(s_texColor, v_texcoord0.xyz);
|
||||
int index = int(v_texcoord0.w*4.0 + 0.5);
|
||||
float rgba[4];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
|
||||
// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
|
||||
@@ -7,5 +7,5 @@ SAMPLER2D(s_tex, 0);
|
||||
void main()
|
||||
{
|
||||
vec4 texel = texture2D(s_tex, v_texcoord0);
|
||||
gl_FragColor = texel * v_color0;
|
||||
gl_FragColor = texel * v_color0;
|
||||
}
|
||||
|
||||
@@ -10,4 +10,3 @@ void main()
|
||||
v_texcoord0 = a_texcoord0;
|
||||
v_color0 = a_color0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user