Selection works on one layer, adding more

Author: mikolasan

README.md

@@ -41,11 +41,19 @@ Lua51_ROOT = "C:\<path_to_cpp-skill>\windows\lua"
 
 ## Build
 
-```
+Normally
+
+```bash
 cmake -DCMAKE_BUILD_TYPE=Release -S . -B build
 cmake --build build --target all
 ```
 
+On Windows for Visual Studio to have nice stack traces
+
+```shell
+cmake -DCMAKE_BUILD_TYPE=Debug -S . -B build_msvc -G "Visual Studio 17 2022"
+```
+
 ## The book
 
 Run locally:

graphics/CMakeLists.txt

@@ -229,10 +229,14 @@ add_executable(neurons_gui
     neurons/render/neuron_render.hpp
     neurons/render/neuron_render.cpp
     neurons/render/network_render.hpp
+    # neurons/camera.cpp
+    # neurons/mouse.cpp
+    # neurons/settings.cpp
     neurons/neurons_gui.cpp
 )
 
 target_compile_definitions(neurons_gui PRIVATE BX_CONFIG_DEBUG=0)
+target_compile_definitions(neurons_gui PRIVATE USE_ENTRY=1)
 target_compile_definitions(neurons_gui PRIVATE ENTRY_CONFIG_USE_SDL=1)
 target_compile_definitions(neurons_gui PRIVATE IMGUI_INCLUDE_IMGUI_USER_H)
 target_compile_definitions(neurons_gui PRIVATE IMGUI_INCLUDE_IMGUI_USER_INL)
@@ -265,4 +269,75 @@ target_link_libraries(neurons_gui
     bimg${CMAKE_BUILD_TYPE}
     bimg_decode${CMAKE_BUILD_TYPE}
     bx${CMAKE_BUILD_TYPE}
+)
+
+###############################################
+
+add_executable(brain
+    bgfx_ext/bgfx_utils.cpp
+    bgfx_ext/entry/cmd.cpp
+    bgfx_ext/entry/dialog.cpp
+    bgfx_ext/entry/entry.cpp
+    bgfx_ext/entry/entry_sdl.cpp
+    bgfx_ext/entry/input.cpp
+    bgfx_ext/imgui/bgfx_imgui.cpp
+    bgfx_ext/example-glue.cpp
+    thirdparty/meshoptimizer/src/allocator.cpp
+    thirdparty/meshoptimizer/src/clusterizer.cpp
+    thirdparty/meshoptimizer/src/indexanalyzer.cpp
+    thirdparty/meshoptimizer/src/indexcodec.cpp
+    thirdparty/meshoptimizer/src/indexgenerator.cpp
+    thirdparty/meshoptimizer/src/overdrawoptimizer.cpp
+    thirdparty/meshoptimizer/src/partition.cpp
+    thirdparty/meshoptimizer/src/quantization.cpp
+    thirdparty/meshoptimizer/src/rasterizer.cpp
+    thirdparty/meshoptimizer/src/simplifier.cpp
+    thirdparty/meshoptimizer/src/spatialorder.cpp
+    thirdparty/meshoptimizer/src/stripifier.cpp
+    thirdparty/meshoptimizer/src/vcacheoptimizer.cpp
+    thirdparty/meshoptimizer/src/vertexcodec.cpp
+    thirdparty/meshoptimizer/src/vertexfilter.cpp
+    thirdparty/meshoptimizer/src/vfetchoptimizer.cpp
+    thirdparty/imgui/imgui.cpp
+    thirdparty/imgui/imgui_widgets.cpp
+    thirdparty/imgui/imgui_tables.cpp
+    thirdparty/imgui/imgui_draw.cpp
+    thirdparty/imgui/backends/imgui_impl_opengl3.cpp
+    thirdparty/imgui/backends/imgui_impl_sdl2.cpp
+    neurons/brain.cpp
+)
+
+target_compile_definitions(brain PRIVATE BX_CONFIG_DEBUG=0)
+target_compile_definitions(brain PRIVATE ENTRY_CONFIG_USE_SDL=1)
+target_compile_definitions(brain PRIVATE IMGUI_INCLUDE_IMGUI_USER_H)
+target_compile_definitions(brain PRIVATE IMGUI_INCLUDE_IMGUI_USER_INL)
+
+target_include_directories(brain PRIVATE 
+    thirdparty 
+    thirdparty/bgfx/include 
+    thirdparty/bimg/include 
+    thirdparty/bx/include 
+    thirdparty/imgui 
+    thirdparty/imgui/backends 
+    bgfx_ext
+    imgui_ext 
+    neurons
+)
+
+if (MSVC)
+    set_property(TARGET brain PROPERTY
+        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif ()
+
+target_link_directories(brain PUBLIC 
+    thirdparty/bgfx/.build/win64_vs2022/bin)
+
+target_link_libraries(brain 
+    OpenGL::GL 
+    ${SDL2_LIBRARIES} 
+    dirent
+    bgfx${CMAKE_BUILD_TYPE}
+    bimg${CMAKE_BUILD_TYPE}
+    bimg_decode${CMAKE_BUILD_TYPE}
+    bx${CMAKE_BUILD_TYPE}
 )

graphics/neurons/neurons_gui.cpp

@@ -152,7 +152,6 @@ const int32_t width = 28, height = 28;
 					, uint16_t(m_height)
 				);
 
-				
 				showExampleDialog(this);
 
 				ImGui::SetNextWindowPos(
@@ -250,6 +249,29 @@ const int32_t width = 28, height = 28;
 					ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Draw call limit reached!");
 				}
 
+
+				data.set_current_id(current_image);
+				sim_clock.update(deltaTimeSec);
+
+
+				if (sim_clock.advance()) {
+					net.step(data.convert_current_to_inputs());
+					std::vector<float> voltage_state = net.get_current_voltage_state();
+					float t = sim_clock.store(voltage_state);
+
+				}
+
+				// float matched_time;
+				// if (sim_clock.has_seen_state(neuron_state, matched_time)) {
+				// 	std::cout << "State repeated from time: " << matched_time << " ms\n";
+				// }
+
+				net.update(time);
+				net.draw(time);
+
+
+				
+
 				ImGui::End();
 
 				imguiEndFrame();
@@ -341,25 +363,7 @@ const int32_t width = 28, height = 28;
 
 				m_lastFrameMissing = 0;
 
-				data.set_current_id(current_image);
-				sim_clock.update(deltaTimeSec);
-
-
-				if (sim_clock.advance()) {
-					net.step(data.convert_current_to_inputs());
-					std::vector<float> voltage_state = net.get_current_voltage_state();
-					float t = sim_clock.store(voltage_state);
-
-				}
-
-				// float matched_time;
-				// if (sim_clock.has_seen_state(neuron_state, matched_time)) {
-				// 	std::cout << "State repeated from time: " << matched_time << " ms\n";
-				// }
-
-				net.update(time);
-				net.draw(time);
-
+				
 				// Advance to next frame. Rendering thread will be kicked to
 				// process submitted rendering primitives.
 				bgfx::frame();

graphics/neurons/render/network_render.hpp

@@ -25,6 +25,13 @@ struct NetworkRenderStrategy : RenderStrategy {
 
     NetworkRenderStrategy(std::shared_ptr<NetworkVisualContext> ctx) : ctx(ctx) {}
 
+    void define_min_area_size() {
+        const size_t n_neurons = ctx->net.neurons.size();
+        area_size_x = bx::ceil(bx::sqrt(float(n_neurons / width)));
+        area_size_y = area_size_x;
+        area_size_z = 1;
+    }
+
     void init() override {
         m_lastFrameMissing = 0;
         // 80 bytes stride = 64 bytes for 4x4 matrix + 16 bytes for RGBA color.
@@ -95,17 +102,23 @@ struct NetworkRenderStrategy : RenderStrategy {
         m_color[0] = 0.70f;
         m_color[1] = 0.65f;
         m_color[2] = 0.60f;
+        m_color[3] = 1.0f;
 
-        m_program = loadProgram("vs_instancing", "fs_instancing");
         m_selection_program = loadProgram("vs_selection", "fs_selection");
+        u_color = bgfx::createUniform("u_color", bgfx::UniformType::Vec4);
 
+        m_program = loadProgram("vs_instancing", "fs_instancing");
     }
 
     void update(float dt) override {
-        if (ImGui::IsKeyPressed(ImGuiKey_W)) selected_y = std::max(0, selected_y - 1);
-        if (ImGui::IsKeyPressed(ImGuiKey_S)) selected_y = std::min(height - 1, selected_y + 1);
-        if (ImGui::IsKeyPressed(ImGuiKey_A)) selected_x = std::max(0, selected_x - 1);
-        if (ImGui::IsKeyPressed(ImGuiKey_D)) selected_x = std::min(width - 1, selected_x + 1);
+        if (ImGui::IsKeyPressed(ImGuiKey_W))
+            selected_y = std::max(0, selected_y - 1);
+        if (ImGui::IsKeyPressed(ImGuiKey_S))
+            selected_y = std::min(height - 1, selected_y + 1);
+        if (ImGui::IsKeyPressed(ImGuiKey_A))
+            selected_x = std::max(0, selected_x - 1);
+        if (ImGui::IsKeyPressed(ImGuiKey_D))
+            selected_x = std::min(width - 1, selected_x + 1);
 
         // to total number of instances to draw
         uint32_t totalCubes = ctx->net.neurons.size();
@@ -129,6 +142,7 @@ struct NetworkRenderStrategy : RenderStrategy {
         const float offset = 3.0f;
         const float start_x = - float(n_neurons / width) * offset / 2.0f;
         const float start_y = - float(n_neurons / width) * offset / 2.0f;
+        const float start_z = - float(n_neurons / width) * offset / 2.0f;
 
         for (uint32_t ii = 0; ii < drawnCubes; ++ii)
         {
@@ -190,7 +204,7 @@ struct NetworkRenderStrategy : RenderStrategy {
         // Compute selection position
         float sel_x = start_x + selected_x * offset;
         float sel_y = start_y + selected_y * offset;
-        float sel_z = 0.0f;
+        float sel_z = start_z + selected_z * offset;
 
         // Create transform matrix
         float selMtx[16];
@@ -210,6 +224,8 @@ struct NetworkRenderStrategy : RenderStrategy {
     }
 
     void destroy() override {
+        bgfx::destroy(u_color);
+        bgfx::destroy(m_selection_program);
         bgfx::destroy(m_program);
     }
 
@@ -224,8 +240,13 @@ struct NetworkRenderStrategy : RenderStrategy {
     uint32_t m_lastFrameMissing;
     uint32_t m_sideSize;
 
+    int32_t area_size_x = 0;
+    int32_t area_size_y = 0;
+    int32_t area_size_z = 0;
+    
     int32_t selected_x = 0;
     int32_t selected_y = 0;
+    int32_t selected_z = 0;
 
     float m_color[4];
     bgfx::UniformHandle u_color;

graphics/neurons/shaders/varying_selection.def.sc

@@ -0,0 +1 @@
+vec3 a_position  : POSITION;

src/graphics/README.md

@@ -2,10 +2,11 @@
 
 Build shaders
 
-```powershell
-cd graphics\neurons\shaders>
-shaderc.exe -i ..\..\thirdparty\bgfx\src -f fs_instancing.sc --varyingdef varying_instancing.def.sc -o fs_instancing.bin --type fragment --platform windows --profile s_5_0 -O 3
-shaderc.exe -i ..\..\thirdparty\bgfx\src -f vs_instancing.sc --varyingdef varying_instancing.def.sc -o vs_instancing.bin --type vertex --platform windows --profile s_5_0 -O 3
-shaderc.exe -i ..\..\thirdparty\bgfx\src -f fs_cubes.sc -o fs_cubes.bin --varyingdef varying_cubes.def.sc --type fragment --platform windows --profile s_5_0 -O 3
-shaderc.exe -i ..\..\thirdparty\bgfx\src -f vs_cubes.sc -o vs_cubes.bin --varyingdef varying_cubes.def.sc --type vertex --platform windows --profile s_5_0 -O 3
+```sh
+cd graphics/neurons/shaders
+shaderc.exe -i ../../thirdparty/bgfx/src -f fs_instancing.sc --varyingdef varying_instancing.def.sc -o fs_instancing.bin --type fragment --platform windows --profile s_5_0 -O 3
+shaderc.exe -i ../../thirdparty/bgfx/src -f vs_instancing.sc --varyingdef varying_instancing.def.sc -o vs_instancing.bin --type vertex --platform windows --profile s_5_0 -O 3
+
+shaderc.exe -i ../../thirdparty/bgfx/src -f fs_cubes.sc -o fs_cubes.bin --varyingdef varying_cubes.def.sc --type fragment --platform windows --profile s_5_0 -O 3
+shaderc.exe -i ../../thirdparty/bgfx/src -f vs_cubes.sc -o vs_cubes.bin --varyingdef varying_cubes.def.sc --type vertex --platform windows --profile s_5_0 -O 3
 ```