diff --git a/tests/g3test2.cpp b/tests/g3test2.cpp index 4f87df4..3d31a5d 100644 --- a/tests/g3test2.cpp +++ b/tests/g3test2.cpp @@ -22,9 +22,11 @@ struct defaults { }; std::mutex PreviewMutex; -frame currentPreviewFrame; GLuint textu = 0; -bool updatePreview; +bool textureInitialized = false; +bool updatePreview = false; +bool previewRequested = false; + struct Shared { std::mutex mutex; VoxelGrid grid; @@ -39,11 +41,11 @@ void setup(defaults config, VoxelGrid& grid) { std::cout << "Processing layer " << z << " of " << config.gridDepth << std::endl; } - for (int y = 0; y < config.gridWidth; ++y) { - for (int x = 0; x < config.gridHeight; ++x) { - Vec4ui8 noisecolor = config.noise.permuteColor(Vec3f( x / 64, y / 64, z / 64)); + for (int y = 0; y < config.gridHeight; ++y) { + for (int x = 0; x < config.gridWidth; ++x) { + Vec4ui8 noisecolor = config.noise.permuteColor(Vec3f( static_cast(x) / 64, static_cast(y) / 64, static_cast(z) / 64)); if (noisecolor.a > threshold) { - grid.set(Vec3i(x,y,z), true, Vec3ui8(noisecolor.xyz())); + grid.set(Vec3i(x, y, z), true, Vec3ui8(noisecolor.xyz())); } } } @@ -52,22 +54,24 @@ void setup(defaults config, VoxelGrid& grid) { } void livePreview(VoxelGrid& grid, defaults config, Camera cam) { - updatePreview = false; - std::lock_guard lock(PreviewMutex); - - currentPreviewFrame = grid.renderFrame(cam.posfor.origin, cam.posfor.direction, cam.up, cam.fov, config.outWidth, config.outHeight, frame::colormap::BGRA); - - glGenTextures(1, &textu); - glBindTexture(GL_TEXTURE_2D, textu); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - - glBindTexture(GL_TEXTURE_2D, textu); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, currentPreviewFrame.getWidth(), currentPreviewFrame.getHeight(), - 0, GL_RGBA, GL_UNSIGNED_BYTE, currentPreviewFrame.getData().data()); - updatePreview = true; + //std::lock_guard lock(PreviewMutex); + frame currentPreviewFrame = grid.renderFrame(cam.posfor.origin, cam.posfor.direction, cam.up, cam.fov, config.outWidth, config.outHeight, frame::colormap::BGRA); + + // glGenTextures(1, &textu); + // glBindTexture(GL_TEXTURE_2D, textu); + // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + // glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + + // glBindTexture(GL_TEXTURE_2D, textu); + // glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, currentPreviewFrame.getWidth(), currentPreviewFrame.getHeight(), + // 0, GL_RGBA, GL_UNSIGNED_BYTE, currentPreviewFrame.getData().data()); + + std::cout << "freeing previous frame" << std::endl; + currentPreviewFrame.free(); + updatePreview = false; + textureInitialized = true; } static void glfw_error_callback(int error, const char* description) @@ -75,7 +79,6 @@ static void glfw_error_callback(int error, const char* description) fprintf(stderr, "GLFW Error %d: %s\n", error, description); } - int main() { glfwSetErrorCallback(glfw_error_callback); if (!glfwInit()) { @@ -122,7 +125,7 @@ int main() { glfwSwapInterval(1); IMGUI_CHECKVERSION(); ImGui::CreateContext(); - ImGuiIO& io = ImGui::GetIO(); + ImGuiIO& io = ImGui::GetIO(); (void)io; io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; ImGui::StyleColorsDark(); @@ -132,7 +135,7 @@ int main() { #ifdef __EMSCRIPTEN__ ImGui_ImplGlfw_InstallEmscriptenCallbacks(window, "#canvas"); #endif - ImGui_ImplOpenGL3_Init(glsl_version); + ImGui_ImplOpenGL3_Init(glsl_version); bool show_demo_window = true; bool show_another_window = false; @@ -153,7 +156,7 @@ int main() { ImGui::NewFrame(); { ImGui::Begin("settings"); - + if(ImGui::CollapsingHeader("output", ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::SliderInt("Width", &config.outWidth, 256, 4096); ImGui::SliderInt("Height", &config.outHeight, 256, 4096); @@ -170,21 +173,25 @@ int main() { if (ImGui::Button("Generate Grid")) { setup(config, grid); gridInitialized = true; - + } ImGui::End(); } - { - ImGui::Begin("Preview"); - - if (gridInitialized) { - ImGui::Image((void*)(intptr_t)textu,ImVec2(config.outWidth, config.outHeight)); - } - - ImGui::End(); - } + // { + // ImGui::Begin("Preview"); + + // if (gridInitialized && textureInitialized) { + // ImGui::Image((void*)(intptr_t)textu,ImVec2(config.outWidth, config.outHeight)); + // } else if (gridInitialized) { + // ImGui::Text("Preview not generated yet"); + // } else { + // ImGui::Text("No grid generated"); + // } + + // ImGui::End(); + // } if (gridInitialized && updatePreview == false) { livePreview(grid, config, cam); diff --git a/util/grid/grid3.hpp b/util/grid/grid3.hpp index e67b38f..0b28934 100644 --- a/util/grid/grid3.hpp +++ b/util/grid/grid3.hpp @@ -220,9 +220,11 @@ public: float maxDist = std::sqrt(gridSize.lengthSquared()) * binSize; frame outFrame(outH, outW, frame::colormap::RGB); std::vector colorBuffer(outW * outH * 3); + std::cout << "a" << std::endl; #pragma omp parallel for for (int y = 0; y < outH; y++) { float v = (static_cast(y) / static_cast(outH - 1)) - 0.5f; + std::cout << "b"; for (int x = 0; x < outW; x++) { std::vector hitVoxels; float u = (static_cast(x) / static_cast(outW - 1)) - 0.5f; @@ -242,6 +244,7 @@ public: } } } + std::cout << "c"; hitVoxels.clear(); hitVoxels.shrink_to_fit(); // Set pixel color in buffer @@ -264,9 +267,11 @@ public: } } + std::cout << "b" << std::endl; } outFrame.setData(colorBuffer); + std::cout << "d" << std::endl; return outFrame; } };