添加范例图片

This commit is contained in:
hyzboy 2018-12-07 21:20:12 +08:00
parent b0028f41ba
commit 1918ec2949
3 changed files with 7 additions and 7 deletions

View File

@ -52,7 +52,7 @@ namespace hgl
if(!file.is_open()) if(!file.is_open())
{ {
std::cerr<<"[ERROR] open file<"<<filename<<"> failed."<<std::endl; std::cerr<<"[ERROR] open file<"<<filename.c_str()<<"> failed."<<std::endl;
return(false); return(false);
} }
@ -90,7 +90,7 @@ namespace hgl
} }
else else
{ {
std::cerr<<"[ERROR] Image format error,filename: "<<filename<<std::endl; std::cerr<<"[ERROR] Image format error,filename: "<<filename.c_str()<<std::endl;
delete[] data; delete[] data;
return(false); return(false);
} }
@ -105,7 +105,7 @@ namespace hgl
glTextureParameteri(tex_id,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE); glTextureParameteri(tex_id,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE);
glTextureParameteri(tex_id,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE); glTextureParameteri(tex_id,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE);
std::cout<<"load image file<"<<filename<<">:<"<<header->width<<"x"<<header->height<<"> to texture ok"<<std::endl; std::cout<<"load image file<"<<filename.c_str()<<">:<"<<header->width<<"x"<<header->height<<"> to texture ok"<<std::endl;
delete[] data; delete[] data;
return(true); return(true);

View File

@ -41,14 +41,14 @@ void main()
constexpr char fragment_shader[]=R"( constexpr char fragment_shader[]=R"(
#version 330 core #version 330 core
uniform sampler2D TextureLuna; uniform sampler2D TextureLena;
in vec2 FragmentTexCoord; in vec2 FragmentTexCoord;
out vec4 FragColor; out vec4 FragColor;
void main() void main()
{ {
FragColor=texture(TextureLuna,FragmentTexCoord); FragColor=texture(TextureLena,FragmentTexCoord);
})"; })";
Shader shader; Shader shader;
@ -119,10 +119,10 @@ void InitVertexBuffer()
bool InitTexture() bool InitTexture()
{ {
if(!LoadTGATexture("luna.tga",texture_id)) if(!LoadTGATexture("lena.tga",texture_id))
return(false); return(false);
int texture_location=shader.GetUniformLocation("TextureLuna"); int texture_location=shader.GetUniformLocation("TextureLena");
glBindTextureUnit(0,texture_id); glBindTextureUnit(0,texture_id);

BIN
res/image/lena.tga Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 KiB