diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-16 19:17:26 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-16 19:17:26 +0200 |
commit | 68a7bafe37adef0e5ef12c2d0e8461a21e05363b (patch) | |
tree | f0185e459ea0c5638fca7bada5f2e440fd9eda51 /src/graphics/opengl/test/texture_test.cpp | |
parent | 54f4da87923465a5387e2e854b58616647deb7af (diff) | |
download | colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.tar.gz colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.tar.bz2 colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.zip |
Fixes in texture loading
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
Diffstat (limited to 'src/graphics/opengl/test/texture_test.cpp')
-rw-r--r-- | src/graphics/opengl/test/texture_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics/opengl/test/texture_test.cpp b/src/graphics/opengl/test/texture_test.cpp index 79518f8..03847fc 100644 --- a/src/graphics/opengl/test/texture_test.cpp +++ b/src/graphics/opengl/test/texture_test.cpp @@ -27,15 +27,15 @@ void Init(Gfx::CGLDevice *device) } Gfx::TextureCreateParams tex1CreateParams; - tex1CreateParams.alpha = true; tex1CreateParams.mipmap = true; + tex1CreateParams.format = Gfx::TEX_IMG_RGBA; tex1CreateParams.minFilter = Gfx::TEX_MIN_FILTER_LINEAR_MIPMAP_LINEAR; tex1CreateParams.magFilter = Gfx::TEX_MAG_FILTER_LINEAR; tex1CreateParams.wrapT = Gfx::TEX_WRAP_CLAMP; Gfx::TextureCreateParams tex2CreateParams; - tex2CreateParams.alpha = true; tex2CreateParams.mipmap = true; + tex2CreateParams.format = Gfx::TEX_IMG_RGBA; tex2CreateParams.minFilter = Gfx::TEX_MIN_FILTER_NEAREST_MIPMAP_NEAREST; tex2CreateParams.magFilter = Gfx::TEX_MAG_FILTER_NEAREST; tex2CreateParams.wrapS = Gfx::TEX_WRAP_CLAMP; |