← Back to branch summary

~unity-team/nuxplayground/nuxplayground.fix-nstring

« back to all changes in this revision

Viewing changes to src/visual-fx/FrostedGlass.cpp

  • Committer: Jay Taoko
  • Date: 2012-10-01 04:49:15 UTC
  • mfrom: (22.1.9 nuxplayground)
  • Revision ID: jay.taoko@canonical.com-20121001044915-etvjty9kz0pgav03
* Removing NString.* Fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/visual-fx/FrostedGlass.cpp
13
13
{
14
14
  ReloadShader();
15
15
 
16
 
  nux::NString Path = PKGDATADIR"/textures/nfl.png";
 
16
  std::string Path = PKGDATADIR"/textures/nfl.png";
17
17
 
18
18
  m_Texture = new nux::Texture2D();
19
 
  m_Texture->Update(Path.GetTCharPtr());
 
19
  m_Texture->Update(Path.c_str());
20
20
 
21
21
  nux::ObjectPtr<nux::CachedBaseTexture> DeviceTexture = nux::GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(m_Texture);
22
22
  DeviceTexture->m_Texture->SetWrap(GL_CLAMP, GL_CLAMP, GL_CLAMP);
25
25
  Path = PKGDATADIR"/textures/noise.png";
26
26
 
27
27
  _noise_texture = new nux::Texture2D();
28
 
  _noise_texture->Update(Path.GetTCharPtr());
 
28
  _noise_texture->Update(Path.c_str());
29
29
 
30
30
  nux::ObjectPtr<nux::CachedBaseTexture> noise_device_texture = nux::GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(_noise_texture);
31
31
  noise_device_texture->m_Texture->SetWrap(GL_REPEAT, GL_REPEAT, GL_REPEAT);