summaryrefslogtreecommitdiffstats
path: root/Project/Shader.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-07-08 00:22:44 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-07-08 00:22:44 -0300
commitfa58befffe0c0520f50cf9414c3de9949d8c0eed (patch)
tree6a545f2227229ce293c40b9911f1df7bc90dda55 /Project/Shader.cpp
parentab30228b1a57053323363674fa7f137c0329a180 (diff)
downloadPSP.git-fa58befffe0c0520f50cf9414c3de9949d8c0eed.tar.gz
PSP.git-fa58befffe0c0520f50cf9414c3de9949d8c0eed.tar.xz
PSP.git-fa58befffe0c0520f50cf9414c3de9949d8c0eed.zip
Code fixes to compile in MinGW and MSVC
CMakeLists includes
Diffstat (limited to 'Project/Shader.cpp')
-rw-r--r--Project/Shader.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/Project/Shader.cpp b/Project/Shader.cpp
index 7835fec..10751e2 100644
--- a/Project/Shader.cpp
+++ b/Project/Shader.cpp
@@ -72,8 +72,12 @@ ShaderSource Shader::ParseShader(const wxString& filepath) const
ss[static_cast<int>(type)] << line + std::string("\n");
}
}
+
+ ShaderSource source;
+ source.vertexShader = ss[0].str();
+ source.fragmentShader = ss[1].str();
- return { ss[0].str(), ss[1].str() };
+ return source;
}
unsigned int Shader::CreateShader(std::string& vertexShader, std::string& fragmentShader) const
@@ -131,7 +135,7 @@ unsigned int Shader::GetUniformLocation(const std::string& name)
GLCall(int location = glGetUniformLocation(m_rendererID, name.c_str()));
if (location == -1) {
- wxMessageBox(wxString::Format("Atenção! uniform \"%s\" não encontrado", name));
+ wxMessageBox(wxString::Format("Atenção! uniform \"%s\" não encontrado", name));
}
m_uniformLocationCache[name] = location;