lauchmelder/Visualizer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactored code to work with new lib design

Browse source
This commit is contained in:
Lauchmelder 2021-12-23 04:55:58 +01:00
parent ea280b6382
commit ec5e39fe21
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Plot3D.cpp
View file

@ -48,7 +48,7 @@ Plot3D::Plot3D(const lol::BBox& domainAndRange, float scale, float resolution, P
unsigned int sliceLength = CreateVertexList(domainAndRange, scale, resolution, func, functionValues, vertices); unsigned int sliceLength = CreateVertexList(domainAndRange, scale, resolution, func, functionValues, vertices);
Triangulate(functionValues, sliceLength, indices); Triangulate(functionValues, sliceLength, indices);
vao = lol::VAOFactory::Produce(vertices, indices, vao = lol::UniqueVertexArrayObject::Share(vertices, indices,
lol::Layout { lol::Layout {
{ 3, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)0 }, { 3, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)0 },
{ 1, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)(3 * sizeof(float))} { 1, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void*)(3 * sizeof(float))}
@ -58,7 +58,7 @@ Plot3D::Plot3D(const lol::BBox& domainAndRange, float scale, float resolution, P
shader = lol::ShaderManager::GetInstance().Get(PLOT3D_ID); shader = lol::ShaderManager::GetInstance().Get(PLOT3D_ID);
if (shader == nullptr) if (shader == nullptr)
{ {
shader = lol::ShaderFactory::Produce( shader = lol::UniqueShader::Share(
R"( R"(
#version 440 core #version 440 core

2
vendor/lol vendored

@ -1 +1 @@
Subproject commit 711d18e7184fcfc41c1c065b1f97b00f361ab1f8 Subproject commit 5875f1246f642950af7fdf3c3c7f5a9d603a76cc