summaryrefslogtreecommitdiffhomepage
path: root/shaders
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-08-23 03:41:25 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-08-23 03:41:25 +0200
commite659a6f6edc857fa424b1aafe319f1a9be74a840 (patch)
tree95a45b4d010782ee03dfa376df7a1cc389e24492 /shaders
parent0b1a4b61e6d1f7e88d12599853beeb12d0472c53 (diff)
wip
Diffstat (limited to 'shaders')
-rw-r--r--shaders/lightmap.cpp18
-rw-r--r--shaders/lightmap.hpp3
2 files changed, 0 insertions, 21 deletions
diff --git a/shaders/lightmap.cpp b/shaders/lightmap.cpp
index bd4d2ec6..186be81a 100644
--- a/shaders/lightmap.cpp
+++ b/shaders/lightmap.cpp
@@ -185,12 +185,6 @@ lightmap_shader::lightmap_shader()
}};
blend_mesh = make_light_mesh<GL::Buffer&&>(GL::Buffer{blend_vertexes}, GL::Buffer{quad_indexes(0)});
- light_vertex_buf = GL::Buffer{std::array<Vector3, 4>{}};
- light_mesh = GL::Mesh{GL::MeshPrimitive::Triangles};
- light_mesh.addVertexBuffer(light_vertex_buf, 0, lightmap_shader::Position{})
- .setIndexBuffer(GL::Buffer{quad_indexes(0)}, 0, GL::MeshIndexType::UnsignedShort)
- .setCount(6);
-
setUniform(SamplerUniform, TextureSampler);
setUniform(LightColorUniform, Color3{1, 1, 1});
setUniform(SizeUniform, Vector2(1 / chunk_size));
@@ -250,7 +244,6 @@ void lightmap_shader::add_light(const light_s& light)
I *= tile_size;
I = std::fmax(0.f, I);
- //I_clip = { std::fmax(1.f, I_clip.x()), std::fmax(1.f, I_clip.y()) };
auto center_fragcoord = light.center + chunk_offset; // window-relative coordinates
auto center_clip = clip_start + center_fragcoord * clip_scale; // clip coordinates
@@ -269,18 +262,7 @@ void lightmap_shader::add_light(const light_s& light)
framebuffer.fb.mapForDraw(GL::Framebuffer::ColorAttachment{0});
framebuffer.fb.clearColor(0, Color4{0, 0, 0, 1});
- fm_debug_assert(light_vertex_buf.id());
- fm_debug_assert(light_mesh.id());
setUniform(ModeUniform, DrawLightmapMode);
-#if 0
- auto quad = std::array<Vector3, 4>{{
- { I_clip + center_clip.x(), -I_clip + center_clip.y(), 0 },
- { I_clip + center_clip.x(), I_clip + center_clip.y(), 0 },
- { -I_clip + center_clip.x(), -I_clip + center_clip.y(), 0 },
- { -I_clip + center_clip.x(), I_clip + center_clip.y(), 0 },
- }};
- light_vertex_buf.setSubData(0, quad);
-#endif
AbstractShaderProgram::draw(blend_mesh);
#if 0
diff --git a/shaders/lightmap.hpp b/shaders/lightmap.hpp
index b885501a..4c9e4b7b 100644
--- a/shaders/lightmap.hpp
+++ b/shaders/lightmap.hpp
@@ -117,9 +117,6 @@ private:
GL::Mesh occlusion_mesh{NoCreate};
static constexpr auto starting_capacity = 1; // todo
- GL::Buffer light_vertex_buf{NoCreate};
- GL::Mesh light_mesh{NoCreate};
-
GL::Mesh blend_mesh{NoCreate};
[[nodiscard]] std::array<Vector3, 4>& alloc_rect();