Jittered sampling and numerical normals

.gitignore

@@ -25,3 +25,4 @@ output/
 results/
 runs/
 scenes/
+evals/

CMakeLists.txt

@@ -4,20 +4,20 @@ project(nsc CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 
-find_package(glfw3 REQUIRED)
+# find_package(glfw3 REQUIRED)
 
 add_executable(simplify      tools/main.cpp)
-add_executable(quadrangulate tools/quadrangulate.cpp)
-add_executable(convert       tools/convert.cpp)
+# add_executable(quadrangulate tools/quadrangulate.cpp)
+# add_executable(convert       tools/convert.cpp)
 add_executable(headless      tools/headless.cpp)
 
 target_compile_options(simplify      PRIVATE -Wall -Wextra -Wpedantic)
-target_compile_options(quadrangulate PRIVATE -Wall -Wextra -Wpedantic)
-target_compile_options(convert       PRIVATE -Wall -Wextra -Wpedantic)
+# target_compile_options(quadrangulate PRIVATE -Wall -Wextra -Wpedantic)
+# target_compile_options(convert       PRIVATE -Wall -Wextra -Wpedantic)
 target_compile_options(headless      PRIVATE -Wall -Wextra -Wpedantic)
 
-target_link_libraries(quadrangulate assimp)
-target_link_libraries(convert       assimp)
+# target_link_libraries(quadrangulate assimp)
+# target_link_libraries(convert       assimp)
 target_link_libraries(headless      glfw)
 
 include_directories(. glm)

configs/armadillo.json

@@ -1,51 +1,40 @@
 {
-	"name": "armadillo",
 	"target": "meshes/armadillo/target.obj",
 	"directory": "results/armadillo",
+	"clusters": 200,
+	"batch_size": 40,
+	"resolution": 16,
 	"experiments": [
 		{
 			"name": "lod4",
 			"source": "meshes/armadillo/source-lod4.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20
 		},
 
 		{
 			"name": "lod3",
 			"source": "meshes/armadillo/source-lod3.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20
 		},
 
 		{
 			"name": "lod2",
 			"source": "meshes/armadillo/source-lod2.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20
 		},
 
 		{
 			"name": "lod1",
 			"source": "meshes/armadillo/source-lod1.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
-		},
-
-		{
-			"name": "lod0",
-			"source": "meshes/armadillo/source-lod0.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": "lambda r: 10 if r < 16 else 2",
-			"resolution": 16
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20
 		}
 	]
 }

configs/chinese.json

@@ -1,51 +1,38 @@
 {
-	"name": "chinese",
 	"target": "meshes/chinese/target.obj",
 	"directory": "results/chinese",
+	"clusters": 50,
+	"batch_size": 50,
+	"resolution": 16,
 	"experiments": [
 		{
-			"name": "lod4",
-			"source": "meshes/chinese/source-lod4.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
-		},
-
-		{
-			"name": "lod3",
-			"source": "meshes/chinese/source-lod3.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
-		},
-
-		{
-			"name": "lod2",
+			"name": "numerical",
 			"source": "meshes/chinese/source-lod2.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20,
+			"jittering": false,
+			"normals": "numerical"
 		},
 
 		{
-			"name": "lod1",
-			"source": "meshes/chinese/source-lod1.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": 10,
-			"resolution": 16
+			"name": "default",
+			"source": "meshes/chinese/source-lod2.obj",
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20,
+			"jittering": false,
+			"normals": "geometric"
 		},
 
 		{
-			"name": "lod0",
-			"source": "meshes/chinese/source-lod0.obj",
-			"method": "lrelu/linear",
-			"clusters": 250,
-			"batch": "lambda r: 10 if r < 16 else 2",
-			"resolution": 16
+			"name": "jittering",
+			"source": "meshes/chinese/source-lod2.obj",
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20,
+			"jittering": true,
+			"normals": "geometric"
 		}
 	]
 }

configs/dragon-statue.json

@@ -1,32 +1,26 @@
 {
 	"target": "meshes/dragon-statue/target.obj",
 	"directory": "results/dragon-statue",
-	"clusters": 20,
-	"batch_size": 10,
+	"clusters": 100,
+	"batch_size": 50,
 	"resolution": 16,
 	"experiments": [
 		{
-			"name": "sincos",
+			"name": "jittering",
 			"source": "meshes/dragon-statue/source-lod2.obj",
 			"encoder": "sincos",
 			"encoding_levels": 10,
-			"features": 20
+			"features": 20,
+			"jittering": true
 		},
 
 		{
-			"name": "skewed",
+			"name": "default",
 			"source": "meshes/dragon-statue/source-lod2.obj",
-			"encoder": "skewed",
-			"encoding_levels": 20,
-			"features": 20
-		},
-
-		{
-			"name": "extint",
-			"source": "meshes/dragon-statue/source-lod2.obj",
-			"encoder": "extint",
-			"encoding_levels": 16,
-			"features": 20
+			"encoder": "sincos",
+			"encoding_levels": 10,
+			"features": 20,
+			"jittering": false
 		}
 	]
 }