Merge branch 'cnr-isti-vclab-master'

Merge branch

Author: HeDo88TH

.github/workflows/Linux.yml

@@ -6,14 +6,17 @@ on:
 jobs:
   linux_build:
     name: Build Nexus (Linux)
-    runs-on: ubuntu-18.04 #in order to deploy, need to use oldest supported version
+    runs-on: ubuntu-20.04 #in order to deploy, need to use oldest supported version
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: true
+        version: '5.15.2'
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev

.github/workflows/MacOS.yml

@@ -9,11 +9,14 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: true
+        version: '5.15.2'
     - name: Install dependencies
       run: |
        cd ..
@@ -36,7 +39,7 @@ jobs:
         rm -r lib
         tar -cvzf nxsview-macos.tar.gz *
     - name: Upload nxsview Portable
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nxsview_macos_portable
         path: install/nxsview-macos.tar.gz

.github/workflows/Windows.yml

@@ -2,20 +2,23 @@ name: Windows
 
 on:
   [push, pull_request]
-
+  
 jobs:
   linux_build:
     name: Build Nexus (Windows)
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Setup MSVC
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: true
+        version: '5.15.2'
     - name: Install dependencies
       run: |
        cd ..
@@ -38,7 +41,7 @@ jobs:
         cd ..
         mv bin nexus_portable
     - name: Uploading Nexus Portable
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nexus_windows_portable
         path: install/nexus_portable

README.md

@@ -116,6 +116,9 @@ ACM Trans. on Graphics, vol. 23(3), pp. 796-803, August 2004 (Siggraph '04)
 P.Cignoni, F.Ganovelli, E. Gobbetti, F.Marton, F. Ponchio, R. Scopigno
 Computer Graphics Forum, 22(3), pp. 505-514, September 2003
 
+### Feedback
+
+For documented and repeatable bugs, feature requests, etc., please use the [GitHub issues](https://github.com/cnr-isti-vclab/nexus/issues).
 
 ### Support and thanks
 

README.txt

@@ -6,7 +6,7 @@ Nexus is a c++/javascript library for creation and visualization of a batched mu
 
 Contact me @ federico.ponchio@isti.cnr.it 
 
-See INSTALL.MD for compilation instructions.
+See [INSTALL.MD](INSTALL.md) for compilation instructions.
 
 ### Main features
 
@@ -116,6 +116,9 @@ ACM Trans. on Graphics, vol. 23(3), pp. 796-803, August 2004 (Siggraph '04)
 P.Cignoni, F.Ganovelli, E. Gobbetti, F.Marton, F. Ponchio, R. Scopigno
 Computer Graphics Forum, 22(3), pp. 505-514, September 2003
 
+### Feedback
+
+For documented and repeatable bugs, feature requests, etc., please use the [GitHub issues](https://github.com/cnr-isti-vclab/nexus/issues).
 
 ### Support and thanks
 

html/js/nexus_three.js

@@ -249,44 +249,51 @@ NexusObject.prototype.raycast = function(raycaster, intersects) {
 	if(!intersect)
 		return;
 
+	let face = {};
 	if(!nexus.sink || !nexus.basei) {
 		return;
 		//no mesh loaded, we can still use the sphere.
 		intersect.applyMatrix4(this.matrixWorld);
-		var d = intersect.distanceTo(raycaster.ray.origin);
+		let d = intersect.distanceTo(raycaster.ray.origin);
 		if(d < raycaster.near || d > raycaster.far )  
 			distance = d;
 	} else {
-		var vert = nexus.basev;
-		var face = nexus.basei;
+		let vert = nexus.basev;
+		let tri = nexus.basei;
 
 		let A = new THREE.Vector3(0, 0, 0);
 		let B = new THREE.Vector3(0, 0, 0);
 		let C = new THREE.Vector3(0, 0, 0);
-		for(var j = 0; j < nexus.basei.length; j += 3) {
-			var a = face[j];
-			var b = face[j+1];
-			var c = face[j+2];
+		for(let j = 0; j < nexus.basei.length; j += 3) {
+			let a = tri[j];
+			let b = tri[j+1];
+			let c = tri[j+2];
 			A.set(vert[a*3], vert[a*3+1], vert[a*3+2]);
 			B.set(vert[b*3], vert[b*3+1], vert[b*3+2]);
 			C.set(vert[c*3], vert[c*3+1], vert[c*3+2]);
 			//TODO use material to determine if using doubleface or not!
-			var hit = ray.intersectTriangle( C, B, A, false, point ); 
+			let hit = ray.intersectTriangle( C, B, A, false, point ); 
 			if(!hit) continue;
 
+
 			//check distances in world space
 			hit.applyMatrix4(this.matrixWorld);
-			var d = hit.distanceTo(raycaster.ray.origin);
+			let d = hit.distanceTo(raycaster.ray.origin);
 			if(d < raycaster.near || d > raycaster.far ) continue;
 			if(distance == -1.0 || d < distance) {
 				distance = d;
 				intersect = hit.clone();
+
+				face = { a: a, b: b, c: c,
+					normal: new THREE.Vector3(),
+				};
+				THREE.Triangle.getNormal( A, B, C, face.normal );
 			}
 		}
 	}
 
 	if(distance == -1.0) return;
-	intersects.push({ distance: distance, point: intersect, object: this} );
+	intersects.push({ distance: distance, point: intersect, face: face, object: this} );
 	return;
 
 /* Kept for reference, should we want to implement a raycasting on the higher resolution nodes 

html/raycast.html

@@ -88,8 +88,14 @@
 
 	if (guiConfig.visualizePointFromRaycasting) {
 		if (intersections.length) {
+			let hit = intersections[0];
 			raycastingIntersectionSphere.visible = true;
-			raycastingIntersectionSphere.position.copy(intersections[0].point);
+			raycastingIntersectionSphere.position.copy(hit.point);
+			if(hit.face) {
+				console.log("Face: ", hit.face.a, hit.face.b, hit.face.c);
+				console.log("Normal: ", hit.face.normal);
+				//TODO read also UV
+			}
 		} else {
 			raycastingIntersectionSphere.visible = false;
 		}

src/nxsbuild/nexusbuilder.cpp

@@ -120,7 +120,7 @@ NexusBuilder::NexusBuilder(Signature &signature): chunks("cache_chunks"), scalin
 	header.nvert = header.nface = header.n_nodes = header.n_patches = header.n_textures = 0;
 }
 
-void NexusBuilder::initAtlas(const std::vector<QImage>& textures) {
+void NexusBuilder::initAtlas(std::vector<QImage>& textures) {
 	if(textures.size()) {
 		atlas.addTextures(textures);
 	}
@@ -143,7 +143,6 @@ void NexusBuilder::create(KDTree *tree, Stream *stream, uint top_node_size) {
 	int level = 0;
 	int last_top_level_size = 0;
 	do {
-		//cout << "Creating level " << level << endl;
 		tree->clear();
 		if(level % 2) tree->setAxesDiagonal();
 		else tree->setAxesOrthogonal();
@@ -207,15 +206,17 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 	std::vector<int> vertex_to_box;
 
 
+	//find connected pieces of triangles belonging to the same texture
+	//iterate over the triangles and connect the vertices.
 	UnionFind components;
 	components.init(mesh.vert.size());
 
 	for(auto &face: mesh.face) {
 		int v[3];
 		for(int i = 0; i < 3; i++) {
 			v[i] = face.V(i) - &*mesh.vert.begin();
-			
-			
+
+
 			int &t = vertex_to_tex[v[i]];
 
 			if(t != -1 && t != face.tex) qDebug() << "Missing vertex replication across seams\n";
@@ -227,17 +228,15 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 	}
 	int n_boxes = components.compact(vertex_to_box);
 
+	//assign a texture to each vertex (we already split)
 	for(auto &face: mesh.face) {
 		int v[3];
 		for(int i = 0; i < 3; i++) {
 			int v = face.V(i) - &*mesh.vert.begin();
 			vertex_to_tex[v] = face.tex;
 		}
-		/*		assert(vertex_to_box[v[0]] == vertex_to_box[v[1]]);
-		assert(vertex_to_box[v[0]] == vertex_to_box[v[2]]);
-		assert(components.root(v[0]) == components.root(v[2]));
-		assert(components.root(v[0]) == components.root(v[1])); */
 	}
+
 	//assign all boxes to a tex (and remove boxes where the tex is -1
 
 	//compute boxes
@@ -251,13 +250,15 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 		vcg::Box2f &box = boxes[b];
 		box_texture[b] = tex;
 		auto &t = mesh.vert[i].T().P();
-		t[0] = fmod(t[0], 1.0);
-		t[1] = fmod(t[1], 1.0);
-		//		if(isnan(t[0]) || isnan(t[1]) || t[0] < 0 || t[1] < 0 || t[0] > 1 || t[1] > 1)
-		//				cout << "T: " << t[0] << " " << t[1] << endl;
+		if(t[0] != 1.0)
+			t[0] = fmod(t[0], 1.0);
+		if(t[1] != 1.0)
+			t[1] = fmod(t[1], 1.0);
+
 		if(t[0] != 0.0f || t[1] != 0.0f)
 			box.Add(t);
 	}
+
 	//erase boxes assigned to no texture, and remap vertex_to_box
 	int count = 0;
 	std::vector<int> remap(mesh.vert.size(), -1);
@@ -277,9 +278,17 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 	std::vector<vcg::Point2i> origins(boxes.size());
 	for(size_t b = 0; b < boxes.size(); b++) {
 		auto &box = boxes[b];
+		if(box.DimX() > 0.9) {
+			for(auto &face: mesh.face) {
+				int v[3];
+				for(int i = 0; i < 3; i++) {
+					auto v = face.V(i);
+					int j = (i+1)%3;
+				}
+			}
+		}
 		int tex = box_texture[b];
 
-		//enlarge 1 pixel
 		float w = atlas.width(tex, level); //img->size().width();
 		float h = atlas.height(tex, level); //img->size().height();
 		float px = 1/(float)w;
@@ -299,10 +308,6 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 		size[1] = std::min(h, ceil(box.max[1]/py)) - origin[1];
 		if(size[0] <= 0) size[0] = 1;
 		if(size[1] <= 0) size[1] = 1;
-		
-		//		cout << "Box: " << box_texture[b] << " [" << box.min[0] << "  " << box.min[1] << " ] [ " << box.max[0] << "  " << box.max[1] << "]" << std::endl;
-		//		cout << "Size: " << size[0] << " - " << size[1] << endl << endl;
-		//		getchar();
 	}
 
 	//pack boxes;
@@ -342,7 +347,6 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 		finalSize[ 1 ] = (int) nextPowerOf2( finalSize[ 1 ] );
 	}
 
-	//	std::cout << "Boxes: " << boxes.size() << " Final size: " << finalSize[0] << " " << finalSize[1] << std::endl;
 	QImage image(finalSize[0], finalSize[1], QImage::Format_RGB32);
 	image.fill(QColor(127, 127, 127));
 	//copy boxes using mapping
@@ -361,10 +365,9 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 		vcg::Point2i &o = origins[b];
 		vcg::Point2i m = mapping[b];
 
-		//QImageReader &img = textures[box_texture[b]];
 		int tex = box_texture[b];
-		float w = atlas.width(tex, level); //img->size().width();
-		float h = atlas.height(tex, level); //img->size().height();
+		float w = atlas.width(tex, level);
+		float h = atlas.height(tex, level);
 		float px = 1/(float)w;
 		float py = 1/(float)h;
 
@@ -404,7 +407,7 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 	}
 	pixelXedge = sqrt(pixelXedge/mesh.face.size()*3);
 	error = sqrt(error/mesh.face.size()*3);
-	
+
 	double areausage = 0.0;
 	//compute area waste
 	for(int i = 0; i < mesh.face.size(); i++) {
@@ -416,7 +419,6 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 		auto V1 = face.V(1)->T().P();
 		auto V2 = face.V(2)->T().P();
 		areausage += (V2 - V0)^(V2 - V1)/2;
-		
 	}
 
 	{
@@ -443,14 +445,14 @@ QImage NexusBuilder::extractNodeTex(TMesh &mesh, int level, float &error, float
 			//		boxid++;
 		}
 
-		
+
 		/*	painter.setPen(QColor(255,0,255));
 		for(int i = 0; i < mesh.face.size(); i++) {
 			auto &face = mesh.face[i];
 			int b = vertex_to_box[face.V(0) - &(mesh.vert[0])];
 			vcg::Point2i &o = origins[b];
 			vcg::Point2i m = mapping[b];
-			
+
 			for(int k = 0; k < 3; k++) {
 				int j = (k==2)?0:k+1;
 				auto V0 = face.V(k);
@@ -865,7 +867,6 @@ void NexusBuilder::reverseDag() {
 
 void NexusBuilder::save(QString filename) {
 
-	//cout << "Saving to file " << qPrintable(filename) << endl;
 	//cout << "Input squaresize " << sqrt(input_pixels) <<  " Output size " << sqrt(output_pixels) << "\n";
 
 	file.setFileName(filename);
@@ -1102,7 +1103,7 @@ void NexusBuilder::appendBorderVertices(uint32_t origin, uint32_t destination, s
 	uint16_t *face = (uint16_t *)(buffer + header.signature.vertex.size()*node.nvert);
 
 	NodeBox &nodebox = boxes[origin];
-	
+
 	vector<bool> border = nodebox.markBorders(node, point, face);
 	for(int i = 0; i < node.nvert; i++) {
 		if(border[i])
@@ -1168,7 +1169,7 @@ void NexusBuilder::uniformNormals() {
 		uint start = 0;
 		while(start < vertices.size()) {
 			NVertex &v = vertices[start];
-			
+
 			uint last = start+1;
 			while(last < vertices.size() && vertices[last].point == v.point)
 				last++;
@@ -1187,15 +1188,15 @@ void NexusBuilder::uniformNormals() {
 
 				for(uint k = start; k < last; k++)
 					*vertices[k].normal = normals;
-				
+
 			} else //just copy from first one (coming from lower level due to sorting
 				for(uint k = start; k < last; k++)
 					*vertices[k].normal =*v.normal;
-			
+
 			start = last;
 		}
 
-		
+
 		/*		for(uint k = 0; k < vertices.size(); k++) {
 			NVertex &v = vertices[k];
 			if(v.point != previous) {