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

made texture scroll

Browse source
This commit is contained in:
Lauchmelder 2021-12-25 15:01:15 +01:00
parent 60a3e4a038
commit 97001e5460
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Application.cpp
View file

@ -133,7 +133,7 @@ void Application::Init(int width, int height, const std::string& title)
data.camera = &camera; data.camera = &camera;
topology = new Topology(glm::vec2(7.5f), glm::uvec2(100)); topology = new Topology(glm::vec2(15.0f, 7.5f), glm::uvec2(200, 100));
glm::uvec2 size = topology->GetSize(); glm::uvec2 size = topology->GetSize();
float* pixels = topology->GetTopology(); float* pixels = topology->GetTopology();
@ -141,7 +141,7 @@ void Application::Init(int width, int height, const std::string& title)
{ {
for (unsigned int x = 0; x < size.x; x++) for (unsigned int x = 0; x < size.x; x++)
{ {
pixels[y * size.x + x] = 0.5f + (cos(x * 0.1f) + cos(y * 0.1f)) * 0.25f; pixels[y * size.x + x] = 0.5f + (cos(x * glm::two_pi<float>() / ((float)size.x * 0.5f)) + cos(y * 0.1f)) * 0.25f;
} }
} }

12
src/Topology.cpp
View file

@ -21,8 +21,8 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
vertices.push_back(xCoord); vertices.push_back(xCoord);
vertices.push_back(yCoord); vertices.push_back(yCoord);
vertices.push_back(Map(glm::vec2(0, subdivisions.x), glm::vec2(0.0f, 1.0f), x)); vertices.push_back(Map(glm::vec2(-1, subdivisions.x + 1), glm::vec2(0.0f, 1.0f), x));
vertices.push_back(Map(glm::vec2(0, subdivisions.y), glm::vec2(0.0f, 1.0f), y)); vertices.push_back(Map(glm::vec2(-1, subdivisions.y + 1), glm::vec2(0.0f, 1.0f), y));
if (y > 0 && x > 0) if (y > 0 && x > 0)
{ {
@ -65,12 +65,13 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
uniform mat4 view; uniform mat4 view;
uniform mat4 projection; uniform mat4 projection;
uniform float offset;
uniform sampler2DShadow heightmap; uniform sampler2DShadow heightmap;
void main() void main()
{ {
height = texture(heightmap, vec3(texCoord, 0.0f)); height = texture(heightmap, vec3(texCoord.x + offset, texCoord.y, 0.0f));
gl_Position = projection * view * vec4(position.x, 2.0f * height, position.y, 1.0f); gl_Position = projection * view * vec4(position.x, 2.0f * height, position.y, 1.0f);
} }
)", )",
@ -101,13 +102,16 @@ Topology::~Topology()
delete texture; delete texture;
} }
void Topology::PreRender(const lol::CameraBase& camera) const void Topology::PreRender(const lol::CameraBase& camera)
{ {
if(texture != nullptr) if(texture != nullptr)
texture->Bind(); texture->Bind();
shader->SetUniform("view", camera.GetView()); shader->SetUniform("view", camera.GetView());
shader->SetUniform("projection", camera.GetProjection()); shader->SetUniform("projection", camera.GetProjection());
shader->SetUniform("offset", offset);
offset += 0.01f;
} }
void Topology::MakeTexture() void Topology::MakeTexture()

4
src/Topology.hpp
View file

@ -13,7 +13,7 @@ public:
Topology(const glm::vec2& size, const glm::uvec2& subdivision); Topology(const glm::vec2& size, const glm::uvec2& subdivision);
~Topology(); ~Topology();
void PreRender(const lol::CameraBase& camera) const override; void PreRender(const lol::CameraBase& camera) override;
inline float* GetTopology() const { return (float*)image.GetPixels(); }; inline float* GetTopology() const { return (float*)image.GetPixels(); };
inline const glm::uvec2& GetSize() const { return image.GetDimensions(); }; inline const glm::uvec2& GetSize() const { return image.GetDimensions(); };
@ -22,4 +22,6 @@ public:
private: private:
lol::Image image; lol::Image image;
lol::Texture* texture; lol::Texture* texture;
float offset = 0.0f;
}; };

2
vendor/lol vendored

@ -1 +1 @@
Subproject commit 1e44994bb409a647930593723ee950c1a85879cc Subproject commit 46e3ec58480fe6ead484708c13a936a02ddec44b