lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed to reflect moving and renaming the *.fs and *.vs shader files.

Browse Source
This commit is contained in:
rich_b
2020-06-24 15:43:22 -04:00
parent 5d919242f1
commit 581ebd8061
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/7.in_practice/3.2d_game/game.cpp
View File

@@ -54,9 +54,9 @@ Game::~Game()
void Game::Init()
{
// load shaders
ResourceManager::LoadShader("shaders/sprite.vs", "shaders/sprite.frag", nullptr, "sprite");
ResourceManager::LoadShader("shaders/particle.vs", "shaders/particle.frag", nullptr, "particle");
ResourceManager::LoadShader("shaders/post_processing.vs", "shaders/post_processing.frag", nullptr, "postprocessing");
ResourceManager::LoadShader("sprite.vs", "sprite.fs", nullptr, "sprite");
ResourceManager::LoadShader("particle.vs", "particle.fs", nullptr, "particle");
ResourceManager::LoadShader("post_processing.vs", "post_processing.fs", nullptr, "postprocessing");
// configure shaders
glm::mat4 projection = glm::ortho(0.0f, static_cast<float>(this->Width), static_cast<float>(this->Height), 0.0f, -1.0f, 1.0f);
ResourceManager::GetShader("sprite").Use().SetInteger("sprite", 0);

2
src/7.in_practice/3.2d_game/text_renderer.cpp
View File

@@ -19,7 +19,7 @@
TextRenderer::TextRenderer(unsigned int width, unsigned int height)
{
// load and configure shader
this->TextShader = ResourceManager::LoadShader("shaders/text.vs", "shaders/text.frag", nullptr, "text");
this->TextShader = ResourceManager::LoadShader("text_2d.vs", "text_2d.fs", nullptr, "text");
this->TextShader.SetMatrix4("projection", glm::ortho(0.0f, static_cast<float>(width), static_cast<float>(height), 0.0f), true);
this->TextShader.SetInteger("text", 0);
// configure VAO/VBO for texture quads