redstrate/raytracer
1
Fork 0
Code Activity

Show render in progress

Browse source
This commit is contained in:
redstrate 2020-05-13 17:19:21 -04:00
parent 7148070824
commit 202d4c3dc8
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/image.h
View file

@ -1,10 +1,15 @@
#pragma once #pragma once
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <array>
template<class T, int Width, int Height> template<class T, int Width, int Height>
class Image { class Image {
public: public:
void reset() {
array = {};
}
T& get(const int32_t x, const int32_t y) { T& get(const int32_t x, const int32_t y) {
return array[y * Width + x]; return array[y * Width + x];
} }
@ -13,5 +18,5 @@ public:
return array[y * Width + x]; return array[y * Width + x];
} }
T array[Width * Height] = {}; std::array<T, Width * Height> array = {};
}; };

26
src/main.cpp
View file

@ -42,6 +42,7 @@ constexpr int32_t num_tiles_y = height / tile_size;
// globals // globals
Scene scene = {}; Scene scene = {};
Image<glm::vec4, width, height> colors = {}; Image<glm::vec4, width, height> colors = {};
bool image_dirty = false;
bool calculate_tile(const int32_t from_x, const int32_t to_width, const int32_t from_y, const int32_t to_height) { bool calculate_tile(const int32_t from_x, const int32_t to_width, const int32_t from_y, const int32_t to_height) {
for (int32_t y = from_y; y < (from_y + to_height); y++) { for (int32_t y = from_y; y < (from_y + to_height); y++) {
@ -64,6 +65,8 @@ bool calculate_tile(const int32_t from_x, const int32_t to_width, const int32_t
const glm::vec3 finalColor = model_color * diffuse * (1.0f - shadow); const glm::vec3 finalColor = model_color * diffuse * (1.0f - shadow);
colors.get(x, y) = glm::vec4(finalColor, 1.0f); colors.get(x, y) = glm::vec4(finalColor, 1.0f);
image_dirty = true;
} }
} }
} }
@ -158,20 +161,22 @@ void setup_gfx() {
void update_texture() { void update_texture() {
glBindTexture(GL_TEXTURE_2D, pixels_texture); glBindTexture(GL_TEXTURE_2D, pixels_texture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_FLOAT, colors.array); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_FLOAT, colors.array.data());
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }
void render() {
std::vector<std::future<bool>> futures; std::vector<std::future<bool>> futures;
for(int32_t y = 0; y < num_tiles_y; y++)
for(int32_t x = 0; x < num_tiles_x; x++)
futures.push_back(std::async(std::launch::async, calculate_tile, x * tile_size, tile_size, y * tile_size, tile_size));
for(auto& future : futures) void render() {
future.wait(); futures.clear();
colors.reset();
update_texture(); for(int32_t y = 0; y < num_tiles_y; y++) {
for(int32_t x = 0; x < num_tiles_x; x++) {
auto f = std::async(std::launch::async, calculate_tile, x * tile_size, tile_size, y * tile_size, tile_size);
futures.push_back(std::move(f));
}
}
} }
void dump_to_file() { void dump_to_file() {
@ -244,6 +249,11 @@ int main(int, char*[]) {
if(ImGui::Button("Dump to file")) if(ImGui::Button("Dump to file"))
dump_to_file(); dump_to_file();
if(image_dirty) {
update_texture();
image_dirty = false;
}
ImGui::Render(); ImGui::Render();
auto& io = ImGui::GetIO(); auto& io = ImGui::GetIO();