fuck yeah vgeom fix

Author: awarebayes

Common/helper_cuda.h

@@ -579,13 +579,15 @@ static const char *_cudaGetErrorEnum(NppStatus error) {
 }
 #endif
 
+#include <cassert>
 
 template <typename T>
 void check(T result, char const *const func, const char *const file,
            int const line) {
   if (result) {
     fprintf(stderr, "CUDA error at %s:%d code=%d(%s) \"%s\" \n", file, line,
             static_cast<unsigned int>(result), _cudaGetErrorEnum(result), func);
+	assert(0);
     exit(EXIT_FAILURE);
   }
 }

src/render/virtual_geometry/analyzer/mesh_analyzer.cu

@@ -5,6 +5,16 @@
 #include "../../../util/const.h"
 #include "mesh_analyzer.h"
 
+__device__ int get_subdivision_count(float area, int threshold) {
+	float unit = area;
+	int count = 1;
+	while (unit > threshold) {
+		unit /= 4;
+		count *= 4;
+	}
+	return count;
+}
+
 template <typename ShaderType>
 __global__ void analyze_faces(DrawCallBaseArgs args, ModelDrawCallArgs model_args, const Image image, int threshold, bool *face_mask, int n_faces, int *new_virtual_faces) {
 	int position = blockIdx.x * blockDim.x + threadIdx.x;
@@ -21,7 +31,7 @@ __global__ void analyze_faces(DrawCallBaseArgs args, ModelDrawCallArgs model_arg
 	if (pts[0].y==pts[1].y && pts[0].y==pts[2].y) return;
 
 	glm::vec2 bboxmin{float(image.width-1),  float(image.height-1)};
-	glm::vec2 bboxmax{0., 0.};
+	glm::vec2 bboxmax{0.01, 0.01};
 	glm::vec2 clamp{float(image.width-1), float(image.height-1)};
 	for (auto &pt : pts) {
 		bboxmin.x = max(0.0f, min(bboxmin.x, pt.x));
@@ -31,9 +41,11 @@ __global__ void analyze_faces(DrawCallBaseArgs args, ModelDrawCallArgs model_arg
 		bboxmax.y = min(clamp.y, max(bboxmax.y, pt.y));
 	}
 
-	float area = (bboxmax.x - pts[0].x) * (bboxmax.y - pts[0].y);
+
+	float area = (bboxmax.x - bboxmin.x) * (bboxmax.y - bboxmin.y);
 	if (area > threshold) {
-		atomicAdd(new_virtual_faces, ceil(area / (float)threshold));
+		auto count = get_subdivision_count(area, threshold);
+		atomicAdd(new_virtual_faces, count);
 		face_mask[position] = true;
 	}
 }

src/render/virtual_geometry/virtual_model/virtual_model.cpp

@@ -34,9 +34,10 @@ void VirtualModel::accept(ModelDrawCallArgs args, bool *disabled_faces_to_copy,
 
 	int max_texture_index = args.model.max_texture_index;
 
-	auto multiplier = 9;
+	auto multiplier = 3;
 	auto vvert_count = multiplier * vface_count;
 
+
 	if (vface_count > n_allocated_faces)
 	{
 		n_allocated_faces = vface_count;