diff options
| author | Ixtli <cg@325i.org> | 2010-03-07 19:14:15 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:42 -0400 |
| commit | 1f6e8dc85826c531a47ee1f3f12c5e4571ed4fd5 (patch) | |
| tree | 9add7a820a8812f5046a673eabfc1b4e7d0d62fe /crawl-ref/source/tiletex.cc | |
| parent | d2b2b4e8793e9e32d2dcbf65d480c0a611fd59d8 (diff) | |
| download | crawl-ref-1f6e8dc85826c531a47ee1f3f12c5e4571ed4fd5.tar.gz crawl-ref-1f6e8dc85826c531a47ee1f3f12c5e4571ed4fd5.zip | |
More camel case to underscores_as_spaces
Diffstat (limited to 'crawl-ref/source/tiletex.cc')
| -rw-r--r-- | crawl-ref/source/tiletex.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index 47ee010ce6..c3ecf305b5 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -33,7 +33,7 @@ void GenericTexture::unload_texture() if (!m_handle) return; - GLStateManager::deleteTextures(1, &m_handle); + GLStateManager::delete_textures(1, &m_handle); } bool GenericTexture::load_texture(const char *filename, @@ -66,7 +66,7 @@ bool GenericTexture::load_texture(const char *filename, } unsigned int bpp = img->bytes_per_pixel(); - GLStateManager::pixelStoreUnpackAlignment(bpp); + GLStateManager::pixelstore_unpack_alignment(bpp); // Determine texture format unsigned char *pixels = (unsigned char*)img->pixels(); @@ -226,9 +226,9 @@ bool GenericTexture::load_texture(unsigned char *pixels, unsigned int new_width, m_width = new_width; m_height = new_height; - GLStateManager::generateTextures(1, &m_handle); - GLStateManager::bindTexture(m_handle); - GLStateManager::loadTexture(pixels, m_width, m_height, mip_opt); + GLStateManager::generate_textures(1, &m_handle); + GLStateManager::bind_texture(m_handle); + GLStateManager::load_texture(pixels, m_width, m_height, mip_opt); return (true); } @@ -236,7 +236,7 @@ bool GenericTexture::load_texture(unsigned char *pixels, unsigned int new_width, void GenericTexture::bind() const { ASSERT(m_handle); - GLStateManager::bindTexture(m_handle); + GLStateManager::bind_texture(m_handle); } TilesTexture::TilesTexture() : |