mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually remove trailing whitespace for non-header files as well.

Browse Source 
This was SVN commit r18989.
This commit is contained in:
elexis
2016-11-23 13:02:58 +00:00
parent 944ba16eb4
commit 6149dd3841
389 changed files with 1460 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectEntry.cpp
+4 -4
View File
@@ -87,7 +87,7 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
textureProps.SetWrap(GL_CLAMP_TO_BORDER);
CTexturePtr texture = g_Renderer.GetTextureManager().CreateTexture(textureProps);
// TODO: Should check which renderpath is selected and only preload the necessary textures.
texture->Prefetch();
texture->Prefetch();
material.AddSampler(CMaterial::TextureSampler(samp.m_SamplerName, texture));
}
@@ -121,7 +121,7 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
return false;
}
// delete old model, create new
// delete old model, create new
CModel* model = new CModel(objectManager.GetSkeletonAnimManager(), m_Simulation);
delete m_Model;
m_Model = model;
@@ -137,10 +137,10 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
CTextureProperties textureProps(samp.m_SamplerFile);
textureProps.SetWrap(GL_CLAMP_TO_EDGE);
CTexturePtr texture = g_Renderer.GetTextureManager().CreateTexture(textureProps);
// if we've loaded this model we're probably going to render it soon, so prefetch its texture.
// if we've loaded this model we're probably going to render it soon, so prefetch its texture.
// All textures are prefetched even in the fixed pipeline, including the normal maps etc.
// TODO: Should check which renderpath is selected and only preload the necessary textures.
texture->Prefetch();
texture->Prefetch();
model->GetMaterial().AddSampler(CMaterial::TextureSampler(samp.m_SamplerName, texture));
}