Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed OpenGLShader::PreProcess Logic (issue #120) #135

Merged
merged 4 commits into from
Oct 5, 2019
Merged

Fixed OpenGLShader::PreProcess Logic (issue #120) #135

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c414ea4
Fixed OpenGLShader::PreProcess logic and Added Comments
Puddlestomper Sep 20, 2019
50403d3
Changed comments to be indented with spaces rather than tabs
Puddlestomper Sep 20, 2019
251eea9
Removed extra comment spacing
Puddlestomper Sep 22, 2019
46d1da1
Use ternary conditional operator to assign final shader string
Puddlestomper Sep 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Hazel/src/Platform/OpenGL/OpenGLShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,20 @@ namespace Hazel {

const char* typeToken = "#type";
size_t typeTokenLength = strlen(typeToken);
size_t pos = source.find(typeToken, 0);
size_t pos = source.find(typeToken, 0); //Start of shader type declaration line
while (pos != std::string::npos)
{
size_t eol = source.find_first_of("\r\n", pos);
size_t eol = source.find_first_of("\r\n", pos); //End of shader type declaration line
HZ_CORE_ASSERT(eol != std::string::npos, "Syntax error");
size_t begin = pos + typeTokenLength + 1;
size_t begin = pos + typeTokenLength + 1; //Start of shader type name (after "#type " keyword)
std::string type = source.substr(begin, eol - begin);
HZ_CORE_ASSERT(ShaderTypeFromString(type), "Invalid shader type specified");

size_t nextLinePos = source.find_first_not_of("\r\n", eol);
pos = source.find(typeToken, nextLinePos);
shaderSources[ShaderTypeFromString(type)] = source.substr(nextLinePos, pos - (nextLinePos == std::string::npos ? source.size() - 1 : nextLinePos));
size_t nextLinePos = source.find_first_not_of("\r\n", eol); //Start of shader code after shader type declaration line
HZ_CORE_ASSERT(nextLinePos != std::string::npos, "Syntax error");
pos = source.find(typeToken, nextLinePos); //Start of next shader type declaration line

shaderSources[ShaderTypeFromString(type)] = (pos == std::string::npos) ? source.substr(nextLinePos) : source.substr(nextLinePos, pos - nextLinePos);
}

return shaderSources;
Expand Down