Merge pull request #317 from patriciogonzalezvivo/sdf_lod

faster SDF generation from model using incremental LOD (with mesh color support)
patriciogonzalezvivo · Dec 26, 2022 · 4ee93c1 · 4ee93c1
2 parents 407851c + d052219
commit 4ee93c1
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "deps/vera"]
 	path = deps/vera
 	url = https://github.com/patriciogonzalezvivo/vera.git
+	# url = [email protected]:patriciogonzalezvivo/vera.git
diff --git a/assets/glslViewer_inv.png b/assets/glslViewer_inv.png
diff --git a/deps/vera b/deps/vera
diff --git a/src/sandbox.cpp b/src/sandbox.cpp
@@ -8,13 +8,15 @@
 
 #include "vera/window.h"
 
+
 #include "tools/job.h"
 #include "tools/text.h"
 #include "tools/record.h"
 #include "tools/console.h"
 
 #include "vera/ops/fs.h"
 #include "vera/ops/draw.h"
+#include "vera/ops/geom.h"
 #include "vera/ops/math.h"
 #include "vera/ops/image.h"
 #include "vera/ops/pixel.h"
@@ -956,28 +958,83 @@ void Sandbox::commandsInit(CommandList &_commands ) {
         if (geom_index != -1) {
             std::vector<std::string> values = vera::split(_line,',');
             float padding = 0.01f;
-            int resolution = 6;
-
             if (values.size() > 1)
                 padding = vera::toFloat(values[1]);
 
-            if (values.size() > 2)
-                resolution = vera::toInt(values[2]);
-
-            int cells_per_side = std::sqrt(std::pow(2, resolution));
-
             for (vera::ModelsMap::iterator it = uniforms.models.begin(); it != uniforms.models.end(); ++it) {
                 std::string name = "u_" + it->first + "Sdf";
-                uniforms.loadQueue[ name ] = vera::toSdf( it->second->mesh, padding, resolution);
-                vera::BoundingBox bbox  = it->second->getBoundingBox();
-                float area = bbox.getArea();
-                glm::vec3   bdiagonal   = bbox.getDiagonal();
-                float       max_dist    = glm::length(bdiagonal);
-                bbox.expand( (max_dist*max_dist) * padding );
-                it->second->addDefine("MODEL_SDF_TEXTURE", name );
-                it->second->addDefine("MODEL_SDF_SCALE", vera::toString(2.0f-bbox.getArea()/area) );
+                addDefine("MODEL_SDF_TEXTURE", name );
+
+                clock_t start, end;
+                start = clock();
+
+                vera::Mesh mesh = it->second->mesh;
+                mesh.setMaterial(it->second->mesh.getMaterial());
+                vera::center(mesh);
+
+                std::vector<vera::Triangle> tris = mesh.getTriangles();
+                vera::BVH acc(tris, vera::SPLIT_MIDPOINT );
+                acc.square();
+
+                // // Calculate scale difference between model and SDF
+                // vera::BoundingBox bbox  = it->second->getBoundingBox();
+                // float area = bbox.getArea();
+                // glm::vec3   bdiagonal   = bbox.getDiagonal();
+                // float       max_dist    = glm::length(bdiagonal);
+                // bbox.expand( (max_dist*max_dist) * padding );
+                // it->second->addDefine("MODEL_SDF_SCALE", vera::toString(2.0f-bbox.getArea()/area) );
+
+                int voxel_resolution_lod_0  = std::pow(2, 2);
+                glm::vec3   bdiagonal       = acc.getDiagonal();
+                float       max_dist        = glm::length(bdiagonal);
+                acc.expand( (max_dist*max_dist) * padding );
+
+                std::vector<vera::Image> current_lod;
+                for (int z = 0; z < voxel_resolution_lod_0; z++)
+                    current_lod.push_back( vera::toSdfLayer( &acc, voxel_resolution_lod_0, z) );
+
+                uniforms.loadMutex.lock();
+                uniforms.loadQueue[ name ] = packSprite(current_lod);
+                uniforms.loadMutex.unlock();
+                addDefine("MODEL_SDF_VOXEL_RESOLUTION", vera::toString(voxel_resolution_lod_0) + ".0" );
+                addDefine("MODEL_SDF_TEXTURE_RESOLUTION", "vec2(" + vera::toString( uniforms.loadQueue[ name ].getWidth() ) + ".0)" );
+
+                size_t lod_total = 4;
+                for (int l = 1; l < lod_total; l++) {
+                    std::vector<vera::Image> new_lod = vera::scaleSprite(current_lod, 4);
+                    uniforms.loadMutex.lock();
+                    uniforms.loadQueue[ name ] = vera::packSprite(new_lod);
+                    uniforms.loadMutex.unlock();
+                    addDefine("MODEL_SDF_VOXEL_RESOLUTION", vera::toString(new_lod.size()) + ".0" );
+                    addDefine("MODEL_SDF_TEXTURE_RESOLUTION", "vec2(" + vera::toString( uniforms.loadQueue[ name ].getWidth() ) + ".0)" );
+
+                    if (l < (lod_total-1)) {
+                        for (int z = 0; z < new_lod.size(); z++) {
+                            new_lod[z] = vera::toSdfLayer( &acc, new_lod.size(), z);
+                            console_draw_pct( float(z) / float(new_lod.size() - 1) );
+                            uniforms.loadMutex.lock();
+                            uniforms.loadQueue[ name ] = vera::packSprite(new_lod);
+                            uniforms.loadMutex.unlock();
+                        }
+                    }
+
+                    current_lod = new_lod;
+                }
+
+                // float pct = 1.0;
+                // for (size_t i = 0; i < 500; i++) {
+                //     refineSdfLayers(&acc, current_lod, pct);
+                //     uniforms.loadMutex.lock();
+                //     uniforms.loadQueue[ name ] = vera::packSprite(current_lod);
+                //     uniforms.loadMutex.unlock();
+                //     std::cout << "Refine " << i << " at " << pct <<std::endl;
+                //     pct *= 0.95;
+                // }
+
+                end = clock();
+                double duration_sec = double(end-start)/CLOCKS_PER_SEC;
+                std::cout << "Took " << duration_sec << "secs" << std::endl;
             }
-            addDefine("SDF_CELLS_PER_SIDE", vera::toString(cells_per_side) );
 
             return true;
         }
@@ -1529,10 +1586,11 @@ void Sandbox::renderPrep() {
     if (m_initialized) {
         uniforms.update();
         if (uniforms.loadQueue.size() > 0) {
-            for (ImagesMap::iterator it = uniforms.loadQueue.begin(); it != uniforms.loadQueue.end(); ++it) {
+            uniforms.loadMutex.lock();
+            for (ImagesMap::iterator it = uniforms.loadQueue.begin(); it != uniforms.loadQueue.end(); ++it)
                 uniforms.addTexture( it->first, it->second );
-            }
             uniforms.loadQueue.clear();
+            uniforms.loadMutex.unlock();
         }
     }
 

diff --git a/src/sceneRender.cpp b/src/sceneRender.cpp
@@ -80,15 +80,15 @@ void SceneRender::commandsInit(CommandList& _commands, Uniforms& _uniforms) {
     _commands.push_back(Command("material", [&](const std::string& _line){ 
         if (_line == "materials") {
             for (vera::MaterialsMap::iterator it = _uniforms.materials.begin(); it != _uniforms.materials.end(); it++)
-                std::cout << it->second.name << std::endl;
+                std::cout << it->second->name << std::endl;
             return true;
         }
         else {
             std::vector<std::string> values = vera::split(_line,',');
             if (values.size() == 2 && values[0] == "material") {
                 for (vera::MaterialsMap::iterator it = _uniforms.materials.begin(); it != _uniforms.materials.end(); it++) {
-                    if (it->second.name == values[1]) {
-                        it->second.printDefines();
+                    if (it->second->name == values[1]) {
+                        it->second->printDefines();
                         return true;
                     }
                 }

diff --git a/src/uniforms.h b/src/uniforms.h
@@ -2,6 +2,7 @@
 
 #include <map>
 #include <queue>
+#include <mutex>
 #include <array>
 #include <vector>
 #include <string>
@@ -86,6 +87,7 @@ class Uniforms : public vera::Scene {
     virtual void        printBuffers();
     virtual void        clearBuffers();
 
+    std::mutex          loadMutex;
     ImagesMap           loadQueue;
 
     // Ingest new uniforms
+2 −0		include/vera/gl/texture.h
+20 −16		include/vera/ops/image.h
+17 −0		include/vera/ops/math.h
+7 −0		include/vera/ops/meshes.h
+1 −1		include/vera/types/boundingBox.h
+7 −2		include/vera/types/bvh.h
+6 −0		include/vera/types/image.h
+48 −3		include/vera/types/material.h
+7 −4		include/vera/types/mesh.h
+2 −2		include/vera/types/model.h
+1 −1		include/vera/types/scene.h
+7 −7		include/vera/types/triangle.h
+9 −2		src/gl/texture.cpp
+51 −36		src/io/gltf.cpp
+77 −72		src/io/obj.cpp
+6 −2		src/io/ply.cpp
+4 −2		src/io/stl.cpp
+0 −2		src/ops/geom.cpp
+363 −649		src/ops/image.cpp
+616 −0		src/ops/meshes.cpp
+107 −16		src/types/bvh.cpp
+0 −1		src/types/image.cpp
+135 −0		src/types/material.cpp
+4 −3		src/types/mesh.cpp
+5 −5		src/types/model.cpp
+8 −0		src/types/scene.cpp
+34 −17		src/types/triangle.cpp