salmon-engine-core/engine
6
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network stuff

Browse Source
This commit is contained in:
vladislav.khorev committed 2013-02-16 21:05:10 +00:00
1 parent 770f0783ec
commit 9627247bdc
9 files changed
+555 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/GUIManager/ButtonWidget.cpp
+11 -5
View File
@@ -501,9 +501,11 @@ TEdit* TEdit::CreateEditWithFillers(vec2 posFrom, vec2 posTo, std::vector<boost:
void TEdit::EditFiller(vec2 posFrom, vec2 posTo, const std::string& texName, TTextParams textParams, TEdit* edit)
{
TRenderParams renderParams = textParams.RenderParams;
TRenderParams renderParams;
renderParams.SamplerMap[CONST_STRING_TEXTURE_UNIFORM] = texName;
renderParams.FloatMap[CONST_STRING_TRANSPARENCY_UNIFORM] = 1.f;
TTriangleList triangleList = MakeTriangleList(posFrom, posTo);
@@ -512,6 +514,8 @@ void TEdit::EditFiller(vec2 posFrom, vec2 posTo, const std::string& texName, TTe
edit->TriangleListVector.insert(edit->TriangleListVector.end(), TRenderPair(renderParams, triangleList));
renderParams = textParams.RenderParams;
if (textParams.FontName == "")
{
textParams.FontName = ResourceManager->FontManager.GetCurrentFontName();
@@ -519,17 +523,19 @@ void TEdit::EditFiller(vec2 posFrom, vec2 posTo, const std::string& texName, TTe
ResourceManager->FontManager.PushFont(textParams.FontName);
triangleList = CreateTriangleListForText(posFrom, posTo, textParams);
TTriangleList textTriangleList = CreateTriangleListForText(posFrom, posTo, textParams);
textTriangleList.RefreshBuffer();
renderParams.SamplerMap[CONST_STRING_TEXTURE_UNIFORM] = ResourceManager->FontManager.GetCurrentFontTextureName();
edit->TextIterator = (edit->TriangleListVector.insert(edit->TriangleListVector.end(),TRenderPair(renderParams, triangleList)));
triangleList.RefreshBuffer();
edit->TextIterator = (edit->TriangleListVector.insert(edit->TriangleListVector.end(),TRenderPair(renderParams, textTriangleList)));
ResourceManager->FontManager.PopFont();
edit->TextParams = textParams;
}
void TEdit::SmartValueTextFiller(const std::string& dictionaryName, const std::string& smartValueName, TEdit* edit)