Implemented triangle selection for NiTriShape and Skyrim skin partitions

fo76utils · Jan 26, 2025 · 75002db · 75002db
1 parent 1904c02
commit 75002db
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/gl/bsshape.cpp b/src/gl/bsshape.cpp
@@ -208,7 +208,22 @@ QModelIndex BSShape::triangleAt( int idx ) const
 
 	auto blk = iBlock;
 	if ( iSkinPart.isValid() ) {
-		// TODO: Triangles are on NiSkinPartition in version 100
+		// Triangles are on NiSkinPartition in version 100
+		auto iPartitions = nif->getIndex( iSkinPart, "Partitions" );
+		if ( iPartitions.isValid() && nif->isArray( iPartitions ) ) {
+			for ( int i = 0; i < nif->rowCount( iPartitions ); i++ ) {
+				auto iPart = nif->getIndex( iPartitions, i );
+				if ( !iPart.isValid() )
+					continue;
+				auto iTriangles = nif->getIndex( iPart, "Triangles" );
+				if ( !( iTriangles.isValid() && nif->isArray( iTriangles ) ) )
+					continue;
+				int n = nif->rowCount( iTriangles );
+				if ( idx < n )
+					return nif->getIndex( iTriangles, idx );
+				idx -= n;
+			}
+		}
 		return QModelIndex();
 	}
 
@@ -482,8 +497,16 @@ void BSShape::drawSelection() const
 	// Draw Triangles
 	if ( n == "Triangles" ) {
 		int s = -1;
-		if ( n == p )
+		if ( n == p ) {
 			s = idx.row();
+			if ( iSkinPart.isValid() ) {
+				int i = idx.parent().parent().row();
+				while ( i-- > 0 ) {
+					if ( auto j = nif->getIndex( nif->getIndex( iSkinPart, "Partitions" ), i ); j.isValid() )
+						s += int( nif->get<quint32>( j, "Num Triangles" ) );
+				}
+			}
+		}
 		Shape::drawWireframe( scene->wireframeColor );
 		if ( s >= 0 && s < triangles.size() )
 			Shape::drawTriangles( s, 1, scene->highlightColor );

diff --git a/src/gl/glmesh.cpp b/src/gl/glmesh.cpp
@@ -643,7 +643,7 @@ void Mesh::updateData_NiTriShape( const NifModel * nif )
 
 QModelIndex Mesh::vertexAt( int idx ) const
 {
-	auto nif = NifModel::fromIndex( iBlock );
+	auto nif = scene->nifModel;
 	if ( !nif )
 		return QModelIndex();
 
@@ -653,9 +653,16 @@ QModelIndex Mesh::vertexAt( int idx ) const
 	return iVertex;
 }
 
-bool compareTriangles( const QPair<int, float> & tri1, const QPair<int, float> & tri2 )
+QModelIndex Mesh::triangleAt( int idx ) const
 {
-	return ( tri1.second < tri2.second );
+	auto nif = scene->nifModel;
+	if ( nif && iData.isValid() ) {
+		// TODO: implement support for triangle strips and skin partitions
+		auto iTriangleData = nif->getIndex( iData, "Triangles" );
+		if ( iTriangleData.isValid() && nif->isArray( iTriangleData ) )
+			return nif->getIndex( iTriangleData, idx );
+	}
+	return QModelIndex();
 }
 
 void Mesh::transformShapes()

diff --git a/src/gl/glmesh.h b/src/gl/glmesh.h
@@ -61,6 +61,7 @@ class Mesh : public Shape
 
 	void drawVerts() const;
 	QModelIndex vertexAt( int ) const override;
+	QModelIndex triangleAt( int ) const override;
 	void updateLodLevel() override;
 
 protected: