Compare commits
No commits in common. "master" and "v0.5" have entirely different histories.
|
@ -12,7 +12,8 @@
|
|||
],
|
||||
"compilerPath": "C:/MinGW/bin/g++.exe",
|
||||
"cStandard": "c11",
|
||||
"cppStandard": "c++11"
|
||||
"cppStandard": "c++11",
|
||||
"intelliSenseMode": "gcc-x86"
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
|
|
|
@ -322,7 +322,7 @@ int main(void)
|
|||
ssaoBlurShader.link();
|
||||
|
||||
// Модель прямоугольника
|
||||
Scene rectangle = loadOBJtoScene("../resources/models/plane2.obj", "../resources/models/", "../resources/textures/");
|
||||
Scene rectangle = loadOBJtoScene("../resources/models/plane80000.obj", "../resources/models/", "../resources/textures/");
|
||||
|
||||
// Зададим горизонтальное положение перед камерой
|
||||
rectangle.root.e_position().y = -1;
|
||||
|
@ -338,6 +338,8 @@ int main(void)
|
|||
Texture rectangle_heights(TEX_HEIGHTS, "../resources/textures/rekovalev_bumpmap.png");
|
||||
rectangle.models.begin()->set_texture(rectangle_heights);
|
||||
|
||||
rectangle.models.begin()->material.displacementmapped = true;
|
||||
|
||||
// Шейдер для рисования отладочных лампочек
|
||||
ShaderProgram bulbShader;
|
||||
// Загрузка и компиляция шейдеров
|
||||
|
|
Loading…
Reference in New Issue