r128438 introduced a hilarious piece of mergefuckery about five weeks ago. eyeball this diff for a good laugh. I've verified that the evil twin is *identical*.
reviewed by palmer.master
Adam Moss
parent
4559c55765
commit
03e4be4305
|
|
@ -104,196 +104,6 @@ public:
|
|||
F32 getDescenderHeight() const;
|
||||
|
||||
|
||||
// For a lowercase "g":
|
||||
//
|
||||
// ------------------------------
|
||||
// ^ ^
|
||||
// | |
|
||||
// xxx x |Ascender
|
||||
// x x v |
|
||||
// --------- xxxx-------------- Baseline
|
||||
// ^ x |
|
||||
// | Descender x |
|
||||
// v xxxx |LineHeight
|
||||
// ----------------------- |
|
||||
// v
|
||||
// ------------------------------
|
||||
|
||||
enum
|
||||
{
|
||||
FIRST_CHAR = 32,
|
||||
NUM_CHARS = 127 - 32,
|
||||
LAST_CHAR_BASIC = 127,
|
||||
|
||||
// Need full 8-bit ascii range for spanish
|
||||
NUM_CHARS_FULL = 255 - 32,
|
||||
LAST_CHAR_FULL = 255
|
||||
};
|
||||
|
||||
F32 getXAdvance(llwchar wc) const;
|
||||
F32 getXKerning(llwchar char_left, llwchar char_right) const; // Get the kerning between the two characters
|
||||
|
||||
BOOL hasGlyph(llwchar wch) const; // Has a glyph for this character
|
||||
BOOL addChar(llwchar wch) const; // Add a new character to the font if necessary
|
||||
BOOL addGlyph(llwchar wch, U32 glyph_index) const; // Add a new glyph to the existing font
|
||||
BOOL addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
|
||||
|
||||
LLFontGlyphInfo* getGlyphInfo(llwchar wch) const;
|
||||
|
||||
void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
|
||||
void renderGlyph(U32 glyph_index) const;
|
||||
|
||||
void reset(F32 vert_dpi, F32 horz_dpi);
|
||||
void resetBitmapCache();
|
||||
|
||||
void destroyGL();
|
||||
|
||||
BOOL getIsFallback() const;
|
||||
|
||||
const std::string& getName() const;
|
||||
|
||||
F32 getPointSize() const;
|
||||
|
||||
const LLPointer<LLFontBitmapCache> getFontBitmapCache() const;
|
||||
|
||||
void setStyle(U8 style);
|
||||
U8 getStyle() const;
|
||||
|
||||
private:
|
||||
void setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32 width, U32 height, U8 *data, S32 stride = 0) const;
|
||||
|
||||
std::string mName;
|
||||
|
||||
U8 mStyle;
|
||||
|
||||
F32 mPointSize;
|
||||
F32 mAscender;
|
||||
F32 mDescender;
|
||||
F32 mLineHeight;
|
||||
|
||||
LLFT_Face mFTFace;
|
||||
|
||||
BOOL mIsFallback;
|
||||
font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
|
||||
|
||||
BOOL mValid;
|
||||
|
||||
typedef std::map<llwchar, LLFontGlyphInfo*> char_glyph_info_map_t;
|
||||
mutable char_glyph_info_map_t mCharGlyphInfoMap; // Information about glyph location in bitmap
|
||||
|
||||
mutable LLPointer<LLFontBitmapCache> mFontBitmapCachep;
|
||||
|
||||
mutable S32 mRenderGlyphCount;
|
||||
mutable S32 mAddGlyphCount;
|
||||
};
|
||||
|
||||
#endif // LL_FONTFREETYPE_H
|
||||
/**
|
||||
* @file llfontfreetype.h
|
||||
* @brief Font library wrapper
|
||||
*
|
||||
* $LicenseInfo:firstyear=2002&license=viewergpl$
|
||||
*
|
||||
* Copyright (c) 2002-2009, Linden Research, Inc.
|
||||
*
|
||||
* Second Life Viewer Source Code
|
||||
* The source code in this file ("Source Code") is provided by Linden Lab
|
||||
* to you under the terms of the GNU General Public License, version 2.0
|
||||
* ("GPL"), unless you have obtained a separate licensing agreement
|
||||
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
||||
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
||||
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
||||
*
|
||||
* There are special exceptions to the terms and conditions of the GPL as
|
||||
* it is applied to this Source Code. View the full text of the exception
|
||||
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
||||
* online at
|
||||
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
||||
*
|
||||
* By copying, modifying or distributing this software, you acknowledge
|
||||
* that you have read and understood your obligations described above,
|
||||
* and agree to abide by those obligations.
|
||||
*
|
||||
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
||||
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
||||
* COMPLETENESS OR PERFORMANCE.
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLFONTFREETYPE_H
|
||||
#define LL_LLFONTFREETYPE_H
|
||||
|
||||
#include <map>
|
||||
#include "llpointer.h"
|
||||
#include "llstl.h"
|
||||
|
||||
#include "llimagegl.h"
|
||||
#include "llfontbitmapcache.h"
|
||||
|
||||
// Hack. FT_Face is just a typedef for a pointer to a struct,
|
||||
// but there's no simple forward declarations file for FreeType,
|
||||
// and the main include file is 200K.
|
||||
// We'll forward declare the struct here. JC
|
||||
struct FT_FaceRec_;
|
||||
typedef struct FT_FaceRec_* LLFT_Face;
|
||||
|
||||
class LLFontManager
|
||||
{
|
||||
public:
|
||||
static void initClass();
|
||||
static void cleanupClass();
|
||||
|
||||
private:
|
||||
LLFontManager();
|
||||
~LLFontManager();
|
||||
};
|
||||
|
||||
class LLFontGlyphInfo
|
||||
{
|
||||
public:
|
||||
LLFontGlyphInfo(U32 index);
|
||||
|
||||
U32 mGlyphIndex;
|
||||
|
||||
// Metrics
|
||||
S32 mWidth; // In pixels
|
||||
S32 mHeight; // In pixels
|
||||
F32 mXAdvance; // In pixels
|
||||
F32 mYAdvance; // In pixels
|
||||
BOOL mMetricsValid; // We have up-to-date metrics for this glyph
|
||||
|
||||
// Information for actually rendering
|
||||
BOOL mIsRendered; // We actually have rendered this glyph
|
||||
S32 mXBitmapOffset; // Offset to the origin in the bitmap
|
||||
S32 mYBitmapOffset; // Offset to the origin in the bitmap
|
||||
S32 mXBearing; // Distance from baseline to left in pixels
|
||||
S32 mYBearing; // Distance from baseline to top in pixels
|
||||
S32 mBitmapNum; // Which bitmap in the bitmap cache contains this glyph
|
||||
};
|
||||
|
||||
extern LLFontManager *gFontManagerp;
|
||||
|
||||
class LLFontFreetype : public LLRefCount
|
||||
{
|
||||
public:
|
||||
LLFontFreetype();
|
||||
~LLFontFreetype();
|
||||
|
||||
// is_fallback should be true for fallback fonts that aren't used
|
||||
// to render directly (Unicode backup, primarily)
|
||||
BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback);
|
||||
|
||||
typedef std::vector<LLPointer<LLFontFreetype> > font_vector_t;
|
||||
|
||||
void setFallbackFonts(const font_vector_t &font);
|
||||
const font_vector_t &getFallbackFonts() const;
|
||||
|
||||
// Global font metrics - in units of pixels
|
||||
F32 getLineHeight() const;
|
||||
F32 getAscenderHeight() const;
|
||||
F32 getDescenderHeight() const;
|
||||
|
||||
|
||||
// For a lowercase "g":
|
||||
//
|
||||
// ------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue