← Back to branch summary

~mc-return/nux/nux.merge-fix-deprecated-warnings

« back to all changes in this revision

Viewing changes to NuxGraphics/ImageSurface.h

  • Committer: Jay Taoko
  • Date: 2012-07-11 09:53:57 UTC
  • mto: This revision was merged to the branch mainline in revision 632.
  • Revision ID: jay.taoko@canonical.com-20120711095357-yfeq9v4xu6mte7o4
* Fix in volume texture API

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxGraphics/ImageSurface.h
364
364
    virtual void AllocateCheckBoardTexture(int width, int height, int slice, int NumMipmap, Color color0, Color color1, int TileWidth = 4, int TileHeight = 4);
365
365
    virtual void AllocateColorTexture(int width, int height, int slice, int NumMipmap, Color color0 = Color(0xFFFFFFF));
366
366
 
367
 
    virtual const ImageSurface &GetSurface(int MipLevel, int slice) const
 
367
    virtual const ImageSurface &GetSurface(int slice, int MipLevel) const
368
368
    {
369
369
      return *m_MipSurfaceArray[MipLevel][slice];
370
370
    };
371
 
    virtual ImageSurface &GetSurface(int MipLevel, int slice)
 
371
    virtual ImageSurface &GetSurface(int slice, int MipLevel)
372
372
    {
373
 
      return const_cast<ImageSurface &> ((const_cast< const NVolumeData * > (this))->GetSurface(MipLevel, slice));
 
373
      return const_cast<ImageSurface &> ((const_cast< const NVolumeData * > (this))->GetSurface(slice, MipLevel));
374
374
    }
375
375
    virtual const ImageSurface &GetSurface(int MipLevel) const
376
376
    {