Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /cygdrive/c/git/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-03-05 19:36:29 +01:00
parent efd1b2bfa9 b67fa864ff
commit 2b833129c5
6 changed files with 13 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llfont.cpp
View File

@@ -192,6 +192,8 @@ BOOL LLFont::loadFace(const std::string& filename, const F32 point_size, const F
FT_Done_Face(mFTFace);
mFTFace = NULL;
}
llinfos << "Loading font file: " << filename << llendl;
int error;

9
indra/llrender/llfontregistry.cpp
View File

@@ -384,9 +384,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
// This may not be the best solution, but it at least prevents a crash.
if (it != mFontMap.end() && it->second != NULL)
{
llinfos << "-- matching font exists: " << nearest_exact_desc.getName() << " size " << nearest_exact_desc.getSize() << " style " << ((S32) nearest_exact_desc.getStyle()) << llendl;
if (it->second != NULL) {
llinfos << "-- matching font exists: " << nearest_exact_desc.getName() << " size " << nearest_exact_desc.getSize() << " style " << ((S32) nearest_exact_desc.getStyle()) << llendl;
return it->second;
return it->second;
} else {
llwarns << "Failed to find font" << llendl;
}
//Haven't plugged free-type in yet.
// copying underlying Freetype font, and storing in LLFontGL with requested font descriptor
/*LLFontGL *font = new LLFontGL;
@@ -408,6 +412,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
file_names.insert(file_names.end(),
match_default_desc->getFileNames().begin(),
match_default_desc->getFileNames().end());
llinfos << "Found matching fallback fonts: " << match_default_desc->getFileNames().size() << llendl;
}
// Add ultimate fallback list - generated dynamically on linux,

4
indra/llwindow/llwindowsdl.cpp
View File

@@ -2564,7 +2564,7 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
// Use libfontconfig to find us a nice ordered list of fallback fonts
// specific to this system.
std::string final_fallback("/usr/share/fonts/truetype/kochi/kochi-gothic.ttf");
const int max_font_count_cutoff = 40; // fonts are expensive in the current system, don't enumerate an arbitrary number of them
const int max_font_count_cutoff = 100; // fonts are expensive in the current system, don't enumerate an arbitrary number of them
// Our 'ideal' font properties which define the sorting results.
// slant=0 means Roman, index=0 means the first face in a font file
// (the one we actually use), weight=80 means medium weight,
@@ -2654,7 +2654,7 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
}
llinfos << "Using " << rtns.size() << "/" << found_font_count << " system fonts." << llendl;
rtns.push_back(final_fallback);
//rtns.push_back(final_fallback);
return rtns;
}

121
indra/newview/app_settings/settings.xml
View File

@@ -6654,72 +6654,6 @@
<key>Value</key>
<real>0.5</real>
</map>
<key>FontMonospace</key>
<map>
<key>Comment</key>
<string>Name of monospace font that definitely exists (Truetype file name)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>DejaVuSansMono.ttf</string>
</map>
<key>FontSansSerif</key>
<map>
<key>Comment</key>
<string>Name of primary sans-serif font that definitely exists (Truetype file name)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>DroidSans.ttf</string>
</map>
<key>FontSansSerifBundledFallback</key>
<map>
<key>Comment</key>
<string>Name of secondary sans-serif font that definitely exists (Truetype file name)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>DejaVuSansCondensed.ttf</string>
</map>
<key>FontSansSerifBold</key>
<map>
<key>Comment</key>
<string>Name of bold font (Truetype file name)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>DroidSans-Bold.ttf</string>
</map>
<key>FontSansSerifFallback</key>
<map>
<key>Comment</key>
<string>Name of sans-serif font (Truetype file name)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>FontSansSerifFallbackScale</key>
<map>
<key>Comment</key>
<string>Scale of fallback font relative to huge font (fraction of huge font size)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.00</real>
</map>
<key>FontScreenDPI</key>
<map>
<key>Comment</key>
@@ -6731,61 +6665,6 @@
<key>Value</key>
<real>96.0</real>
</map>
<key>FontSizeHuge</key>
<map>
<key>Comment</key>
<string>Size of huge font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>14.0</real>
</map>
<key>FontSizeLarge</key>
<map>
<key>Comment</key>
<string>Size of large font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>11.0</real>
</map>
<key>FontSizeMedium</key>
<map>
<key>Comment</key>
<string>Size of medium font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>9.5</real>
</map>
<key>FontSizeMonospace</key>
<map>
<key>Comment</key>
<string>Size of monospaced font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>9.0</real>
</map>
<key>FontSizeSmall</key>
<map>
<key>Comment</key>
<string>Size of small font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>8.5</real>
</map>
<key>ForceNotecardDragCargoPermissive</key>
<map>
<key>Comment</key>

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -704,7 +704,7 @@ void LLFloaterAvatarList::refreshAvatarList()
LLVector3d delta = position - mypos;
F32 distance = (F32)delta.magVec();
if (position.mdV[VZ] == 0.0)
if (position.mdV[VZ] == 0.f || position.mdV[VZ] == 1020.f)
{
UnknownAltitude = true;
distance = 9000.0;

1
indra/newview/llwlanimator.cpp
View File

@@ -124,6 +124,7 @@ void LLWLAnimator::update(LLWLParamSet& curParams)
// at the end of the interp cycle, force the end settings to get applied
curParams.setAll(mInterpEndWL->getAll());
}
LLWaterParamManager::getInstance()->mCurParams.setAll(mInterpEndWater->getAll());
mIsInterpolating = false;
mIsInterpolatingSky = false;
return;