mirrors/LearnOpenGL-CN
1
0
Fork 0
mirror of https://github.com/LearnOpenGL-CN/LearnOpenGL-CN.git synced 2025-08-22 20:25:28 +08:00
Code Activity

Comments

Browse Source
This commit is contained in:
Meow J
2016-07-26 22:43:45 +08:00
parent 086711d4d7
commit 4e67da57a7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/01 Getting started/06 Textures.md
View File

@@ -193,9 +193,9 @@ glBindTexture(GL_TEXTURE_2D, 0);
GLuint texture; GLuint texture;
glGenTextures(1, &texture); glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
//为当前绑定的纹理对象设置环绕、过滤方式 // 为当前绑定的纹理对象设置环绕、过滤方式
... ...
//加载并生成纹理 // 加载并生成纹理
int width, height; int width, height;
unsigned char* image = SOIL_load_image("container.jpg", &width, &height, 0, SOIL_LOAD_RGB); unsigned char* image = SOIL_load_image("container.jpg", &width, &height, 0, SOIL_LOAD_RGB);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, image); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, image);

1
styleguide.md
View File

@@ -39,6 +39,7 @@
- 代码块不使用Tab标注，请用```式标注 - 代码块不使用Tab标注，请用```式标注
- 代码的语言需要在代码一开始的标记处标识出来，比如```c++ - 代码的语言需要在代码一开始的标记处标识出来，比如```c++
- 请记得翻译注释 - 请记得翻译注释
- 注释与`//`间请加一个空格
## 图片 ## 图片