From 49e5b25f83c6b9af1cb70d3d2ab3c34a0bd3c44b Mon Sep 17 00:00:00 2001 From: Amorilia Date: Sat, 17 Nov 2012 20:56:10 +0000 Subject: [PATCH 001/836] Version bump. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 781dcb07c..788d54ebb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.3 +1.1.4a0.dev0 From 305b5165b9efcd980fe779e8f020eeb2d2e7579a Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Thu, 14 Nov 2013 05:53:01 -0500 Subject: [PATCH 002/836] Collision Fixes plus bhkCompressedMeshShape support Collision scales / translates correctly now. Added display support for bhkCompressedMeshShape. --- gl/glnode.cpp | 143 +++++++++++++++++++++++++++++++++++++++++++++++-- gl/gltools.cpp | 6 +-- gl/gltools.h | 2 +- 3 files changed, 142 insertions(+), 9 deletions(-) diff --git a/gl/glnode.cpp b/gl/glnode.cpp index 049022a96..4739b2095 100644 --- a/gl/glnode.cpp +++ b/gl/glnode.cpp @@ -771,7 +771,7 @@ void Node::transform() if ( nif->isNiBlock( iBody, "bhkRigidBodyT" ) ) { t.rotation.fromQuat( nif->get( iBody, "Rotation" ) ); - t.translation = Vector3( nif->get( iBody, "Translation" ) * 7 ); + t.translation = Vector3( nif->get( iBody, "Translation" ) * 70.0f ); } scene->bhkBodyTrans.insert( nif->getBlockNumber( iBody ), worldTrans() * t ); } @@ -959,6 +959,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlock( nif->getLink( iShape, "Shape" ) ), stack, scene, origin_color3fv ); @@ -971,7 +972,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawSphere( Vector3(), nif->get( iShape, "Radius" ) ); + drawSphere( Vector3(), nif->get( iShape, "Radius" ) * 10.0f ); } else if ( name == "bhkMultiSphereShape" ) { @@ -994,7 +995,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackget( iShape, "Dimensions" ); - drawBox( v, - v ); + drawBox( v * 10.0f, - v * 10.0f ); } else if ( name == "bhkCapsuleShape" ) { @@ -1003,7 +1004,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawCapsule( nif->get( iShape, "First Point" ), nif->get( iShape, "Second Point" ), nif->get( iShape, "Radius" ) ); + drawCapsule( nif->get( iShape, "First Point" ) * 10.0f, nif->get( iShape, "Second Point" ) * 10.0f, nif->get( iShape, "Radius" ) * 10.0f ); } else if ( name == "bhkNiTriStripsShape" ) { @@ -1026,6 +1027,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStack verts = nif->getArray( iStripData, "Vertices" ); glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + glDisable(GL_CULL_FACE); glBegin( GL_TRIANGLES ); QModelIndex iPoints = nif->getIndex( iStripData, "Points" ); @@ -1051,6 +1053,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawConvexHull( nif->getArray( iShape, "Vertices" ), nif->getArray( iShape, "Normals" ) ); + drawConvexHull( nif->getArray( iShape, "Vertices" ), nif->getArray( iShape, "Normals" ), 10.0 ); } else if ( name == "bhkMoppBvTreeShape" ) { @@ -1194,6 +1197,136 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); + if (Node::SELECTING) { + int s_nodeId = ID2COLORKEY( nif->getBlockNumber( iShape ) ); + glColor4ubv( (GLubyte *)&s_nodeId ); + } + + //qDebug() << nif->getBlock( nif->getParent( nif->getBlockNumber( iShape ) ) ); + + QModelIndex iParent = nif->getBlock( nif->getParent( nif->getBlockNumber( iShape ) ) ); + Vector4 origin = Vector4( nif->get( iParent, "Origin" ), 0); + + //qDebug() << origin; + + QModelIndex iData = nif->getBlock( nif->getLink( iShape, "Data" ) ); + if ( iData.isValid() ) + { + QModelIndex iBigVerts = nif->getIndex( iData, "Big Verts" ); + QModelIndex iBigTris = nif->getIndex( iData, "Big Tris" ); + + QVector verts = nif->getArray( iBigVerts ); + + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + glDisable(GL_CULL_FACE); + + for ( int r = 0; r < nif->rowCount( iBigTris ); r++ ) + { + quint16 a = nif->get( iBigTris.child(r, 0), "Triangle 1" ); + quint16 b = nif->get( iBigTris.child(r, 0), "Triangle 2" ); + quint16 c = nif->get( iBigTris.child(r, 0), "Triangle 3" ); + + glBegin( GL_TRIANGLES ); + + glVertex( verts[a] * 10.0 ); + glVertex( verts[b] * 10.0 ); + glVertex( verts[c] * 10.0 ); + + glEnd(); + } + + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + glEnable(GL_CULL_FACE); + + QModelIndex iChunks = nif->getIndex( iData, "Chunks" ); + for ( int r = 0; r < nif->rowCount( iChunks ); r++ ) + { + Vector4 translation = nif->get( iChunks.child(r, 0), "Translation" ); + //Vector3 t = Vector3( translation[0], translation[1], translation[2] ); + quint32 numVerts = nif->get( iChunks.child(r, 0), "Num Vertices" ); + QVector verts = nif->getArray( iChunks.child(r, 0), "Vertices" ); + quint32 numIndices = nif->get( iChunks.child(r, 0), "Num Indices" ); + QVector indices = nif->getArray( iChunks.child(r, 0), "Indices" ); + quint32 numStrips = nif->get( iChunks.child(r, 0), "Num Strips" ); + QVector strips = nif->getArray( iChunks.child(r, 0), "Strips" ); + + QVector vertices(numVerts/3); + + int numStripVerts = 0; + int offset = 0; + + for ( int v = 0; v < numStrips; v++ ) + { + numStripVerts += strips[v]; + } + + //int i = 0; + + for ( int n = 0; n < ( numVerts / 3 ); n++ ) + { + vertices[n] = translation + Vector4(verts[3*n], verts[3*n+1], verts[3*n+2], 0) / 1000.0f; + vertices[n] *= 10.0f; + //vertices[n] -= origin / 2.0f; + //i++; + } + + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + glDisable(GL_CULL_FACE); + + //qDebug() << "Num Strips: " << numStrips; + + // Stripped tris + for ( int s = 0; s < numStrips; s++ ) + { + + for ( int idx = 0; idx < strips[s] - 2; idx++ ) + { + + glBegin( GL_TRIANGLES ); + + glVertex( vertices[indices[offset + idx]] ); + glVertex( vertices[indices[offset + idx + 1]] ); + glVertex( vertices[indices[offset + idx + 2]] ); + + glEnd(); + + } + + offset += strips[s]; + + } + + // Non-stripped tris + for ( int f = 0; f < numIndices - offset; f+=3 ) + { + glBegin( GL_TRIANGLES ); + + glVertex( vertices[indices[offset + f]] ); + glVertex( vertices[indices[offset + f + 1]] ); + glVertex( vertices[indices[offset + f + 2]] ); + + glEnd(); + + } + + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + glEnable(GL_CULL_FACE); + + } + + } + + glPopMatrix(); + + } stack.pop(); } diff --git a/gl/gltools.cpp b/gl/gltools.cpp index 916bea430..7d158f279 100644 --- a/gl/gltools.cpp +++ b/gl/gltools.cpp @@ -561,15 +561,15 @@ void drawDashLine( Vector3 a, Vector3 b, int sd ) glEnd(); } -void drawConvexHull( QVector vertices, QVector normals ) +void drawConvexHull( QVector vertices, QVector normals, float scale ) { glBegin( GL_LINES ); for ( int i = 1; i < vertices.count(); i++ ) { for ( int j = 0; j < i; j++ ) { - glVertex( vertices[i] ); - glVertex( vertices[j] ); + glVertex( vertices[i] * scale ); + glVertex( vertices[j] * scale ); } } /* diff --git a/gl/gltools.h b/gl/gltools.h index 8ff9b7667..c6a274ebe 100644 --- a/gl/gltools.h +++ b/gl/gltools.h @@ -116,7 +116,7 @@ void drawRagdollCone( Vector3 pivot, Vector3 twist, Vector3 plane, float coneAng void drawSphere( Vector3 c, float r, int sd = 8 ); void drawCapsule( Vector3 a, Vector3 b, float r, int sd = 5 ); void drawDashLine( Vector3 a, Vector3 b, int sd = 15 ); -void drawConvexHull( QVector vertices, QVector normals ); +void drawConvexHull( QVector vertices, QVector normals, float scale = 1.0f ); void drawSpring( Vector3 a, Vector3 b, float stiffness, int sd = 16, bool solid = false ); void drawRail( const Vector3 &a, const Vector3 &b ); From b339d4411cbcb9f6b9e5d009652f41de5dcf9e55 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Thu, 14 Nov 2013 06:19:48 -0500 Subject: [PATCH 003/836] BSLODTriShape support for Spells BSLODTriShape was missing the ability to use the same spells that NiTriShape data could. --- spells/mesh.cpp | 4 ++-- spells/normals.cpp | 2 +- spells/tangentspace.cpp | 1 + spells/texture.cpp | 4 ++-- spells/transform.cpp | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spells/mesh.cpp b/spells/mesh.cpp index c41df1eba..9f7744c01 100644 --- a/spells/mesh.cpp +++ b/spells/mesh.cpp @@ -19,7 +19,7 @@ static QModelIndex getShape( const NifModel * nif, const QModelIndex & index ) QModelIndex iShape = nif->getBlock( index ); if ( nif->isNiBlock( iShape, "NiTriBasedGeomData" ) ) iShape = nif->getBlock( nif->getParent( nif->getBlockNumber( iShape ) ) ); - if ( nif->isNiBlock( iShape, "NiTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) ) + if ( nif->isNiBlock( iShape, "NiTriShape" ) || nif->isNiBlock( index, "BSLODTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) ) if ( nif->getBlock( nif->getLink( iShape, "Data" ), "NiTriBasedGeomData" ).isValid() ) return iShape; return QModelIndex(); @@ -34,7 +34,7 @@ static QModelIndex getShape( const NifModel * nif, const QModelIndex & index ) static QModelIndex getTriShapeData( const NifModel * nif, const QModelIndex & index ) { QModelIndex iData = nif->getBlock( index ); - if ( nif->isNiBlock( index, "NiTriShape" ) ) + if ( nif->isNiBlock( index, "NiTriShape" ) || nif->isNiBlock( index, "BSLODTriShape" ) ) iData = nif->getBlock( nif->getLink( index, "Data" ) ); if ( nif->isNiBlock( iData, "NiTriShapeData" ) ) return iData; diff --git a/spells/normals.cpp b/spells/normals.cpp index bd429c240..d5d67444f 100644 --- a/spells/normals.cpp +++ b/spells/normals.cpp @@ -25,7 +25,7 @@ class spFaceNormals : public Spell static QModelIndex getShapeData( const NifModel * nif, const QModelIndex & index ) { QModelIndex iData = nif->getBlock( index ); - if ( nif->isNiBlock( index, "NiTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) ) + if ( nif->isNiBlock( index, "NiTriShape" ) || nif->isNiBlock( index, "BSLODTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) ) iData = nif->getBlock( nif->getLink( index, "Data" ) ); if ( nif->isNiBlock( iData, "NiTriShapeData" ) || nif->isNiBlock( iData, "NiTriStripsData" ) ) return iData; diff --git a/spells/tangentspace.cpp b/spells/tangentspace.cpp index 0cb8ebf1b..db35dd3cc 100644 --- a/spells/tangentspace.cpp +++ b/spells/tangentspace.cpp @@ -8,6 +8,7 @@ bool spTangentSpace::isApplicable( const NifModel * nif, const QModelIndex & ind { QModelIndex iData = nif->getBlock( nif->getLink( index, "Data" ) ); if ( !( nif->isNiBlock( index, "NiTriShape" ) && nif->isNiBlock( iData, "NiTriShapeData" ) ) + && !( nif->isNiBlock( index, "BSLODTriShape" ) && nif->isNiBlock( iData, "NiTriShapeData" ) ) && !( nif->isNiBlock( index, "NiTriStrips" ) && nif->isNiBlock( iData, "NiTriStripsData" ) ) ) return false; diff --git a/spells/texture.cpp b/spells/texture.cpp index dff262161..909301d00 100644 --- a/spells/texture.cpp +++ b/spells/texture.cpp @@ -125,7 +125,7 @@ QIcon * tex42_xpm_icon = 0; //! Find the reference to shape data from a model and index QModelIndex getData( const NifModel * nif, const QModelIndex & index ) { - if ( nif->isNiBlock( index, "NiTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) ) + if ( nif->isNiBlock( index, "NiTriShape" ) || nif->isNiBlock( index, "NiTriStrips" ) || nif->isNiBlock( index, "BSLODTriShape" ) ) return nif->getBlock( nif->getLink( index, "Data" ) ); else if ( nif->isNiBlock( index, "NiTriShapeData" ) || nif->isNiBlock( index, "NiTriStripsData" ) ) return index; @@ -247,7 +247,7 @@ class spEditTexCoords : public Spell bool isApplicable( const NifModel * nif, const QModelIndex & index ) { - return ( nif->itemName(index) == "NiTriShape" || nif->itemName(index) == "NiTriStrips" ); + return ( nif->itemName(index) == "NiTriShape" || nif->itemName(index) == "NiTriStrips" || nif->itemName(index) == "BSLODTriShape" ); //QModelIndex iUVs = getUV( nif, index ); //return iUVs.isValid() && nif->rowCount( iUVs ) >= 1; diff --git a/spells/transform.cpp b/spells/transform.cpp index c7c47a8ca..42806490e 100644 --- a/spells/transform.cpp +++ b/spells/transform.cpp @@ -93,7 +93,8 @@ static char const * transform_xpm[] = { bool spApplyTransformation::isApplicable( const NifModel * nif, const QModelIndex & index ) { return nif->itemType( index ) == "NiBlock" && ( nif->inherits( nif->itemName( index ), "NiNode" ) - || nif->itemName( index ) == "NiTriShape" || nif->itemName( index ) == "NiTriStrips" ); + || nif->itemName( index ) == "NiTriShape" || nif->itemName( index ) == "BSLODTriShape" + || nif->itemName( index ) == "NiTriStrips" ); } QModelIndex spApplyTransformation::cast( NifModel * nif, const QModelIndex & index ) @@ -126,7 +127,7 @@ QModelIndex spApplyTransformation::cast( NifModel * nif, const QModelIndex & ind else { QModelIndex iData; - if ( nif->itemName( index ) == "NiTriShape") + if ( nif->itemName( index ) == "NiTriShape" || nif->itemName( index ) == "BSLODTriShape") iData = nif->getBlock( nif->getLink( index, "Data" ), "NiTriShapeData" ); else if ( nif->itemName( index ) == "NiTriStrips" ) iData = nif->getBlock( nif->getLink( index, "Data" ), "NiTriStripsData" ); From 8f74a9ae2ecaa5f7b7ed03ead1fe622624ea0b20 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Thu, 14 Nov 2013 06:35:14 -0500 Subject: [PATCH 004/836] Edit UV support for BSEffectShaderProperty Edit UV did not work for BSEffectShaderProperty blocks which had a texture ("Source Texture") --- widgets/uvedit.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/widgets/uvedit.cpp b/widgets/uvedit.cpp index 6a486f13f..e25976258 100644 --- a/widgets/uvedit.cpp +++ b/widgets/uvedit.cpp @@ -922,6 +922,21 @@ bool UVWidget::setNifData( NifModel * nifModel, const QModelIndex & nifIndex ) } } } + else + { + iTexProp = nif->getBlock( l, "BSEffectShaderProperty"); + if ( iTexProp.isValid() ) + { + QString texture = nif->get(iTexProp, "Source Texture"); + if ( texture != "" ) + { + texfile = TexCache::find( texture, nif->getFolder() ); + return true; + } + + + } + } } } } From 6d5d37fa37f33938ad39d669ebdfec1083f0dd79 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sat, 16 Nov 2013 09:56:15 -0500 Subject: [PATCH 005/836] Havok CVS Spell fixes Scale generated CVS for Skyrim --- spells/havok.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/spells/havok.cpp b/spells/havok.cpp index 177c5055f..48f964220 100644 --- a/spells/havok.cpp +++ b/spells/havok.cpp @@ -45,6 +45,15 @@ class spCreateCVS : public Spell QModelIndex iData = nif->getBlock( nif->getLink( index, "Data" ) ); if( !iData.isValid() ) return index; + + float havokScale = 1.0f; + + if ( nif->getUserVersion() >= 12 ) + { + havokScale = 10.0f; + } + + havokScale *= havokConst; /* those will be filled with the CVS data */ QVector convex_verts, convex_norms; @@ -96,7 +105,7 @@ class spCreateCVS : public Spell QList sortedVerts; foreach( Vector4 vert, hullVerts ) { - vert /= havokConst; + vert /= havokScale; if( ! sortedVerts.contains( vert ) ) { sortedVerts.append( vert ); @@ -114,7 +123,7 @@ class spCreateCVS : public Spell QList sortedNorms; foreach( Vector4 norm, hullNorms ) { - norm = Vector4( Vector3( norm ), norm[3] / havokConst ); + norm = Vector4( Vector3( norm ), norm[3] / havokScale ); if( ! sortedNorms.contains( norm ) ) { sortedNorms.append( norm ); @@ -142,7 +151,8 @@ class spCreateCVS : public Spell nif->setArray( iCVS, "Normals", convex_norms ); // radius is always 0.1? - nif->set( iCVS, "Radius", 0.1 ); + // TODO: Figure out if radius is not arbitrarily set in vanilla NIFs + nif->set( iCVS, "Radius", 0.1f ); // for arrow detection: [0, 0, -0, 0, 0, -0] nif->set( nif->getIndex( iCVS, "Unknown 6 Floats" ).child( 2, 0 ), -0.0 ); From cec3ccc655659ca3b852b51a43dd8a5227734b33 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 17 Nov 2013 08:55:47 -0500 Subject: [PATCH 006/836] Havok Scale Fixes --- gl/glnode.cpp | 50 +++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/gl/glnode.cpp b/gl/glnode.cpp index 4739b2095..b1279211a 100644 --- a/gl/glnode.cpp +++ b/gl/glnode.cpp @@ -924,6 +924,9 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetUserVersion() >= 12 ) ? 10.0f : 1.0f; //qWarning() << "draw shape" << nif->getBlockNumber( iShape ) << nif->itemName( iShape ); @@ -959,7 +962,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlock( nif->getLink( iShape, "Shape" ) ), stack, scene, origin_color3fv ); @@ -972,7 +975,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawSphere( Vector3(), nif->get( iShape, "Radius" ) * 10.0f ); + drawSphere( Vector3(), nif->get( iShape, "Radius" ) * havokScale ); } else if ( name == "bhkMultiSphereShape" ) { @@ -995,7 +998,8 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackget( iShape, "Dimensions" ); - drawBox( v * 10.0f, - v * 10.0f ); + v *= havokScale; + drawBox( v, -v ); } else if ( name == "bhkCapsuleShape" ) { @@ -1004,7 +1008,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawCapsule( nif->get( iShape, "First Point" ) * 10.0f, nif->get( iShape, "Second Point" ) * 10.0f, nif->get( iShape, "Radius" ) * 10.0f ); + drawCapsule( nif->get( iShape, "First Point" ) * havokScale, nif->get( iShape, "Second Point" ) * havokScale, nif->get( iShape, "Radius" ) * havokScale ); } else if ( name == "bhkNiTriStripsShape" ) { @@ -1066,7 +1070,7 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - drawConvexHull( nif->getArray( iShape, "Vertices" ), nif->getArray( iShape, "Normals" ), 10.0 ); + drawConvexHull( nif->getArray( iShape, "Vertices" ), nif->getArray( iShape, "Normals" ), havokScale ); } else if ( name == "bhkMoppBvTreeShape" ) { @@ -1203,20 +1207,15 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetBlockNumber( iShape ) ); if (Node::SELECTING) { int s_nodeId = ID2COLORKEY( nif->getBlockNumber( iShape ) ); glColor4ubv( (GLubyte *)&s_nodeId ); } - //qDebug() << nif->getBlock( nif->getParent( nif->getBlockNumber( iShape ) ) ); - QModelIndex iParent = nif->getBlock( nif->getParent( nif->getBlockNumber( iShape ) ) ); Vector4 origin = Vector4( nif->get( iParent, "Origin" ), 0); - //qDebug() << origin; - QModelIndex iData = nif->getBlock( nif->getLink( iShape, "Data" ) ); if ( iData.isValid() ) { @@ -1236,9 +1235,9 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackrowCount( iChunks ); r++ ) { Vector4 translation = nif->get( iChunks.child(r, 0), "Translation" ); - //Vector3 t = Vector3( translation[0], translation[1], translation[2] ); quint32 numVerts = nif->get( iChunks.child(r, 0), "Num Vertices" ); QVector verts = nif->getArray( iChunks.child(r, 0), "Vertices" ); quint32 numIndices = nif->get( iChunks.child(r, 0), "Num Indices" ); @@ -1263,28 +1261,22 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStack Date: Sun, 17 Nov 2013 09:17:57 -0500 Subject: [PATCH 007/836] bhkCMSD name cleanup Made some names more clear --- gl/glnode.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gl/glnode.cpp b/gl/glnode.cpp index b1279211a..d00460516 100644 --- a/gl/glnode.cpp +++ b/gl/glnode.cpp @@ -1248,15 +1248,15 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStackgetIndex( iData, "Chunks" ); for ( int r = 0; r < nif->rowCount( iChunks ); r++ ) { - Vector4 translation = nif->get( iChunks.child(r, 0), "Translation" ); - quint32 numVerts = nif->get( iChunks.child(r, 0), "Num Vertices" ); - QVector verts = nif->getArray( iChunks.child(r, 0), "Vertices" ); + Vector4 chunkOrigin = nif->get( iChunks.child(r, 0), "Translation" ); + quint32 numOffsets = nif->get( iChunks.child(r, 0), "Num Vertices" ); quint32 numIndices = nif->get( iChunks.child(r, 0), "Num Indices" ); - QVector indices = nif->getArray( iChunks.child(r, 0), "Indices" ); quint32 numStrips = nif->get( iChunks.child(r, 0), "Num Strips" ); + QVector offsets = nif->getArray( iChunks.child(r, 0), "Vertices" ); + QVector indices = nif->getArray( iChunks.child(r, 0), "Indices" ); QVector strips = nif->getArray( iChunks.child(r, 0), "Strips" ); - QVector vertices(numVerts/3); + QVector vertices( numOffsets / 3 ); int numStripVerts = 0; int offset = 0; @@ -1266,9 +1266,9 @@ void drawHvkShape( const NifModel * nif, const QModelIndex & iShape, QStack Date: Sun, 17 Nov 2013 09:34:38 -0500 Subject: [PATCH 008/836] Missed a hardcoded Havok scale --- gl/glnode.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gl/glnode.cpp b/gl/glnode.cpp index d00460516..8be58ab9c 100644 --- a/gl/glnode.cpp +++ b/gl/glnode.cpp @@ -758,6 +758,10 @@ void Node::transform() const NifModel * nif = static_cast( iBlock.model() ); if ( iBlock.isValid() && nif ) { + + // Scale up for Skyrim + float havokScale = ( nif->getUserVersion() >= 12 ) ? 10.0f : 1.0f; + QModelIndex iObject = nif->getBlock( nif->getLink( iBlock, "Collision Data" ) ); if ( ! iObject.isValid() ) iObject = nif->getBlock( nif->getLink( iBlock, "Collision Object" ) ); @@ -767,11 +771,11 @@ void Node::transform() if ( iBody.isValid() ) { Transform t; - t.scale = 7; + t.scale = 7.0f; if ( nif->isNiBlock( iBody, "bhkRigidBodyT" ) ) { t.rotation.fromQuat( nif->get( iBody, "Rotation" ) ); - t.translation = Vector3( nif->get( iBody, "Translation" ) * 70.0f ); + t.translation = Vector3( nif->get( iBody, "Translation" ) * 7.0f * havokScale ); } scene->bhkBodyTrans.insert( nif->getBlockNumber( iBody ), worldTrans() * t ); } From 6bd664ce1e69b40ed88c98603bcf014a040dd2e9 Mon Sep 17 00:00:00 2001 From: NicocoiN Date: Mon, 16 Dec 2013 17:49:40 +0100 Subject: [PATCH 009/836] Update NifSkope_fr.ts Improved french translation --- lang/NifSkope_fr.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/NifSkope_fr.ts b/lang/NifSkope_fr.ts index 6c7af40a0..92b138112 100644 --- a/lang/NifSkope_fr.ts +++ b/lang/NifSkope_fr.ts @@ -230,12 +230,12 @@ Unsupported 'Startup Version' %1 specified, reverting to 20.0.0.5 - + device position incorrect after block number %1 (%2) at %3 ended at %4 expected %5 - + @@ -313,7 +313,7 @@ NifSkope Help && Bug Report &Forum - &Forum d'aide && de rapport de bug de NifSkope + Aide de Nifskope && report de bug @@ -540,7 +540,7 @@ this is not a normal .kf file; there should be only NiControllerSequences as root blocks - Il ne s'agit pas d'un fichier .KF normal; seul un bloc racine peut être un NiControllerSequence + Ceci n'est pas un fichier .KF normal; seul NiControllerSequence peut être un bloc racine @@ -615,7 +615,7 @@ Pack Strips - + @@ -1006,7 +1006,7 @@ Calculate Spring Length - Calculer le ressort + Calculer la longueur du ressort From a155ef3e62fa6d82e385bd14a1851783921d6c6b Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 12:32:57 -0500 Subject: [PATCH 010/836] [Pre-Port] Change toAscii > toLatin1 Forward compatible changes. --- gl/renderer.cpp | 4 ++-- importex/col.cpp | 2 +- nifmodel.cpp | 12 ++++++------ nifskope.cpp | 2 +- nifvalue.cpp | 22 +++++++++++----------- spells/animation.cpp | 2 +- spells/mesh.cpp | 4 ++-- spells/misc.cpp | 2 +- spells/optimize.cpp | 2 +- spells/stringpalette.cpp | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gl/renderer.cpp b/gl/renderer.cpp index 28915fbea..83a03e087 100644 --- a/gl/renderer.cpp +++ b/gl/renderer.cpp @@ -234,7 +234,7 @@ bool Renderer::Shader::load( const QString & filepath ) catch ( QString err ) { status = false; - qWarning() << "error loading shader" << name << ":\r\n" << err.toAscii().data(); + qWarning() << "error loading shader" << name << ":\r\n" << err.toLatin1().data(); return false; } status = true; @@ -359,7 +359,7 @@ bool Renderer::Program::load( const QString & filepath, Renderer * renderer ) catch ( QString x ) { status = false; - qWarning() << "error loading shader program " << name << ":\r\n" << x.toAscii().data(); + qWarning() << "error loading shader program " << name << ":\r\n" << x.toLatin1().data(); return false; } status = true; diff --git a/importex/col.cpp b/importex/col.cpp index dd1f717b8..1ef93bfb6 100644 --- a/importex/col.cpp +++ b/importex/col.cpp @@ -963,7 +963,7 @@ void exportCol( const NifModel * nif,QFileInfo fileInfo ) { QDomElement ivl = doc.createElement("instance_visual_scene"); ivl.setAttribute("url","#NifRootScene"); scene.appendChild(ivl); - fobj.write(doc.toString().toAscii()); + fobj.write(doc.toString().toLatin1()); settings.setValue( "Path", QString("%1/").arg(QFileInfo(fobj.fileName()).path()) ); QTextStream sobj( &fobj ); // let's save xml fobj.close(); diff --git a/nifmodel.cpp b/nifmodel.cpp index f51da3745..46a815e3a 100644 --- a/nifmodel.cpp +++ b/nifmodel.cpp @@ -178,7 +178,7 @@ void NifModel::clear() insertType( root, NifData( "NiFooter", "Footer" ) ); version = version2number( Options::startupVersion() ); if( !isVersionSupported(version) ) { - msg( Message() << tr("Unsupported 'Startup Version' %1 specified, reverting to 20.0.0.5").arg( Options::startupVersion() ).toAscii() ); + msg( Message() << tr("Unsupported 'Startup Version' %1 specified, reverting to 20.0.0.5").arg( Options::startupVersion() ).toLatin1() ); version = 0x14000005; } reset(); @@ -1697,7 +1697,7 @@ bool NifModel::load( QIODevice & device ) { // unable to seek to location... abort if (device.seek(curpos + size)) - msg( Message() << tr("device position incorrect after block number %1 (%2) at 0x%3 ended at 0x%4 (expected 0x%5)").arg( c ).arg( blktyp ).arg(QString::number(curpos, 16)).arg(QString::number(pos, 16)).arg(QString::number(curpos+size, 16)).toAscii() ); + msg( Message() << tr("device position incorrect after block number %1 (%2) at 0x%3 ended at 0x%4 (expected 0x%5)").arg( c ).arg( blktyp ).arg(QString::number(curpos, 16)).arg(QString::number(pos, 16)).arg(QString::number(curpos+size, 16)).toLatin1() ); else throw tr("failed to reposition device at block number %1 (%2) previous block was %3").arg( c ).arg( blktyp ).arg( root->child( c )->name() ); @@ -1777,7 +1777,7 @@ bool NifModel::load( QIODevice & device ) } catch ( QString err ) { - msg( Message() << err.toAscii().constData() ); + msg( Message() << err.toLatin1().constData() ); reset(); return false; } @@ -1825,14 +1825,14 @@ bool NifModel::save( QIODevice & device ) const QString string = "Top Level Object"; int len = string.length(); device.write( (char *) &len, 4 ); - device.write( (const char *) string.toAscii(), len ); + device.write( (const char *) string.toLatin1(), len ); } } QString string = itemName( index( c, 0 ) ); int len = string.length(); device.write( (char *) &len, 4 ); - device.write( (const char *) string.toAscii(), len ); + device.write( (const char *) string.toLatin1(), len ); if ( version < 0x0303000d ) { @@ -1852,7 +1852,7 @@ bool NifModel::save( QIODevice & device ) const QString string = "End Of File"; int len = string.length(); device.write( (char *) &len, 4 ); - device.write( (const char *) string.toAscii(), len ); + device.write( (const char *) string.toLatin1(), len ); } return true; diff --git a/nifskope.cpp b/nifskope.cpp index e597b2d7d..31a71db2c 100644 --- a/nifskope.cpp +++ b/nifskope.cpp @@ -986,7 +986,7 @@ void NifSkope::dispatchMessage( const Message & msg ) qCritical() << msg; break; case QtFatalMsg: - qFatal( QString( msg ).toAscii().data() ); + qFatal( QString( msg ).toLatin1().data() ); break; case QtWarningMsg: qWarning() << msg; diff --git a/nifvalue.cpp b/nifvalue.cpp index 01f31825f..72289f4bd 100644 --- a/nifvalue.cpp +++ b/nifvalue.cpp @@ -1156,7 +1156,7 @@ bool NifOStream::write( const NifValue & val ) return device->write( (char *) static_cast( val.val.data )->rgba, 16 ) == 16; case NifValue::tSizedString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); //string.replace( "\\r", "\r" ); //string.replace( "\\n", "\n" ); int len = string.size(); @@ -1166,7 +1166,7 @@ bool NifOStream::write( const NifValue & val ) } case NifValue::tShortString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); string.replace( "\\r", "\r" ); string.replace( "\\n", "\n" ); if ( string.size() > 254 ) string.resize( 254 ); @@ -1177,7 +1177,7 @@ bool NifOStream::write( const NifValue & val ) } case NifValue::tText: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); int len = string.size(); if ( device->write( (char *) &len, 4 ) != 4 ) return false; @@ -1186,14 +1186,14 @@ bool NifOStream::write( const NifValue & val ) case NifValue::tHeaderString: case NifValue::tLineString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); if ( device->write( (const char *) string, string.length() ) != string.length() ) return false; return ( device->write( "\n", 1 ) == 1 ); } case NifValue::tChar8String: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); quint32 n = std::min(8, string.length()); if ( device->write( (const char *) string, n ) != n ) return false; @@ -1248,7 +1248,7 @@ bool NifOStream::write( const NifValue & val ) QByteArray string; if( val.val.data != 0 ) { - string = static_cast( val.val.data )->toAscii(); + string = static_cast( val.val.data )->toLatin1(); } //string.replace( "\\r", "\r" ); //string.replace( "\\n", "\n" ); @@ -1323,14 +1323,14 @@ int NifSStream::size( const NifValue & val ) return 16; case NifValue::tSizedString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); //string.replace( "\\r", "\r" ); //string.replace( "\\n", "\n" ); return 4 + string.size(); } case NifValue::tShortString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); //string.replace( "\\r", "\r" ); //string.replace( "\\n", "\n" ); if ( string.size() > 254 ) string.resize( 254 ); @@ -1338,13 +1338,13 @@ int NifSStream::size( const NifValue & val ) } case NifValue::tText: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); return 4 + string.size(); } case NifValue::tHeaderString: case NifValue::tLineString: { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); return string.length() + 1; } case NifValue::tChar8String: @@ -1375,7 +1375,7 @@ int NifSStream::size( const NifValue & val ) } else { - QByteArray string = static_cast( val.val.data )->toAscii(); + QByteArray string = static_cast( val.val.data )->toLatin1(); //string.replace( "\\r", "\r" ); //string.replace( "\\n", "\n" ); return 4 + string.size(); diff --git a/spells/animation.cpp b/spells/animation.cpp index 17f086e79..9fc6e102f 100644 --- a/spells/animation.cpp +++ b/spells/animation.cpp @@ -170,7 +170,7 @@ class spAttachKf : public Spell } catch ( QString e ) { - qWarning( e.toAscii() ); + qWarning( e.toLatin1() ); } } return index; diff --git a/spells/mesh.cpp b/spells/mesh.cpp index 9f7744c01..fa653a3ca 100644 --- a/spells/mesh.cpp +++ b/spells/mesh.cpp @@ -214,7 +214,7 @@ static void removeWasteVertices( NifModel * nif, const QModelIndex & iData, cons } catch ( QString e ) { - qWarning() << e.toAscii().data(); + qWarning() << e.toLatin1().data(); } } @@ -538,7 +538,7 @@ class spRemoveDuplicateVertices : public Spell } catch ( QString e ) { - qWarning() << e.toAscii().data(); + qWarning() << e.toLatin1().data(); } return index; diff --git a/spells/misc.cpp b/spells/misc.cpp index 437627cea..8818003bc 100644 --- a/spells/misc.cpp +++ b/spells/misc.cpp @@ -141,7 +141,7 @@ class spFileOffset : public Spell QModelIndex cast( NifModel * nif, const QModelIndex & index ) { int ofs = nif->fileOffset( index ); - qWarning( QString( "estimated file offset is %1 (0x%2)" ).arg( ofs ).arg( ofs, 0, 16 ).toAscii() ); + qWarning( QString( "estimated file offset is %1 (0x%2)" ).arg( ofs ).arg( ofs, 0, 16 ).toLatin1() ); return index; } }; diff --git a/spells/optimize.cpp b/spells/optimize.cpp index effd7fbd0..bda3593bf 100644 --- a/spells/optimize.cpp +++ b/spells/optimize.cpp @@ -66,7 +66,7 @@ class spCombiProps : public Spell { QBuffer data; data.open( QBuffer::WriteOnly ); - data.write( nif->itemName( iBlock ).toAscii() ); + data.write( nif->itemName( iBlock ).toLatin1() ); nif->save( data, iBlock ); props.insert( b, data.buffer() ); } diff --git a/spells/stringpalette.cpp b/spells/stringpalette.cpp index a75b69c07..76c81618b 100644 --- a/spells/stringpalette.cpp +++ b/spells/stringpalette.cpp @@ -189,7 +189,7 @@ class spEditStringOffset : public Spell QByteArray bytes = nif->get( iPalette, "Palette" ); int ofs = bytes.count(); - bytes += string.toAscii(); + bytes += string.toLatin1(); bytes.append( '\0' ); nif->set( iPalette, "Palette", bytes ); return ofs; From d1e42a9e79b1835bb56be86aa905bc13a7e1ac70 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 12:38:04 -0500 Subject: [PATCH 011/836] [Pre-Port] QPixmap for QIcon constructor Forward compatible changes. --- spells/headerstring.cpp | 2 +- spells/light.cpp | 2 +- spells/material.cpp | 2 +- spells/stringpalette.cpp | 2 +- spells/texture.cpp | 2 +- spells/transform.cpp | 2 +- widgets/colorwheel.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spells/headerstring.cpp b/spells/headerstring.cpp index cba8eb80e..2f8b76cbb 100644 --- a/spells/headerstring.cpp +++ b/spells/headerstring.cpp @@ -70,7 +70,7 @@ class spEditStringIndex : public Spell QIcon icon() const { if ( ! txt_xpm_icon ) - txt_xpm_icon = new QIcon( txt_xpm ); + txt_xpm_icon = new QIcon( QPixmap(txt_xpm) ); return *txt_xpm_icon; } bool instant() const { return true; } diff --git a/spells/light.cpp b/spells/light.cpp index 0bab41af8..aafe997a0 100644 --- a/spells/light.cpp +++ b/spells/light.cpp @@ -58,7 +58,7 @@ class spLightEdit : public Spell bool instant() const { return true; } QIcon icon() const { - if ( ! light42_xpm_icon ) light42_xpm_icon = new QIcon( light42_xpm ); + if ( ! light42_xpm_icon ) light42_xpm_icon = new QIcon( QPixmap(light42_xpm) ); return *light42_xpm_icon; } diff --git a/spells/material.cpp b/spells/material.cpp index 06d19be34..09088e25e 100644 --- a/spells/material.cpp +++ b/spells/material.cpp @@ -98,7 +98,7 @@ class spMaterialEdit : public Spell bool instant() const { return true; } QIcon icon() const { - if ( ! mat42_xpm_icon ) mat42_xpm_icon = new QIcon( mat42_xpm ); + if ( ! mat42_xpm_icon ) mat42_xpm_icon = new QIcon( QPixmap(mat42_xpm) ); return *mat42_xpm_icon; } diff --git a/spells/stringpalette.cpp b/spells/stringpalette.cpp index 76c81618b..a5b2e5f0c 100644 --- a/spells/stringpalette.cpp +++ b/spells/stringpalette.cpp @@ -75,7 +75,7 @@ class spEditStringOffset : public Spell QIcon icon() const { if ( ! txt_xpm_icon ) - txt_xpm_icon = new QIcon( txt_xpm ); + txt_xpm_icon = new QIcon( QPixmap(txt_xpm) ); return *txt_xpm_icon; } bool instant() const { return true; } diff --git a/spells/texture.cpp b/spells/texture.cpp index 909301d00..70cd8529b 100644 --- a/spells/texture.cpp +++ b/spells/texture.cpp @@ -154,7 +154,7 @@ class spChooseTexture : public Spell bool instant() const { return true; } QIcon icon() const { - if ( ! tex42_xpm_icon ) tex42_xpm_icon = new QIcon( tex42_xpm ); + if ( ! tex42_xpm_icon ) tex42_xpm_icon = new QIcon( QPixmap(tex42_xpm) ); return *tex42_xpm_icon; } diff --git a/spells/transform.cpp b/spells/transform.cpp index 42806490e..e11477235 100644 --- a/spells/transform.cpp +++ b/spells/transform.cpp @@ -274,7 +274,7 @@ class spEditTransformation : public Spell QIcon icon() const { if ( ! transform_xpm_icon ) - transform_xpm_icon = new QIcon( transform_xpm ); + transform_xpm_icon = new QIcon( QPixmap(transform_xpm) ); return *transform_xpm_icon; } diff --git a/widgets/colorwheel.cpp b/widgets/colorwheel.cpp index acd8e4ed3..5b652e7cd 100644 --- a/widgets/colorwheel.cpp +++ b/widgets/colorwheel.cpp @@ -115,7 +115,7 @@ ColorWheel::ColorWheel( const QColor & c, QWidget * parent ) : QWidget( parent ) QIcon ColorWheel::getIcon() { if ( ! icon ) - icon = new QIcon( hsv42_xpm ); + icon = new QIcon( QPixmap(hsv42_xpm) ); return *icon; } From 59aae6d10df8cd3fe3a03a01ceaa296e39202a1c Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 12:40:36 -0500 Subject: [PATCH 012/836] [Pre-Port] SetShown > SetVisible Forward compatible changes --- widgets/valueedit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/widgets/valueedit.cpp b/widgets/valueedit.cpp index 8c8069db7..5e08bd413 100644 --- a/widgets/valueedit.cpp +++ b/widgets/valueedit.cpp @@ -454,7 +454,7 @@ void ColorEdit::setColor4( const Color4 & v ) r->setValue( v[0] ); g->setValue( v[1] ); b->setValue( v[2] ); - a->setValue( v[3] ); a->setShown( true ); al->setShown( true ); + a->setValue( v[3] ); a->setVisible( true ); al->setVisible( true ); setting = false; } @@ -528,8 +528,8 @@ void VectorEdit::setVector4( const Vector4 & v ) setting = true; x->setValue( v[0] ); y->setValue( v[1] ); - z->setValue( v[2] ); z->setShown( true ); zl->setShown( true ); - w->setValue( v[3] ); w->setShown( true ); wl->setShown( true ); + z->setValue( v[2] ); z->setVisible( true ); zl->setVisible( true ); + w->setValue( v[3] ); w->setVisible( true ); wl->setVisible( true ); setting = false; } @@ -538,7 +538,7 @@ void VectorEdit::setVector3( const Vector3 & v ) setting = true; x->setValue( v[0] ); y->setValue( v[1] ); - z->setValue( v[2] ); z->setShown( true ); zl->setShown( true ); + z->setValue( v[2] ); z->setVisible( true ); zl->setVisible( true ); w->setValue( 0.0 ); w->setHidden( true ); wl->setHidden( true ); setting = false; } From e9beaf43960fa72810ce68529d5036558e51b3c8 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 12:42:50 -0500 Subject: [PATCH 013/836] [Pre-port] Replace Qt allocation with stdlib Forward compatible changes. --- niftypes.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/niftypes.h b/niftypes.h index 2566da0d8..f3e34eb91 100644 --- a/niftypes.h +++ b/niftypes.h @@ -38,6 +38,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include #ifndef PI #ifdef M_PI @@ -1361,7 +1362,7 @@ class FixedMatrix FixedMatrix(int length1, int length2) { int length = length1*length2; - v_ = (T*)qMalloc(sizeof(T)*length); + v_ = (T*)malloc(sizeof(T)*length); len0 = length1; len1 = length2; } @@ -1372,13 +1373,13 @@ class FixedMatrix int datalen = other.count(); len0 = other.count(0); len1 = other.count(1); - v_ = (T*)qMalloc(sizeof(T) * datalen); - qMemCopy( array(), other.array(), datalen ); + v_ = (T*)malloc(sizeof(T) * datalen); + memcpy( array(), other.array(), datalen ); } //! Default Destructor ~FixedMatrix() - { qFree(v_); } + { free(v_); } //! Copy Assignment FixedMatrix& operator=(const FixedMatrix& other) From ad2ef70079217824e3130018676573866a442610 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 12:58:56 -0500 Subject: [PATCH 014/836] [Pre-port] Replace QAbstractItemModel::reset() Forward compatible changes. reset() was deprecated in lieu of beginResetModel() / endResetModel() --- kfmmodel.cpp | 10 ++++++++-- nifmodel.cpp | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/kfmmodel.cpp b/kfmmodel.cpp index 79531cd2e..ca929899a 100644 --- a/kfmmodel.cpp +++ b/kfmmodel.cpp @@ -85,14 +85,16 @@ bool KfmModel::evalVersion( NifItem * item, bool chkParents ) const void KfmModel::clear() { + beginResetModel(); folder = QString(); root->killChildren(); insertType( root, NifData( "Kfm", "Kfm" ) ); kfmroot = root->child( 0 ); version = 0x0200000b; - reset(); if ( kfmroot ) set( kfmroot, "Header String", ";Gamebryo KFM File Version 2.0.0.0b" ); + + endResetModel(); } /* @@ -245,7 +247,11 @@ bool KfmModel::load( QIODevice & device ) return false; } - reset(); + // Qt5 port: + // begin/endResetModel() is already called above in clear() + // May not be necessary again, but doing so to mimic Qt4 codebase. + beginResetModel(); + endResetModel(); return true; } diff --git a/nifmodel.cpp b/nifmodel.cpp index 46a815e3a..1e3c2dfeb 100644 --- a/nifmodel.cpp +++ b/nifmodel.cpp @@ -172,6 +172,7 @@ bool NifModel::evalVersion( NifItem * item, bool chkParents ) const void NifModel::clear() { + beginResetModel(); folder = QString(); root->killChildren(); insertType( root, NifData( "NiHeader", "Header" ) ); @@ -181,7 +182,6 @@ void NifModel::clear() msg( Message() << tr("Unsupported 'Startup Version' %1 specified, reverting to 20.0.0.5").arg( Options::startupVersion() ).toLatin1() ); version = 0x14000005; } - reset(); NifItem * item = getItem( getHeaderItem(), "Version" ); if ( item ) item->value().setFileVersion( version ); @@ -213,6 +213,7 @@ void NifModel::clear() } lockUpdates = false; needUpdates = utNone; + endResetModel(); } /* @@ -1465,8 +1466,9 @@ bool NifModel::setData( const QModelIndex & index, const QVariant & value, int r void NifModel::reset() { + beginResetModel(); updateLinks(); - BaseModel::reset(); + endResetModel(); } bool NifModel::removeRows( int row, int count, const QModelIndex & parent ) From 21571e8541ac9760ff24b4aa8db5eba3e72caff5 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 13:14:02 -0500 Subject: [PATCH 015/836] [Pre-Port] Message handling changes for Qt5 Forward compatible changes. Uses compile time branching to target Qt5 only. --- nifskope.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nifskope.cpp b/nifskope.cpp index 31a71db2c..ef3a74333 100644 --- a/nifskope.cpp +++ b/nifskope.cpp @@ -86,6 +86,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # include "windows.h" #endif +#if QT_VERSION >= 0x050000 +# define QT_WA(unicode, ansi) unicode +#endif #ifdef FSENGINE @@ -1045,8 +1048,14 @@ void qDefaultMsgHandler(QtMsgType t, const char* str) #endif //! Application-wide debug and warning message handler +#if QT_VERSION >= 0x050000 +void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str) +{ + QByteArray msg = str.toLocal8Bit(); +#else void myMessageOutput(QtMsgType type, const char *msg) { +#endif static const QString editFailed ( "edit: editing failed" ); static const QString accessWidgetRect ( "QAccessibleWidget::rect" ); switch (type) @@ -1245,7 +1254,11 @@ int main( int argc, char * argv[] ) // install message handler qRegisterMetaType( "Message" ); #ifndef NO_MESSAGEHANDLER +#if QT_VERSION >= 0x050000 + qInstallMessageHandler( myMessageOutput ); +#else qInstallMsgHandler( myMessageOutput ); +#endif #endif // if there is a style sheet present then load it From 90b5daba98c50f5c41c0cf88b32b0e5cb1aa1fd7 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 13:33:49 -0500 Subject: [PATCH 016/836] [Pre-Port] Changes to file opening Forward compatible changes. First, the dragging or double clicking of a file gets broken when porting to Qt5 because of changes to QUrl. Second, there is code for handling 8.3 filenames, but as far as I can tell it's unnecessary. --- nifskope.cpp | 40 +++------------------------------------- nifskope.h | 2 +- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/nifskope.cpp b/nifskope.cpp index ef3a74333..05e9ee231 100644 --- a/nifskope.cpp +++ b/nifskope.cpp @@ -1160,9 +1160,9 @@ void IPCsocket::execCommand( const QString & cmd ) } } -void IPCsocket::openNif( const QUrl & url ) +void IPCsocket::openNif( const QString & url ) { - NifSkope::createWindow( url.toString( url.scheme() == "nif" ? QUrl::RemoveScheme : QUrl::None ) ); + NifSkope::createWindow( url ); } @@ -1319,41 +1319,7 @@ int main( int argc, char * argv[] ) if ( !fname.isEmpty() ) { //Getting a NIF file name from the OS - fname = QDir::current().filePath( app.argv()[ app.argc() - 1 ] ); - -#ifdef Q_OS_WIN32 - //Windows passes an ugly 8.3 file path as an argument, so use a WinAPI function to fix that - wchar_t full[MAX_PATH]; - wchar_t * temp_name = new wchar_t[fname.size() + 1]; - - fname.toWCharArray( temp_name ); - temp_name[fname.size()] = 0; //The above function doesn't seem to write a null character, so add it. - - //Ensure that input is a full path, even if a partial one was given on the command line - DWORD ret = GetFullPathNameW( temp_name, MAX_PATH, full, NULL ); - - if ( ret != 0 ) - { - delete [] temp_name; - temp_name = new wchar_t[MAX_PATH]; - - //Finally get the full long file name version of the path - ret = GetLongPathNameW( full, temp_name, MAX_PATH ); - - //Copy the name back to the QString variable that Qt uses - if ( ret != 0 ) - { - //GetLongPath succeeded - fname = QString::fromWCharArray( temp_name); - } else - { - //GetLongPath failed, use result from GetFullPathName function - fname = QString::fromWCharArray( full ); - } - } - - delete [] temp_name; -#endif + fname = QDir::current().filePath( argv[ argc - 1 ] ); } if ( !reuseSession ) { diff --git a/nifskope.h b/nifskope.h index 2bf73162d..b6c4e35db 100644 --- a/nifskope.h +++ b/nifskope.h @@ -279,7 +279,7 @@ public slots: void execCommand( const QString & cmd ); //! Opens a NIF from a URL - void openNif( const QUrl & ); + void openNif(const QString & ); protected slots: void processDatagram(); From 395d647a5be2e391467bc139f82f368fa732b8da Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 14:16:16 -0500 Subject: [PATCH 017/836] [Pre-Port] QDirModel > QFileSystemModel, filters Forward compatible changes. QDirModel is deprecated, so replace it. Change filters so that they will work when moving to Qt5. --- glview.cpp | 2 +- importex/3ds.cpp | 2 +- importex/col.cpp | 2 +- importex/obj.cpp | 4 ++-- nifskope.cpp | 7 ++++++- spells/animation.cpp | 2 +- spells/texture.cpp | 8 ++++---- widgets/fileselect.cpp | 20 +++++++++++++------- widgets/fileselect.h | 4 ++-- widgets/xmlcheck.cpp | 6 +++--- 10 files changed, 34 insertions(+), 23 deletions(-) diff --git a/glview.cpp b/glview.cpp index 92194714e..03cb416e8 100644 --- a/glview.cpp +++ b/glview.cpp @@ -1442,7 +1442,7 @@ void GLView::savePixmap() dlg.setLayout( lay ); FileSelector * file = new FileSelector( FileSelector::SaveFile, tr("File"), QBoxLayout::RightToLeft ); - file->setFilter( QStringList() << "*.bmp *.jpg *.png" << "*.bmp" << "*.jpg" << "*.png" ); + file->setFilter( QStringList() << "Images (*.bmp *.jpg *.png)" << "BMP (*.bmp)" << "JPEG (*.jpg)" << "PNG (*.png)" ); file->setFile( model->getFolder() + "/" ); lay->addWidget( file, 0, 0, 1, -1 ); diff --git a/importex/3ds.cpp b/importex/3ds.cpp index aeb57f1a8..4291b23aa 100644 --- a/importex/3ds.cpp +++ b/importex/3ds.cpp @@ -243,7 +243,7 @@ void import3ds( NifModel * nif, const QModelIndex & index ) settings.beginGroup( "import-export" ); settings.beginGroup( "3ds" ); - QString fname = QFileDialog::getOpenFileName( 0, tr("Choose a .3ds file to import"), settings.value( tr("File Name") ).toString(), "*.3ds" ); + QString fname = QFileDialog::getOpenFileName( 0, tr("Choose a .3ds file to import"), settings.value( tr("File Name") ).toString(), "3DS (*.3ds)" ); if ( fname.isEmpty() ) { return; } diff --git a/importex/col.cpp b/importex/col.cpp index 1ef93bfb6..5f2386cb5 100644 --- a/importex/col.cpp +++ b/importex/col.cpp @@ -899,7 +899,7 @@ void exportCol( const NifModel * nif,QFileInfo fileInfo ) { settings.beginGroup( "import-export" ); settings.beginGroup( "col" ); - QString fname = QFileDialog::getSaveFileName( 0, tr("Choose a .DAE file for export"), QString("%1%2.dae").arg(settings.value("Path").toString()).arg(fileInfo.baseName()) , "*.dae" ); + QString fname = QFileDialog::getSaveFileName( 0, tr("Choose a .DAE file for export"), QString("%1%2.dae").arg(settings.value("Path").toString()).arg(fileInfo.baseName()) , "COLLADA (*.dae)" ); if ( fname.isEmpty() ) return; while ( fname.endsWith( ".dae", Qt::CaseInsensitive ) ) diff --git a/importex/obj.cpp b/importex/obj.cpp index 28ccf8771..a91be15f6 100644 --- a/importex/obj.cpp +++ b/importex/obj.cpp @@ -343,7 +343,7 @@ void exportObj( const NifModel * nif, const QModelIndex & index ) settings.beginGroup( "import-export" ); settings.beginGroup( "obj" ); - QString fname = QFileDialog::getSaveFileName( 0, tr("Choose a .OBJ file for export"), settings.value( "File Name" ).toString(), "*.obj" ); + QString fname = QFileDialog::getSaveFileName( 0, tr("Choose a .OBJ file for export"), settings.value( "File Name" ).toString(), "OBJ (*.obj)" ); if ( fname.isEmpty() ) return; @@ -586,7 +586,7 @@ void importObj( NifModel * nif, const QModelIndex & index ) settings.beginGroup( "import-export" ); settings.beginGroup( "obj" ); - QString fname = QFileDialog::getOpenFileName( 0, tr("Choose a .OBJ file to import"), settings.value( "File Name" ).toString(), "*.obj" ); + QString fname = QFileDialog::getOpenFileName( 0, tr("Choose a .OBJ file to import"), settings.value( "File Name" ).toString(), "OBJ (*.obj)" ); if ( fname.isEmpty() ) return; diff --git a/nifskope.cpp b/nifskope.cpp index 05e9ee231..618854b4a 100644 --- a/nifskope.cpp +++ b/nifskope.cpp @@ -375,7 +375,12 @@ NifSkope::NifSkope() tool->setObjectName( "toolbar" ); tool->setAllowedAreas( Qt::TopToolBarArea | Qt::BottomToolBarArea ); - QStringList fileExtensions( QStringList() << "*.nif" << "*.kf" << "*.kfa" << "*.kfm" << "*.nifcache" << "*.texcache" << "*.pcpatch" << "*.jmi" ); + QStringList fileExtensions; + fileExtensions << "All Files (*.nif *.kf *.kfa *.kfm *.nifcache *.texcache *.pcpatch *.jmi)" + << "NIF (*.nif)" << "Keyframe (*.kf)" + << "Keyframe Animation (*.kfa)" << "Keyframe Motion (*.kfm)" + << "NIFCache (*.nifcache)" << "TEXCache (*.texcache)" + << "PCPatch (*.pcpatch)" << "JMI (*.jmi)"; // create the load portion of the toolbar aLineLoad = tool->addWidget( lineLoad = new FileSelector( FileSelector::LoadFile, tr("&Load..."), QBoxLayout::RightToLeft, QKeySequence::Open ) ); diff --git a/spells/animation.cpp b/spells/animation.cpp index 9fc6e102f..1ab29df37 100644 --- a/spells/animation.cpp +++ b/spells/animation.cpp @@ -35,7 +35,7 @@ class spAttachKf : public Spell if (nif == NULL) return index; - QStringList kfnames = QFileDialog::getOpenFileNames( 0, Spell::tr("Choose .kf file(s)"), nif->getFolder(), "*.kf" ); + QStringList kfnames = QFileDialog::getOpenFileNames( 0, Spell::tr("Choose .kf file(s)"), nif->getFolder(), "Keyframe (*.kf)" ); foreach( QString kfname, kfnames ) { try diff --git a/spells/texture.cpp b/spells/texture.cpp index 70cd8529b..58441cab8 100644 --- a/spells/texture.cpp +++ b/spells/texture.cpp @@ -523,7 +523,7 @@ class spTextureTemplate : public Spell dlg.setLayout( lay ); FileSelector * file = new FileSelector( FileSelector::SaveFile, "File", QBoxLayout::RightToLeft ); - file->setFilter( QStringList() << "*.tga" ); + file->setFilter( QStringList() << "Targa (*.tga)" ); lay->addWidget( file, 0, 0, 1, 2 ); lay->addWidget( new QLabel( "Size" ), 1, 0 ); @@ -821,7 +821,7 @@ class spExportTexture : public Spell file.append( "/" + nif->get( index, "File Name" ) ); } QModelIndex iData = nif->getBlock( nif->getLink( index, "Pixel Data" ) ); - QString filename = QFileDialog::getSaveFileName( 0, Spell::tr("Export texture"), file, "*.dds *.tga" ); + QString filename = QFileDialog::getSaveFileName( 0, Spell::tr("Export texture"), file, "Textures (*.dds *.tga)" ); if ( ! filename.isEmpty() ) { if ( tex->exportFile( iData, filename ) ) @@ -839,7 +839,7 @@ class spExportTexture : public Spell TexCache * tex = new TexCache(); tex->setNifFolder( nif->getFolder() ); QString file = nif->getFolder(); - QString filename = QFileDialog::getSaveFileName( 0, Spell::tr("Export texture"), file, "*.dds *.tga" ); + QString filename = QFileDialog::getSaveFileName( 0, Spell::tr("Export texture"), file, "Textures (*.dds *.tga)" ); if ( ! filename.isEmpty() ) { tex->exportFile( index, filename ); @@ -982,7 +982,7 @@ void TexFlipDialog::textureAction( int i ) switch ( i ) { case 0: // add - flipnames = QFileDialog::getOpenFileNames( this, Spell::tr("Choose texture file(s)"), nif->getFolder(), "*.dds *.tga *.bmp" ); + flipnames = QFileDialog::getOpenFileNames( this, Spell::tr("Choose texture file(s)"), nif->getFolder(), "Textures (*.dds *.tga *.bmp)" ); listmodel->setStringList( listmodel->stringList() << flipnames ); break; case 1: // remove diff --git a/widgets/fileselect.cpp b/widgets/fileselect.cpp index a120e2ec8..6d120df15 100644 --- a/widgets/fileselect.cpp +++ b/widgets/fileselect.cpp @@ -40,7 +40,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include +#include #include #include #include @@ -133,8 +133,9 @@ void FileSelector::setCompletionEnabled( bool x ) break; } - dirmdl = new QDirModel( fltr, fm, QDir::DirsFirst | QDir::Name, this ); - dirmdl->setLazyChildCount( true ); + dirmdl = new QFileSystemModel( this ); + dirmdl->setRootPath( QDir::currentPath() ); + dirmdl->setFilter( fm ); line->setCompleter( completer = new QCompleter( dirmdl, this ) ); } else if ( ! x && dirmdl ) @@ -215,11 +216,16 @@ void FileSelector::browse() break; case LoadFile: // Qt uses ;; as separator if multiple types are available - { QStringList allfltr = fltr; allfltr.insert(0, fltr.join( " " )); - x = QFileDialog::getOpenFileName( this, tr("Choose a file"), file(), allfltr.join( ";;" ) ); - } break; + { + QStringList allfltr = fltr; + x = QFileDialog::getOpenFileName( this, tr("Choose a file"), file(), allfltr.join( ";;" ) ); + } + break; case SaveFile: - x = QFileDialog::getSaveFileName( this, tr("Choose a file"), file(), fltr.join( ";;" ) ); + { + QStringList saveFltr = fltr; saveFltr.removeAt(0); // Remove "All Files" + x = QFileDialog::getSaveFileName( this, tr("Choose a file"), file(), saveFltr.join( ";;" ) ); + } break; } diff --git a/widgets/fileselect.h b/widgets/fileselect.h index 9beb585c4..96dd05d1e 100644 --- a/widgets/fileselect.h +++ b/widgets/fileselect.h @@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include class QCompleter; -class QDirModel; +class QFileSystemModel; //! A widget for file selection, both via a browser window and via editing a string. /*! @@ -116,7 +116,7 @@ protected slots: QLineEdit * line; QAction * action; - QDirModel * dirmdl; + QFileSystemModel * dirmdl; QCompleter * completer; QStringList fltr; diff --git a/widgets/xmlcheck.cpp b/widgets/xmlcheck.cpp index 3120d3b80..8517794c0 100644 --- a/widgets/xmlcheck.cpp +++ b/widgets/xmlcheck.cpp @@ -205,11 +205,11 @@ void TestShredder::run() QStringList extensions; if ( chkNif->isChecked() ) - extensions << "*.nif" << "*.nifcache" << "*.texcache" << "*.pcpatch"; + extensions << "NIF (*.nif)" << "NIFCache (*.nifcache)" << "TEXCache (*.texcache)" << "PCPatch (*.pcpatch)"; if ( chkKf->isChecked() ) - extensions << "*.kf" << "*.kfa"; + extensions << "Keyframe (*.kf)" << "Keyframe Animation (*.kfa)"; if ( chkKfm->isChecked() ) - extensions << "*.kfm"; + extensions << "Keyframe Motion (*.kfm)"; queue.init( directory->text(), extensions, recursive->isChecked() ); From 1494740bff60c268ed02d1c2839d015fce615c3d Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Sun, 2 Mar 2014 14:27:04 -0500 Subject: [PATCH 018/836] [Pre-Port] Hide unused NifSystemLocale Forward compatible changes. NifSystemLocale subclasses QSystemLocale which became private API in Qt 5. It was not used anyway, so it's been commented out. --- nifskope.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nifskope.cpp b/nifskope.cpp index 618854b4a..997fda32e 100644 --- a/nifskope.cpp +++ b/nifskope.cpp @@ -1171,11 +1171,13 @@ void IPCsocket::openNif( const QString & url ) } -//! System locale override +// TODO: This class was not used. QSystemLocale became private in Qt 5. +// It appears this class was going to handle display of numbers. +/*//! System locale override /** * Qt does not use the System Locale consistency so this basically forces all floating * numbers into C format but leaves all other local specific settings. - */ + *//* class NifSystemLocale : QSystemLocale { virtual QVariant query(QueryType type, QVariant in) const @@ -1190,7 +1192,7 @@ class NifSystemLocale : QSystemLocale return QVariant(); } } -}; +};*/ static QTranslator *mTranslator = NULL; @@ -1248,8 +1250,6 @@ QString NifSkope::getLoadFileName() { //! The main program int main( int argc, char * argv[] ) { - NifSystemLocale mLocale; - // set up the Qt Application QApplication app( argc, argv ); app.setOrganizationName( "NifTools" ); From 514c19a615180a02dc881337e2890e7a86d7b478 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 10:38:12 -0500 Subject: [PATCH 019/836] [FSEngine] Refactor for Qt 5 Compiles. However, NifSkope code itself will be changed in the next commit to deal with these changes. --- fsengine/bsa.cpp | 221 ++---------------- fsengine/bsa.h | 98 ++------ fsengine/fsengine.cpp | 507 +---------------------------------------- fsengine/fsengine.h | 74 +----- fsengine/fsmanager.cpp | 14 +- fsengine/fsmanager.h | 6 - 6 files changed, 51 insertions(+), 869 deletions(-) diff --git a/fsengine/bsa.cpp b/fsengine/bsa.cpp index 866b589ec..9ef05c8db 100644 --- a/fsengine/bsa.cpp +++ b/fsengine/bsa.cpp @@ -35,6 +35,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include +#include +#include /* Default header data */ #define MW_BSAHEADER_FILEID 0x00000100 //!< Magic for Morrowind BSA @@ -142,7 +145,7 @@ bool BSA::BSAFile::compressed() const } //! Reads a foldername sized string (length + null-terminated string) from the BSA -static bool BSAReadSizedString( QAbstractFileEngine & bsa, QString & s ) +static bool BSAReadSizedString( QFile & bsa, QString & s ) { //qDebug() << "BSA is at" << bsa.pos(); quint8 len; @@ -169,20 +172,11 @@ static bool BSAReadSizedString( QAbstractFileEngine & bsa, QString & s ) // see bsa.h BSA::BSA( const QString & filename ) - : FSArchiveFile(), bsa( filename ), status( "initialized" ) + : FSArchiveFile(), bsa( filename ), bsaInfo( QFileInfo(filename) ), status( "initialized" ) { - bsaPath = bsa.fileName( QAbstractFileEngine::AbsoluteName ); - bsaBase = bsa.fileName( QAbstractFileEngine::AbsolutePathName ); - bsaName = bsa.fileName( QAbstractFileEngine::BaseName ); - - if ( ! bsa.caseSensitive() ) - { - bsaPath = bsaPath.toLower(); - bsaBase = bsaBase.toLower(); - bsaName = bsaName.toLower(); - } - - qDebug() << "BSA" << bsaName << bsaBase << bsaPath; + bsaPath = bsaInfo.absolutePath() + QDir::separator() + bsaInfo.fileName(); + bsaBase = bsaInfo.absolutePath(); + bsaName = bsaInfo.fileName(); } // see bsa.h @@ -194,7 +188,7 @@ BSA::~BSA() // see bsa.h bool BSA::canOpen( const QString & fn ) { - QFSFileEngine f( fn ); + QFile f( fn ); if ( f.open( QIODevice::ReadOnly ) ) { quint32 magic, version; @@ -264,7 +258,7 @@ bool BSA::open() throw QString( "file name read" ); quint32 fileNameIndex = 0; - // qDebug() << file.pos() - header.FileNameLength << fileNames; + //qDebug() << bsa.pos() - header.FileNameLength << fileNames; if ( ! bsa.seek( header.FolderRecordOffset ) ) throw QString( "folder info seek" ); @@ -451,49 +445,6 @@ QString BSA::absoluteFilePath( const QString & fn ) const return QString(); } -// see bsa.h -QStringList BSA::entryList( const QString & fn, QDir::Filters filters ) const -{ - //qDebug() << "entered BSA::entryList with name" << fn; - if ( const BSAFolder * folder = getFolder( fn ) ) - { - QStringList entries; - - // todo: filter - - if ( filters.testFlag( QDir::Dirs ) || filters.testFlag( QDir::AllDirs ) ) - { - //qDebug() << "filtering for directories"; - entries += folder->children.keys(); - } - - if ( filters.testFlag( QDir::Files ) ) - { - //qDebug() << "filtering for files"; - entries += folder->files.keys(); - } - //qDebug() << "entryList:" << entries; - - return entries; - } - return QStringList(); -} - -// see bsa.h -bool BSA::stripBasePath( QString & p ) const -{ - QString base = bsaPath; - - if ( p.startsWith( base ) ) - { - p.remove( 0, base.length() ); - if ( p.startsWith( "/" ) ) - p.remove( 0, 1 ); - return true; - } - return false; -} - // see bsa.h BSA::BSAFolder * BSA::insertFolder( QString name ) { @@ -560,10 +511,15 @@ const BSA::BSAFile * BSA::getFile( QString fn ) const fileName = fn.right( fn.length() - p - 1 ); } - if ( const BSAFolder * folder = getFolder( folderName ) ) + // TODO: Multiple matches occur and user has no say which version gets loaded + // When it comes to the AUTO feature, should give preference to certain BSAs + // or take the newest and or highest quality version. + if ( const BSAFolder * folder = getFolder( folderName ) ) { return folder->files.value( fileName ); - else + } + else { return 0; + } } // see bsa.h @@ -579,150 +535,19 @@ bool BSA::hasFolder( const QString & fn ) const } // see bsa.h -uint BSA::ownerId( const QString &, QAbstractFileEngine::FileOwner type ) const -{ - return bsa.ownerId( type ); -} - -// see bsa.h -QString BSA::owner( const QString &, QAbstractFileEngine::FileOwner type ) const -{ - return bsa.owner( type ); -} - -// see bsa.h -QDateTime BSA::fileTime( const QString &, QAbstractFileEngine::FileTime type ) const -{ - return bsa.fileTime( type ); -} - -// see bsa.h -// TODO: rework this to use the BSA::entryList code -BSAIterator::BSAIterator( QDir::Filters filters, const QStringList & nameFilters, BSA * archive, QString & base ) - : QAbstractFileEngineIterator( filters, nameFilters ), current( None ), archive( archive ), fileIndex( -1 ), folderIndex ( -1 ) -{ - archive->ref.ref(); - //qDebug() << "Entered BSAIterator with filters" << filters << "names" << nameFilters << "base" << base; - //qDebug() << "Archive is" << archive->path(); - //qDebug() << "Path is" << path() << "currentFilePath is" << currentFilePath(); - - /* - if ( filters.testFlag( QDir::Dirs ) || filters.testFlag( QDir::AllDirs ) ) - { - qDebug() << "Requested directories"; - } - - if ( filters.testFlag( QDir::Files ) ) - { - qDebug() << "Requested files"; - } - */ - - currentFolder = const_cast( archive->getFolder( base ) ); - - folderList += currentFolder->children.keys(); - //qDebug() << "Child folders" << folderList; - fileList += currentFolder->files.keys(); - //qDebug() << "Child files" << fileList; - - /* - foreach( QString bsaKey, folderList ) - { - qDebug() << "adding files from" << bsaKey; - foreach( QString eachFile, archive->folders.value( bsaKey )->files.keys() ) - { - QString temp = bsaKey + "/" + eachFile; - qDebug() << "adding" << temp; - fileList += temp; - } - } - */ -} - -// see bsa.h -BSAIterator::~BSAIterator() +uint BSA::ownerId( const QString & ) const { - //qDebug() << "Deleting BSAIterator"; - if ( ! archive->ref.deref() ) - delete archive; + return bsaInfo.ownerId( ); } // see bsa.h -bool BSAIterator::hasNext() const +QString BSA::owner( const QString & ) const { - //qDebug() << "Entered BSAIterator::hasNext"; - //qDebug() << "fileIndex" << fileIndex << "folderIndex" << folderIndex; - return ( fileIndex < ( fileList.size() - 1 ) || folderIndex < ( folderList.size() - 1 ) ); + return bsaInfo.owner( ); } -// precondition: hasNext() is true // see bsa.h -QString BSAIterator::currentFileName() const +QDateTime BSA::fileTime( const QString & ) const { - //qDebug() << "Entered BSAIterator::currentFileName"; - if( current == File ) - { - //qDebug() << "currentFileName: file" << fileList.at( fileIndex ); - return fileList.at( fileIndex ); - } - else if( current == Folder ) - { - //qDebug() << "currentFileName: folder" << folderList.at( folderIndex ); - return folderList.at( folderIndex ); - } - else - { - //qDebug() << "no current file"; - return QString(); - } + return bsaInfo.created( ); } - -// precondition: hasNext() is true -// postCondition: we return the name of the next file -// see bsa.h -QString BSAIterator::next() -{ - //qDebug() << "Entered BSAIterator::next"; - //qDebug() << "At" << fileIndex << "of" << fileList.size() << "files"; - //qDebug() << "At" << folderIndex << "of" << folderList.size() << "folders"; - if( folderIndex < folderList.size() - 1 ) - { - //qDebug() << "getting next folder"; - current = Folder; - folderIndex++; - QString nextFolder = folderList.at( folderIndex ); - //qDebug() << "next folder is" << nextFolder; - return nextFolder; - } - else if( fileIndex < fileList.size() - 1 ) - { - //qDebug() << "getting next file"; - current = File; - fileIndex++; - QString nextFolder = fileList.at( fileIndex ); - //qDebug() << "next file is" << nextFolder; - return nextFolder; - } - else - { - //qDebug() << "no next, not sure how we got here"; - current = None; - return QString(); - } -} - -// see bsa.h -QString BSAIterator::currentFilePath() const -{ - //qDebug() << "Entered BSAIterator::currentFilePath"; - return QAbstractFileEngineIterator::currentFilePath(); -} - -// see bsa.h -QString BSAIterator::path() const -{ - //qDebug() << "Entered BSAIterator::path"; - return archive->bsaPath; - //return QAbstractFileEngineIterator::path(); -} - diff --git a/fsengine/bsa.h b/fsengine/bsa.h index 42253b1c3..9b589a0d0 100644 --- a/fsengine/bsa.h +++ b/fsengine/bsa.h @@ -35,8 +35,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fsengine.h" -#include -#include +#include +#include +#include #include #include @@ -70,24 +71,8 @@ class BSA : public FSArchiveFile //! Returns BSA::bsaName. QString name() const { return bsaName; } - //! \copybrief FSArchiveFile::stripBasePath() - /*! - * In this case, strips bsaPath from the provided string. - * - * @param p the string to strip the base path from - * @return true if the path was stripped, false otherwise - */ - bool stripBasePath( QString & p ) const; - //! Whether the specified folder exists or not bool hasFolder( const QString & ) const; - //! Returns a list of files or folders as requested - /*! - * Called by FSArchiveEngine::entryList(). - * \param fn The folder to search in - * \param filters Whether to look for files or folders - */ - QStringList entryList( const QString & fn, QDir::Filters filters ) const; //! Whether the specified file exists or not bool hasFile( const QString & ) const; @@ -101,12 +86,12 @@ class BSA : public FSArchiveFile */ bool fileContents( const QString &, QByteArray & ); - //! See QFSFileEngine::ownerId(). - uint ownerId( const QString &, QAbstractFileEngine::FileOwner type ) const; - //! See QFSFileEngine::owner(). - QString owner( const QString &, QAbstractFileEngine::FileOwner type ) const; - //! See QFSFileEngine::fileTime(). - QDateTime fileTime( const QString &, QAbstractFileEngine::FileTime type ) const; + //! See QFileInfo::ownerId(). + uint ownerId( const QString & ) const; + //! See QFileInfo::owner(). + QString owner( const QString & ) const; + //! See QFileInfo::created(). + QDateTime fileTime( const QString & ) const; //! See QFileInfo::absoluteFilePath(). QString absoluteFilePath( const QString & ) const; @@ -152,8 +137,11 @@ class BSA : public FSArchiveFile //! Gets the specified file, or null if not found const BSAFile * getFile( QString fn ) const; - //! The engine which reads the %BSA from a file - QFSFileEngine bsa; + //! The %BSA file + QFile bsa; + //! File info for the %BSA + QFileInfo bsaInfo; + //! Mutual exclusion handler QMutex bsaMutex; @@ -176,64 +164,6 @@ class BSA : public FSArchiveFile bool compressToggle; //! Whether Fallout 3 names are prefixed with an extra string bool namePrefix; - - //! An iterator that has access to the %BSA - friend class BSAIterator; -}; - -//! Iterator for a BSA file. -class BSAIterator : public QAbstractFileEngineIterator -{ -public: - //! Constructor - BSAIterator( QDir::Filters filters, const QStringList & nameFilters, BSA * archive, QString & base ); - - //! Destructor - ~BSAIterator(); - - //! Whether there are any entries left in the list - /*! - * \return true if next() can be called - */ - bool hasNext() const; - - //! Name of the entry currently in the list - QString currentFileName() const; - - //! Gets the next entry in the list - /*! - * \return the name of the next entry in the list - */ - QString next(); - - //! Return the current file path - QString currentFilePath() const; - - //! Return the path for the iterator - QString path() const; - -protected: - //! The type of the current entry - enum CurrentEntry - { - File, //!< Current entry is a file - Folder, //!< Current entry is a folder - None //!< No current entry has been set - } current; - -private: - //! The BSA that is being iterated over - BSA * archive; - //! The current folder inside the BSA - BSA::BSAFolder * currentFolder; - //! The list of files known by the iterator - QStringList fileList; - //! The list of folders known by the iterator - QStringList folderList; - //! The index of the iterator in the list of files - qint32 fileIndex; - //! The index of the iterator in the list of folders - qint32 folderIndex; }; #endif diff --git a/fsengine/fsengine.cpp b/fsengine/fsengine.cpp index ebcc3dfc7..a8d7803b5 100644 --- a/fsengine/fsengine.cpp +++ b/fsengine/fsengine.cpp @@ -42,533 +42,32 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //! \file fsengine.cpp File system engine implementations -#ifdef OVERLAYS_ENABLED -//! Maps directories in the filesystem to BSAs that can be opened by FSArchiveEngine. -static QMap overlayDirs; -//! Mutual exclusion handler for overlayDirs -static QMutex overlayMutex; - -// see fsengine.h -FSOverlayEngine::FSOverlayEngine( const QString & filename ) - : QFSFileEngine( filename ) -{} - -// see fsengine.h -QStringList FSOverlayEngine::entryList( QDir::Filters filters, const QStringList & nameFilters ) const -{ - QStringList entries = QFSFileEngine::entryList( filters, nameFilters ); - - if ( filters.testFlag( QDir::Dirs ) || filters.testFlag( QDir::AllDirs ) ) - { - QMutexLocker lock( & overlayMutex ); - - QString dirname = fileName( AbsoluteName ); - if ( ! caseSensitive() ) - dirname = dirname.toLower(); - - if ( overlayDirs.contains( dirname ) ) - { - QStringList list = overlayDirs.value( dirname ); -#ifndef QT_NO_DEBUG - qDebug() << dirname << "overlay" << list; -#endif - - foreach ( QString x, list ) - { - if ( ! entries.contains( x ) ) - { - entries += x; - } - } - } - } - - return entries; -} - -// see fsengine.h -FileFlags FSOverlayEngine::fileFlags( FileFlags type = FileInfoAll ) const -{ - FileFlags x = QFSFileEngine::fileFlags( type ); - - if ( type.testFlag( DirectoryType ) ) - { - QMutexLocker lock( & overlayMutex ); - - QString base = fileName( AbsolutePathName ); - if ( ! caseSensitive() ) - base = base.toLower(); - - //qDebug() << "base" << base; - - if ( overlayDirs.contains( base ) ) - { - QString name = fileName( BaseName ); - if ( ! caseSensitive() ) - name = name.toLower(); - - //qDebug() << "name" << name; - - if ( overlayDirs[ base ].contains( name ) ) - { - x |= DirectoryType; -#ifndef QT_NO_DEBUG - qDebug() << "flags |= Dir"; -#endif - } - } - } - - return x; -} - -// see fsengine.h -QAbstractFileEngine * FSOverlayHandler::create( const QString & fileName ) const -{ - if ( fileName.startsWith( ":" ) ) - return 0; - else - return new FSOverlayEngine( fileName ); -} -#endif // OVERLAYS_ENABLED - // see fsengine.h FSArchiveHandler * FSArchiveHandler::openArchive( const QString & fn ) { if ( BSA::canOpen( fn ) ) { BSA * bsa = new BSA( fn ); - if ( bsa->open() ) + if ( bsa->open() ) { + //qDebug() << "BSA Open: " << fn; return new FSArchiveHandler( bsa ); + } qDebug() << "fsengine error:" << fn << ":" << bsa->statusText(); delete bsa; } return 0; } -//! A custom file engine for FSArchiveFile -/*! - * This allows BSA files to masquerade as directories in the file system. - */ -class FSArchiveEngine : public QAbstractFileEngine -{ - //! The archive being read - FSArchiveFile * archive; - - //! The original path requested - QString orgFilePath; - //! The relative path requested - QString relFilePath; - - QIODevice::OpenMode fileMode; - QByteArray fileData; - qint64 filePos; - -public: - //! Constructor - /*! - * \param a The archive to use - * \param org The original path requested - * \param rel The relative path inside the archive - */ - FSArchiveEngine( FSArchiveFile * a, const QString & org, const QString & rel ) : QAbstractFileEngine() - { - archive = a; - archive->ref.ref(); - - fileMode = QIODevice::NotOpen; - filePos = 0; - - orgFilePath = org; - relFilePath = rel; - -#ifndef QT_NO_DEBUG - qDebug() << "archive engine: org" << orgFilePath << "rel" << relFilePath; -#endif - } - - //! Destructor - ~FSArchiveEngine() - { - if ( ! archive->ref.deref() ) - delete archive; - } - - //! Gets the applicable flags for the current file; see QAbstractFileEngine::fileFlags(). - FileFlags fileFlags( FileFlags type = FileInfoAll ) const - { - FileFlags flags( 0 ); - - if ( ( type.testFlag( FileType ) || type.testFlag( ExistsFlag ) ) && archive->hasFile( relFilePath ) ) - { - flags |= FileType; - flags |= ReadOtherPerm; - flags |= ExistsFlag; - } - if ( ( type.testFlag( DirectoryType ) || type.testFlag( ExistsFlag ) ) && archive->hasFolder( relFilePath ) ) - { - flags |= DirectoryType; - flags |= ReadOtherPerm; - flags |= ExeOtherPerm; - flags |= ExistsFlag; - } - - return flags; - } - - //! Gets a list of files in the @FSArchiveEngine's directory; see QAbstractFileEngine::entryList(). - /*! - * Note: as of Qt 4.6 (undocumented as yet), this is not called by QDir; beginEntryList() is used - * instead. - */ - QStringList entryList( QDir::Filters filters, const QStringList & nameFilters ) const - { - QStringList list; - - if ( filters.testFlag( QDir::Dirs ) || filters.testFlag( QDir::AllDirs ) ) - { - // TODO: filter dir names - list = archive->entryList( relFilePath, QDir::Dirs ); - } - - if ( filters.testFlag( QDir::Files ) ) - { - if ( nameFilters.isEmpty() ) - { - list += archive->entryList( relFilePath, QDir::Files ); - } - else - { - QList wildcards; - foreach ( QString pattern, nameFilters ) - wildcards << QRegExp( pattern, Qt::CaseInsensitive, QRegExp::Wildcard ); - - foreach ( QString fn, archive->entryList( relFilePath, QDir::Files ) ) - { - foreach ( QRegExp e, wildcards ) - { - if ( e.exactMatch( fn ) ) - { - list << fn; - break; - } - } - } - } - } - - return list; - } - -#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)) - //! Returns an iterator to for QDirIterator to use; supersedes entryList(). - BSAIterator* beginEntryList( QDir::Filters filters, const QStringList &filterNames) - { - //qDebug() << "entered FSArchiveEngine::beginEntryList with filterNames" << filterNames; - return new BSAIterator( filters, filterNames, (BSA*)archive, relFilePath ); - } -#endif - - //! Supposedly sets the file name to operate on; null implementation. - void setFileName( const QString & fn ) - { -#ifndef QT_NO_DEBUG - qDebug() << "bsa engine set file name" << fn; -#endif - } - - //! Returns the current file name. - QString fileName( FileName type ) const - { -#ifndef QT_NO_DEBUG - qDebug() << "entered FSArchiveEngine::fileName"; -#endif - switch ( type ) - { - case BaseName: - { - QString bn = orgFilePath; - int x = bn.lastIndexOf( "/" ); - if ( x >= 0 ) - bn.remove( 0, x + 1 ); -#ifndef QT_NO_DEBUG - qDebug() << "name" << bn; -#endif - return bn; - } break; - case PathName: - { - QString pn = orgFilePath; - int x = pn.lastIndexOf( "/" ); - if ( x >= 0 ) - pn = pn.left( x ); -#ifndef QT_NO_DEBUG - qDebug() << "path" << pn; -#endif - return pn; - } break; - case AbsolutePathName: - { - QString pn = archive->path(); - if ( ! relFilePath.isEmpty() ) - pn += "/" + relFilePath; - int x = pn.lastIndexOf( "/" ); - if ( x >= 0 ) - pn = pn.left( x ); -#ifndef QT_NO_DEBUG - qDebug() << "abspath" << pn; -#endif - return pn; - } break; - default: - break; - } - return orgFilePath; - } - - //! Whether the current file has a relative path; null implementation. - bool isRelativePath() const - { - // todo - return false; - } - - //! Opens the current file in the specified mode. - bool open( QIODevice::OpenMode mode ) - { - //qDebug() << "entering FSArchiveEngine::open with mode" << mode; - if ( fileMode != QIODevice::NotOpen || !( mode & QIODevice::ReadOnly ) ) - return false; - - if ( archive->fileContents( relFilePath, fileData ) ) - { - fileMode = mode; - filePos = 0; - return true; - } - else - return false; - } - - //! Closes the current file. - bool close() - { - if ( fileMode != QIODevice::NotOpen ) - { - fileMode = QIODevice::NotOpen; - filePos = 0; - fileData.clear(); - return true; - } - else - return false; - } - - //! Gets the size of the current file. - qint64 size() const - { - if ( fileMode == QIODevice::NotOpen ) - return archive->fileSize( relFilePath ); - else - return fileData.size(); - } - - //! Seeks to the specified position. - bool seek( qint64 ofs ) - { - if ( fileMode != QIODevice::NotOpen && ofs >= 0 && ofs < fileData.size() ) - { - filePos = ofs; - return true; - } - return false; - } - - //! Returns the current position offset. - qint64 pos() const - { - return filePos; - } - - //! Reads a line of data. - qint64 readLine( char * data, qint64 maxlen ) - { - qint64 numread = 0; - while ( numread < maxlen && filePos < fileData.size() ) - { - *data = fileData.at( filePos++ ); - numread++; - if ( *data == '\n' ) - break; - else - data++; - } - return numread; - } - - //! Reads a block of data. - qint64 read( char * data, qint64 maxlen ) - { - qint64 numread = fileData.size() - filePos; - if ( numread > maxlen ) - numread = maxlen; - memcpy( data, ( fileData.data() + filePos ), numread ); - filePos += numread; - return numread; - } - - //! Writes a line of data. - /*! - * As yet, BSA writing has not been implemented in NifSkope. - */ - qint64 write( const char * data, qint64 len ) - { - Q_UNUSED(len); - Q_UNUSED(data); - return -1; - } - - //! Returns the file handle; see QAbstractFileEngine::handle(). - int handle() const - { - return 0; - } - - //! Flushes the open file. - bool flush() - { - return true; - } - - //! See BSA::ownerID(). - uint ownerId( FileOwner type ) const - { - return archive->ownerId( relFilePath, type ); - } - - //! See BSA::owner(). - QString owner( FileOwner type ) const - { - return archive->owner( relFilePath, type ); - } - - //! See BSA::fileTime(). - QDateTime fileTime( FileTime type ) const - { - return archive->fileTime( relFilePath, type ); - } - - //! Supposedly copies the current file; null implementation. - bool copy( const QString & newFile ) - { - Q_UNUSED(newFile); - return false; - } - - //! Whether the file engine disallows random access. - bool isSequential() const - { - return false; - } - - //! Whether the file engine is case sensitive. - bool caseSensitive() const - { - return false; - } - - bool setPermissions( uint ) { return false; } - bool setSize( qint64 ) { return false; } - bool mkdir( const QString &, bool ) const { return false; } - bool rmdir( const QString &, bool ) const { return false; } - bool rename( const QString & ) { return false; } - bool remove() { return false; } - bool link( const QString & ) { return false; } -}; - - // see fsengine.h FSArchiveHandler::FSArchiveHandler( FSArchiveFile * a ) - : QAbstractFileEngineHandler() { archive = a; archive->ref.ref(); - -#ifdef OVERLAYS_ENABLED - QMutexLocker lock( & overlayMutex ); - - overlayDirs[ archive->base() ].append( archive->name() ); -#endif } // see fsengine.h FSArchiveHandler::~FSArchiveHandler() { -#ifdef OVERLAYS_ENABLED - QMutexLocker lock( & overlayMutex ); - - overlayDirs[ archive->base() ].removeAll( archive->name() ); -#endif - if ( ! archive->ref.deref() ) delete archive; } - -// see fsengine.h -QAbstractFileEngine * FSArchiveHandler::create( const QString & filename ) const -{ - QString fn = filename.toLower(); - fn.replace( "\\", "/" ); - return archive->stripBasePath( fn ) ? new FSArchiveEngine( archive, filename, fn ) : 0; -} - -#ifdef BSA_TEST - -#include -#include -#include -#include -#include - -//! Test program -int main( int argc, char * argv[] ) -{ - QApplication app( argc, argv ); - - QString fn = "test.bsa"; - // QString fn = "E:\\Valve\\Steam\\SteamApps\\common\\fallout 3\\Data\\Fallout - Textures.bsa"; - // QString fn = "g:\\nif\\mw\\data files\\bsa.bsa"; - // QString fn = "f:\\data\\Oblivion - Misc.bsa"; - - if ( argc > 1 ) - fn = argv[ argc - 1 ]; - -#ifdef OVERLAYS_ENABLED - FSOverlayHandler overlayHandler; -#endif - - if ( FSArchiveHandler::openArchive( fn ) ) - { - qDebug() << fn << ":status:" << QString( "open" ); - - QDirModel mdl; - mdl.setLazyChildCount( true ); - mdl.setSorting( QDir::DirsFirst | QDir::Name ); - - QTreeView view; - view.resize( 600, 600 ); - view.move( 600, 100 ); - view.setModel( &mdl ); - view.show(); - - QLineEdit line; - line.setCompleter( new QCompleter( new QDirModel( QStringList() << "*.nif", QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot, QDir::DirsFirst, & line ), & line ) ); - line.show(); - - return app.exec(); - } - - return 0; -} - -#endif diff --git a/fsengine/fsengine.h b/fsengine/fsengine.h index 51eb2794b..7e215c696 100644 --- a/fsengine/fsengine.h +++ b/fsengine/fsengine.h @@ -34,9 +34,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ARCHIVEENGINE_H #define ARCHIVEENGINE_H -#include -#include -#include +#include +#include + #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) #include #else @@ -45,27 +45,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define QAtomicInt QAtomic #endif -// only use the overlay engine before Qt 4.6 -#if (QT_VERSION < QT_VERSION_CHECK(4, 6, 0)) -#define OVERLAYS_ENABLED -#endif - -#ifdef OVERLAYS_ENABLED -//! Registers FSOverlayEngine with the application. -class FSOverlayHandler : public QAbstractFileEngineHandler -{ -public: - //! Registers the file engine handler with the application. - /*! - * \param filename The file to create an overlay engine for - * \return FSOverlayEngine - */ - QAbstractFileEngine * create( const QString & fileName ) const; -}; -#endif // OVERLAYS_ENABLED //! Provides a way to register an FSArchiveEngine with the application. -class FSArchiveHandler : public QAbstractFileEngineHandler +class FSArchiveHandler { public: //! Opens a BSA for the specified file @@ -77,46 +59,12 @@ class FSArchiveHandler : public QAbstractFileEngineHandler //! Destructor ~FSArchiveHandler(); - //! Creates a file engine for the specified filename. - /*! - * \param filename The file to create a file engine for - * \return A FSArchiveEngine if the filename is a BSA, 0 otherwise - * \sa QAbstractFileEngineHandler - */ - QAbstractFileEngine * create( const QString & filename ) const; FSArchiveFile * getArchive() { return archive; } protected: class FSArchiveFile * archive; }; -//! Overlay engine which hooks FSArchiveEngine into normal directory traversal. -/*! - * Not sure why this is needed; the documentation for QFSFileEngine says "by - * subclassing this class, you can alter its behavior slightly, without - * having to write a complete QAbstractFileEngine subclass"; but that is what - * FSArchiveEngine is. Perhaps there is a performance gain by having the overlay? - */ -class FSOverlayEngine : public QFSFileEngine -{ -public: - //! Constructor. - /*! - * \param filename The path to construct a file engine for - */ - FSOverlayEngine( const QString & filename ); - - //! Gets a list of files in the @FSOverlayEngine's directory; see QAbstractFileEngine::entryList(). - /*! - * note: as of Qt 4.6 (undocumented as yet), this is not called by QDir, - * and an iterator must be provided instead. - */ - QStringList entryList( QDir::Filters filters, const QStringList & nameFilters ) const; - - //! Gets the applicable flags for the current file; see QAbstractFileEngine::fileFlags(). - FileFlags fileFlags( FileFlags type ) const; - -}; //! A file system archive class FSArchiveFile @@ -133,27 +81,21 @@ class FSArchiveFile virtual QString name() const = 0; virtual QString path() const = 0; - //! Strips the archive file path from a path possibly inside the file - virtual bool stripBasePath( QString & ) const = 0; - virtual bool hasFolder( const QString & ) const = 0; - virtual QStringList entryList( const QString &, QDir::Filters ) const = 0; - virtual bool hasFile( const QString & ) const = 0; virtual qint64 fileSize( const QString & ) const = 0; - virtual bool fileContents( const QString &, QByteArray & ) = 0; + virtual bool fileContents( const QString &, QByteArray & ) = 0; virtual QString absoluteFilePath( const QString & ) const = 0; - virtual uint ownerId( const QString &, QAbstractFileEngine::FileOwner type ) const = 0; - virtual QString owner( const QString &, QAbstractFileEngine::FileOwner type ) const = 0; - virtual QDateTime fileTime( const QString &, QAbstractFileEngine::FileTime type ) const = 0; + virtual uint ownerId( const QString & ) const = 0; + virtual QString owner( const QString & ) const = 0; + virtual QDateTime fileTime( const QString & ) const = 0; protected: //! A reference counter for an implicitly shared class QAtomicInt ref; friend class FSArchiveHandler; - friend class FSArchiveEngine; }; #endif diff --git a/fsengine/fsmanager.cpp b/fsengine/fsmanager.cpp index af9879ace..20e977cc6 100644 --- a/fsengine/fsmanager.cpp +++ b/fsengine/fsmanager.cpp @@ -37,7 +37,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include #include #include @@ -70,10 +69,6 @@ QList FSManager::archiveList() FSManager::FSManager( QObject * parent ) : QObject( parent ), automatic( false ) { -#ifdef OVERLAYS_ENABLED - overlay = new FSOverlayHandler; -#endif - QSettings cfg; cfg.beginGroup( "fsengine" ); @@ -96,9 +91,6 @@ FSManager::FSManager( QObject * parent ) FSManager::~FSManager() { qDeleteAll( archives ); -#ifdef OVERLAYS_ENABLED - delete overlay; -#endif } // see fsmanager.h @@ -112,10 +104,10 @@ QStringList FSManager::regPathBSAList( QString regKey, QString dataDir ) if ( ! dataPath.endsWith( '/' ) && ! dataPath.endsWith( '\\' ) ) dataPath += "/"; dataPath += dataDir; - QFSFileEngine fs( dataPath ); - foreach ( QString fn, fs.entryList( QDir::Files, QStringList() << "*.bsa" ) ) + QDir fs( dataPath ); + foreach ( QString fn, fs.entryList( QStringList() << "*.bsa", QDir::Files ) ) { - list << dataPath + "/" + fn; + list << dataPath + QDir::separator() + fn; } } return list; diff --git a/fsengine/fsmanager.h b/fsengine/fsmanager.h index 871070227..35d251a9f 100644 --- a/fsengine/fsmanager.h +++ b/fsengine/fsmanager.h @@ -40,9 +40,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#ifdef OVERLAYS_ENABLED -class FSOverlayHandler; -#endif class FSArchiveHandler; class FSArchiveFile; @@ -67,9 +64,6 @@ public slots: void selectArchives(); protected: -#ifdef OVERLAYS_ENABLED - FSOverlayHandler * overlay; -#endif QMap archives; bool automatic; From 7cfcc1f8fb7f2b51d2ad768c8b6a0c33fdd70d6e Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 10:39:52 -0500 Subject: [PATCH 020/836] [FSEngine] Add Skyrim to BSA path list --- fsengine/fsmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/fsengine/fsmanager.cpp b/fsengine/fsmanager.cpp index 20e977cc6..1923408f9 100644 --- a/fsengine/fsmanager.cpp +++ b/fsengine/fsmanager.cpp @@ -122,6 +122,7 @@ QStringList FSManager::autodetectArchives() list << regPathBSAList( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\Oblivion", "Data" ); list << regPathBSAList( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\Fallout3", "Data" ); list << regPathBSAList( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\FalloutNV", "Data" ); + list << regPathBSAList( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\Skyrim", "Data" ); #endif return list; From 595580ec2a4866966f19e7fc9a67e64ca26931d5 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 10:44:26 -0500 Subject: [PATCH 021/836] [FSEngine] FSSelector improvements (Remove All) --- fsengine/fsmanager.cpp | 15 ++++++++++++++- fsengine/fsmanager.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fsengine/fsmanager.cpp b/fsengine/fsmanager.cpp index 1923408f9..a3d1faf91 100644 --- a/fsengine/fsmanager.cpp +++ b/fsengine/fsmanager.cpp @@ -158,12 +158,17 @@ FSSelector::FSSelector( FSManager * m ) btDel = new QPushButton( "Remove", this ); btDel->setDisabled( manager->automatic ); connect( btDel, SIGNAL( clicked() ), this, SLOT( sltDel() ) ); + + btDelAll = new QPushButton( "Remove All", this ); + btDelAll->setDisabled( manager->automatic ); + connect( btDelAll, SIGNAL( clicked() ), this, SLOT( sltDelAll() ) ); QGridLayout * grid = new QGridLayout( this ); grid->addWidget( chkAuto, 0, 0, 1, 2 ); grid->addWidget( view, 1, 0, 1, 2 ); grid->addWidget( btAdd, 2, 0, 1, 1 ); grid->addWidget( btDel, 2, 1, 1, 1 ); + grid->addWidget( btDelAll, 2, 2, 1, 1 ); } FSSelector::~FSSelector() @@ -196,11 +201,12 @@ void FSSelector::sltAuto( bool x ) btAdd->setDisabled( x ); btDel->setDisabled( x ); + btDelAll->setDisabled( x ); } void FSSelector::sltAdd() { - QStringList list = QFileDialog::getOpenFileNames( this, "Select resource files to add", QString(), "*.bsa" ); + QStringList list = QFileDialog::getOpenFileNames( this, "Select resource files to add", QString(), "BSA (*.bsa)" ); foreach ( QString an, list ) { @@ -223,3 +229,10 @@ void FSSelector::sltDel() model->setStringList( manager->archives.keys() ); } +void FSSelector::sltDelAll() +{ + qDeleteAll( manager->archives ); + manager->archives.clear(); + + model->setStringList( QStringList() ); +} diff --git a/fsengine/fsmanager.h b/fsengine/fsmanager.h index 35d251a9f..7a88f86e6 100644 --- a/fsengine/fsmanager.h +++ b/fsengine/fsmanager.h @@ -89,6 +89,7 @@ protected slots: void sltAuto( bool ); void sltAdd(); void sltDel(); + void sltDelAll(); protected: FSManager * manager; @@ -99,6 +100,7 @@ protected slots: class QCheckBox * chkAuto; class QPushButton * btAdd; class QPushButton * btDel; + class QPushButton * btDelAll; }; From 962e5fa71a3374e4ec27b2b9b4895282b6fb5383 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 10:48:02 -0500 Subject: [PATCH 022/836] [FSEngine] Add Skyrim to Auto Detect --- options.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/options.cpp b/options.cpp index 3996b11ca..ccfbededf 100644 --- a/options.cpp +++ b/options.cpp @@ -681,6 +681,33 @@ void Options::textureFolderAutoDetect() #ifdef Q_OS_WIN32 + // Skyrim + { + QSettings reg( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\Skyrim", QSettings::NativeFormat ); + QDir dir( reg.value( "Installed Path" ).toString() ); + if ( dir.exists() && dir.cd( "Data" ) ) + { + game_list.append( "TES5: Skyrim\n" ); + + list.append( dir.path() ); + + dir.setNameFilters( QStringList() << "*.bsa" ); + dir.setFilter( QDir::Dirs ); + foreach ( QString dn, dir.entryList() ) + list << dir.filePath( dn ); + +#ifndef FSENGINE + if ( ! dir.cd( "Textures" ) ) + { + QMessageBox::information( dialog, "NifSkope", + tr("

The texture folder was not found.

" + "

This may be because you haven't extracted the archive files yet.
" + "Here, it is explained how to do that.

") ); + } +#endif + } + } + // Oblivion { QSettings reg( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Bethesda Softworks\\Oblivion", QSettings::NativeFormat ); From 499b5894e1f4d150fe2c47a2000aaab441fb07f5 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 11:10:20 -0500 Subject: [PATCH 023/836] [FSEngine] Refactor Tex loading for new FSEngine --- gl/gltex.cpp | 86 +++++++++++++++------------------------------ gl/gltex.h | 4 ++- gl/gltexloaders.cpp | 20 +++++++++-- gl/gltexloaders.h | 2 +- 4 files changed, 50 insertions(+), 62 deletions(-) diff --git a/gl/gltex.cpp b/gl/gltex.cpp index 83a73ee9a..94ba2c25e 100644 --- a/gl/gltex.cpp +++ b/gl/gltex.cpp @@ -144,19 +144,12 @@ TexCache::~TexCache() //flush(); } -QString TexCache::find( const QString & file, const QString & nifdir ) +QString TexCache::find( const QString & file, const QString & nifdir, QByteArray & data ) { if ( file.isEmpty() ) return QString(); -#ifndef Q_OS_WIN - /* convert nif path backslash into forward slash */ - /* also check for both original name and lower case name */ - QString filename_orig = QString(file).replace( "\\", "/" );; - QString filename = file.toLower().replace( "\\", "/" ); -#else - QString filename = file.toLower(); -#endif + QString filename = QDir::toNativeSeparators(file); while ( filename.startsWith( "/" ) || filename.startsWith( "\\" ) ) filename.remove( 0, 1 ); @@ -176,9 +169,6 @@ QString TexCache::find( const QString & file, const QString & nifdir ) extensions.removeAll( ext ); extensions.prepend( ext ); filename = filename.left( filename.length() - ext.length() ); -#ifndef Q_OS_WIN - filename_orig = filename_orig.left( filename_orig.length() - ext.length() ); -#endif replaceExt = true; break; } @@ -191,9 +181,6 @@ QString TexCache::find( const QString & file, const QString & nifdir ) { if ( replaceExt ) { filename += ext; -#ifndef Q_OS_WIN - filename_orig += ext; -#endif } foreach ( QString folder, Options::textureFolders() ) @@ -203,65 +190,43 @@ QString TexCache::find( const QString & file, const QString & nifdir ) } dir.setPath( folder ); -#ifndef Q_OS_WIN - //qWarning() << folder << filename; -#endif if ( dir.exists( filename ) ) { filename = dir.filePath( filename ); - // fix separators -#ifdef Q_OS_WIN - filename.replace("/", "\\"); -#else - filename.replace("\\", "/"); -#endif return filename; } -#ifndef Q_OS_WIN - //qWarning() << folder << filename_orig; - if ( dir.exists( filename_orig ) ) { - filename = dir.filePath( filename_orig ); - // fix separators -#ifdef Q_OS_WIN - filename.replace("/", "\\"); -#else - filename.replace("\\", "/"); -#endif - return filename; - } -#endif } - // Search through archives last and return archive annotated name - // which will be removed by any handlers +#ifdef FSENGINE + // Search through archives last, and load any requested textures into memory. foreach ( FSArchiveFile* archive, FSManager::archiveList() ) { if ( archive ) { - QString fullname = archive->absoluteFilePath( filename.toLower().replace( "\\", "/" ) ); - if (!fullname.isEmpty()) { -#ifdef Q_OS_WIN - fullname.replace("/", "\\"); -#else - fullname.replace("\\", "/"); -#endif - return fullname; + + filename = QDir::fromNativeSeparators(filename.toLower()); + + if ( archive->hasFile(filename) ) { + + QByteArray outData; + //qDebug() << "Extracting " << filename; + archive->fileContents(filename, outData); + + if ( !outData.isEmpty() ) { + data = outData; + + return file; + } } } } +#endif if ( replaceExt ) { filename = filename.left( filename.length() - ext.length() ); -#ifndef Q_OS_WIN - filename_orig = filename_orig.left( filename_orig.length() - ext.length() ); -#endif } else break; } // fix separators -#ifdef Q_OS_WIN - filename.replace("/", "\\"); -#else - filename.replace("\\", "/"); -#endif + filename = QDir::toNativeSeparators(filename); if ( replaceExt ) return filename + extensions.value( 0 ); @@ -348,14 +313,21 @@ int TexCache::bind( const QString & fname ) tx = new Tex; tx->filename = fname; tx->id = 0; + tx->data = QByteArray(); tx->mipmaps = 0; tx->reload = false; textures.insert( tx->filename, tx ); } + + QByteArray outData; if ( tx->filepath.isEmpty() || tx->reload ) - tx->filepath = find( tx->filename, nifFolder ); + tx->filepath = find( tx->filename, nifFolder, outData ); + + if ( !outData.isEmpty() ) { + tx->data = outData; + } if ( ! tx->id || tx->reload ) { @@ -506,7 +478,7 @@ void TexCache::Tex::load() try { - texLoad( filepath, format, width, height, mipmaps ); + texLoad( filepath, format, width, height, mipmaps, data ); } catch ( QString e ) { diff --git a/gl/gltex.h b/gl/gltex.h index 9fd63ab1e..abaa8b34c 100644 --- a/gl/gltex.h +++ b/gl/gltex.h @@ -62,6 +62,8 @@ class TexCache : public QObject QString filename; //! The texture file path. QString filepath; + //! The texture data (if not in the filesystem) + QByteArray data; //! ID for use with GL texture functions GLuint id; //! Width of the texture @@ -106,7 +108,7 @@ class TexCache : public QObject bool importFile( NifModel * nif, const QModelIndex & iSource, QModelIndex & iData ); //! Find a texture based on its filename - static QString find( const QString & file, const QString & nifFolder ); + static QString find( const QString & file, const QString & nifFolder, QByteArray & data = QByteArray() ); //! Remove the path from a filename static QString stripPath( const QString & file, const QString & nifFolder ); //! Checks whether the given file can be loaded diff --git a/gl/gltexloaders.cpp b/gl/gltexloaders.cpp index a5539f37c..3937ebf8d 100644 --- a/gl/gltexloaders.cpp +++ b/gl/gltexloaders.cpp @@ -1123,13 +1123,25 @@ GLuint texLoadNIF( QIODevice & f, QString & texformat ) { // (public function, documented in gltexloaders.h) -bool texLoad( const QString & filepath, QString & format, GLuint & width, GLuint & height, GLuint & mipmaps ) +bool texLoad( const QString & filepath, QString & format, GLuint & width, GLuint & height, GLuint & mipmaps, QByteArray & data ) { width = height = mipmaps = 0; - QFile f( filepath ); + if ( data.isEmpty() ) { + QFile tmpF( filepath ); + if ( ! tmpF.open( QIODevice::ReadOnly ) ) + throw QString( "could not open file" ); + + data = tmpF.readAll(); + + tmpF.close(); + + if ( data.isEmpty() ) return false; + } + + QBuffer f( &data ); if ( ! f.open( QIODevice::ReadOnly ) ) - throw QString( "could not open file" ); + throw QString( "could not open buffer" ); if ( filepath.endsWith( ".dds", Qt::CaseInsensitive ) ) mipmaps = texLoadDDS( f, format ); @@ -1141,6 +1153,8 @@ bool texLoad( const QString & filepath, QString & format, GLuint & width, GLuint mipmaps = texLoadNIF( f, format ); else throw QString( "unknown texture format" ); + + f.close(); glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, (GLint *) & width ); glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, (GLint *) & height ); diff --git a/gl/gltexloaders.h b/gl/gltexloaders.h index 73093229b..03753566d 100644 --- a/gl/gltexloaders.h +++ b/gl/gltexloaders.h @@ -49,7 +49,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * \param mipmaps Contains the number of mipmaps on successful load. * \return true if the load was successful, false otherwise. */ -extern bool texLoad( const QString & filepath, QString & format, GLuint & width, GLuint & height, GLuint & mipmaps ); +extern bool texLoad( const QString & filepath, QString & format, GLuint & width, GLuint & height, GLuint & mipmaps, QByteArray & data = QByteArray() ); //! A function for loading textures. /*! From f32e72fccf341c5c3c764c4e8ab11173b5df18ae Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 14:21:41 -0500 Subject: [PATCH 024/836] [Restructure] Reorganize files (No File edits) --- .gitmodules | 2 +- Doxyfile.in => build/Doxyfile.in | 0 README.txt.in => build/README.txt.in | 0 .../doxygen_makeapidocs.bat | 0 .../doxygen_makeapidocs.sh | 0 .../doxygen_makeqttag.bat | 0 doxygen_makeqttag.sh => build/doxygen_makeqttag.sh | 0 makeconfig.sh => build/makeconfig.sh | 0 .../qhull-mingw-w64-patch.diff | 0 NifMopp.dll => dep/NifMopp.dll | Bin .../linux-install}/maketarball.sh | 0 .../linux-install}/nifskope.desktop | 0 .../linux-install}/nifskope.spec.in | 0 .../linux-install}/vnd.gamebryo-kf.xml | 0 .../linux-install}/vnd.gamebryo-kfm.xml | 0 .../linux-install}/vnd.gamebryo-nif.xml | 0 {win-install => install/win-install}/inst.ico | Bin {win-install => install/win-install}/makeexe.bat | 0 {win-install => install/win-install}/makeexe.sh | 0 {win-install => install/win-install}/nif_file.ico | Bin .../win-install}/nifskope-fedora-mingw-dynamic.nsi | 0 .../win-install}/nifskope-mingw-dynamic.nsi | 0 .../win-install}/nifskope-mingw-static.nsi | 0 .../win-install}/nifskope-msvc-static.nsi | 0 {win-install => install/win-install}/nifskope.nsh | 0 .../win-install}/nifskope.svnrev.in | 0 {NvTriStrip => lib/NvTriStrip}/NvTriStrip.cpp | 0 {NvTriStrip => lib/NvTriStrip}/NvTriStrip.h | 0 .../NvTriStrip}/NvTriStripObjects.cpp | 0 {NvTriStrip => lib/NvTriStrip}/NvTriStripObjects.h | 0 {NvTriStrip => lib/NvTriStrip}/VertexCache.cpp | 0 {NvTriStrip => lib/NvTriStrip}/VertexCache.h | 0 {fsengine => lib/fsengine}/bsa.cpp | 0 {fsengine => lib/fsengine}/bsa.h | 0 {fsengine => lib/fsengine}/bsatest.pro | 0 {fsengine => lib/fsengine}/fsengine.cpp | 0 {fsengine => lib/fsengine}/fsengine.h | 0 {fsengine => lib/fsengine}/fsmanager.cpp | 0 {fsengine => lib/fsengine}/fsmanager.h | 0 qhull => lib/qhull | 0 icon.ico => res/icon.ico | Bin icon.rc => res/icon.rc | 0 {resources => res/icon}/arrow_left.png | Bin {resources => res/icon}/arrow_right.png | Bin {resources => res/icon}/button_loop.png | Bin {resources => res/icon}/button_play.png | Bin {resources => res/icon}/button_switch.png | Bin {resources => res/icon}/button_view_flip.png | Bin {resources => res/icon}/button_view_front.png | Bin {resources => res/icon}/button_view_pers.png | Bin {resources => res/icon}/button_view_side.png | Bin {resources => res/icon}/button_view_top.png | Bin {resources => res/icon}/button_view_user.png | Bin {resources => res/icon}/button_view_walk.png | Bin {resources => res/icon}/havok_logo.png | Bin {resources => res/icon}/img_flag.png | Bin {resources => res/icon}/img_link.png | Bin {resources => res/icon}/img_update.png | Bin {resources => res/icon}/qhull_cone.gif | Bin {lang => res/lang}/NifSkope_de.ts | 0 {lang => res/lang}/NifSkope_fr.ts | 0 nifskope.png => res/nifskope.png | Bin nifskope.qrc => res/nifskope.qrc | 0 {shaders => res/shaders}/ob_glowmap.vert | 0 {shaders => res/shaders}/ob_material_default.vert | 0 {shaders => res/shaders}/ob_normal+glowmap.prog | 0 {shaders => res/shaders}/ob_normalglowmap.frag | 0 {shaders => res/shaders}/ob_normalmap.frag | 0 {shaders => res/shaders}/ob_normalmap.prog | 0 {shaders => res/shaders}/ob_normalmap_vcol_ad.prog | 0 {shaders => res/shaders}/ob_normalmap_vcol_e.prog | 0 {shaders => res/shaders}/ob_parallax+glowmap.prog | 0 {shaders => res/shaders}/ob_parallax.frag | 0 {shaders => res/shaders}/ob_parallax.prog | 0 {shaders => res/shaders}/ob_parallax_vcol_ad.prog | 0 {shaders => res/shaders}/ob_parallax_vcol_e.prog | 0 {shaders => res/shaders}/ob_parallaxglowmap.frag | 0 {shaders => res/shaders}/ob_vcolors_ad.vert | 0 {shaders => res/shaders}/ob_vcolors_e.vert | 0 style.qss => res/style.qss | 0 basemodel.cpp => src/basemodel.cpp | 0 basemodel.h => src/basemodel.h | 0 config.h => src/config.h | 0 {gl => src/gl}/GLee.cpp | 0 {gl => src/gl}/GLee.h | 0 {gl => src/gl}/dds/BlockDXT.cpp | 0 {gl => src/gl}/dds/BlockDXT.h | 0 {gl => src/gl}/dds/Color.h | 0 {gl => src/gl}/dds/ColorBlock.cpp | 0 {gl => src/gl}/dds/ColorBlock.h | 0 {gl => src/gl}/dds/Common.h | 0 {gl => src/gl}/dds/DirectDrawSurface.cpp | 0 {gl => src/gl}/dds/DirectDrawSurface.h | 0 {gl => src/gl}/dds/Image.cpp | 0 {gl => src/gl}/dds/Image.h | 0 {gl => src/gl}/dds/PixelFormat.h | 0 {gl => src/gl}/dds/Stream.cpp | 0 {gl => src/gl}/dds/Stream.h | 0 {gl => src/gl}/dds/dds_api.cpp | 0 {gl => src/gl}/dds/dds_api.h | 0 {gl => src/gl}/glcontrolable.h | 0 {gl => src/gl}/glcontroller.cpp | 0 {gl => src/gl}/glcontroller.h | 0 {gl => src/gl}/glmarker.cpp | 0 {gl => src/gl}/glmarker.h | 0 {gl => src/gl}/glmesh.cpp | 0 {gl => src/gl}/glmesh.h | 0 {gl => src/gl}/glnode.cpp | 0 {gl => src/gl}/glnode.h | 0 {gl => src/gl}/glparticles.cpp | 0 {gl => src/gl}/glparticles.h | 0 {gl => src/gl}/glproperty.cpp | 0 {gl => src/gl}/glproperty.h | 0 {gl => src/gl}/glscene.cpp | 0 {gl => src/gl}/glscene.h | 0 {gl => src/gl}/gltex.cpp | 0 {gl => src/gl}/gltex.h | 0 {gl => src/gl}/gltexloaders.cpp | 0 {gl => src/gl}/gltexloaders.h | 0 {gl => src/gl}/gltools.cpp | 0 {gl => src/gl}/gltools.h | 0 {gl => src/gl}/marker/constraints.h | 0 {gl => src/gl}/marker/furniture.h | 0 {gl => src/gl}/renderer.cpp | 0 {gl => src/gl}/renderer.h | 0 glview.cpp => src/glview.cpp | 0 glview.h => src/glview.h | 0 hacking.h => src/hacking.h | 0 {importex => src/importex}/3ds.cpp | 0 {importex => src/importex}/3ds.h | 0 {importex => src/importex}/col.cpp | 0 {importex => src/importex}/importex.cpp | 0 {importex => src/importex}/obj.cpp | 0 kfmmodel.cpp => src/kfmmodel.cpp | 0 kfmmodel.h => src/kfmmodel.h | 0 kfmxml.cpp => src/kfmxml.cpp | 0 message.cpp => src/message.cpp | 0 message.h => src/message.h | 0 nifdelegate.cpp => src/nifdelegate.cpp | 0 nifexpr.cpp => src/nifexpr.cpp | 0 nifexpr.h => src/nifexpr.h | 0 nifitem.h => src/nifitem.h | 0 nifmodel.cpp => src/nifmodel.cpp | 0 nifmodel.h => src/nifmodel.h | 0 nifproxy.cpp => src/nifproxy.cpp | 0 nifproxy.h => src/nifproxy.h | 0 nifskope.cpp => src/nifskope.cpp | 0 nifskope.h => src/nifskope.h | 0 niftypes.cpp => src/niftypes.cpp | 0 niftypes.h => src/niftypes.h | 0 nifvalue.cpp => src/nifvalue.cpp | 0 nifvalue.h => src/nifvalue.h | 0 nifxml.cpp => src/nifxml.cpp | 0 options.cpp => src/options.cpp | 0 options.h => src/options.h | 0 qhull.cpp => src/qhull.cpp | 0 qhull.h => src/qhull.h | 0 {NvTriStrip => src}/qtwrapper.cpp | 0 {NvTriStrip => src}/qtwrapper.h | 0 spellbook.cpp => src/spellbook.cpp | 0 spellbook.h => src/spellbook.h | 0 {spells => src/spells}/animation.cpp | 0 {spells => src/spells}/blocks.cpp | 0 {spells => src/spells}/blocks.h | 0 {spells => src/spells}/bounds.cpp | 0 {spells => src/spells}/color.cpp | 0 {spells => src/spells}/flags.cpp | 0 {spells => src/spells}/fo3only.cpp | 0 {spells => src/spells}/havok.cpp | 0 {spells => src/spells}/headerstring.cpp | 0 {spells => src/spells}/light.cpp | 0 {spells => src/spells}/material.cpp | 0 {spells => src/spells}/mesh.cpp | 0 {spells => src/spells}/mesh.h | 0 {spells => src/spells}/misc.cpp | 0 {spells => src/spells}/misc.h | 0 {spells => src/spells}/moppcode.cpp | 0 {spells => src/spells}/morphctrl.cpp | 0 {spells => src/spells}/normals.cpp | 0 {spells => src/spells}/optimize.cpp | 0 {spells => src/spells}/sanitize.cpp | 0 {spells => src/spells}/skel.dat | Bin {spells => src/spells}/skeleton.cpp | 0 {spells => src/spells}/skeleton.h | 0 {spells => src/spells}/stringpalette.cpp | 0 {spells => src/spells}/stringpalette.h | 0 {spells => src/spells}/strippify.cpp | 0 {spells => src/spells}/tangentspace.cpp | 0 {spells => src/spells}/tangentspace.h | 0 {spells => src/spells}/texture.cpp | 0 {spells => src/spells}/texture.h | 0 {spells => src/spells}/transform.cpp | 0 {spells => src/spells}/transform.h | 0 {ui => src/ui}/about_dialog.cpp | 0 {ui => src/ui}/about_dialog.h | 0 {ui => src/ui}/about_dialog.ui | 0 {widgets => src/widgets}/colorwheel.cpp | 0 {widgets => src/widgets}/colorwheel.h | 0 {widgets => src/widgets}/copyfnam.cpp | 0 {widgets => src/widgets}/copyfnam.h | 0 {widgets => src/widgets}/fileselect.cpp | 0 {widgets => src/widgets}/fileselect.h | 0 {widgets => src/widgets}/floatedit.cpp | 0 {widgets => src/widgets}/floatedit.h | 0 {widgets => src/widgets}/floatslider.cpp | 0 {widgets => src/widgets}/floatslider.h | 0 {widgets => src/widgets}/groupbox.cpp | 0 {widgets => src/widgets}/groupbox.h | 0 {widgets => src/widgets}/inspect.cpp | 0 {widgets => src/widgets}/inspect.h | 0 {widgets => src/widgets}/nifcheckboxlist.cpp | 0 {widgets => src/widgets}/nifcheckboxlist.h | 0 {widgets => src/widgets}/nifeditors.cpp | 0 {widgets => src/widgets}/nifeditors.h | 0 {widgets => src/widgets}/nifview.cpp | 0 {widgets => src/widgets}/nifview.h | 0 {widgets => src/widgets}/refrbrowser.cpp | 0 {widgets => src/widgets}/refrbrowser.h | 0 {widgets => src/widgets}/uvedit.cpp | 0 {widgets => src/widgets}/uvedit.h | 0 {widgets => src/widgets}/valueedit.cpp | 0 {widgets => src/widgets}/valueedit.h | 0 {widgets => src/widgets}/xmlcheck.cpp | 0 {widgets => src/widgets}/xmlcheck.h | 0 224 files changed, 1 insertion(+), 1 deletion(-) rename Doxyfile.in => build/Doxyfile.in (100%) rename README.txt.in => build/README.txt.in (100%) rename doxygen_makeapidocs.bat => build/doxygen_makeapidocs.bat (100%) rename doxygen_makeapidocs.sh => build/doxygen_makeapidocs.sh (100%) mode change 100755 => 100644 rename doxygen_makeqttag.bat => build/doxygen_makeqttag.bat (100%) rename doxygen_makeqttag.sh => build/doxygen_makeqttag.sh (100%) mode change 100755 => 100644 rename makeconfig.sh => build/makeconfig.sh (100%) mode change 100755 => 100644 rename qhull-mingw-w64-patch.diff => build/qhull-mingw-w64-patch.diff (100%) rename NifMopp.dll => dep/NifMopp.dll (100%) rename {linux-install => install/linux-install}/maketarball.sh (100%) mode change 100755 => 100644 rename {linux-install => install/linux-install}/nifskope.desktop (100%) rename {linux-install => install/linux-install}/nifskope.spec.in (100%) rename {linux-install => install/linux-install}/vnd.gamebryo-kf.xml (100%) rename {linux-install => install/linux-install}/vnd.gamebryo-kfm.xml (100%) rename {linux-install => install/linux-install}/vnd.gamebryo-nif.xml (100%) rename {win-install => install/win-install}/inst.ico (100%) rename {win-install => install/win-install}/makeexe.bat (100%) rename {win-install => install/win-install}/makeexe.sh (100%) mode change 100755 => 100644 rename {win-install => install/win-install}/nif_file.ico (100%) rename {win-install => install/win-install}/nifskope-fedora-mingw-dynamic.nsi (100%) rename {win-install => install/win-install}/nifskope-mingw-dynamic.nsi (100%) rename {win-install => install/win-install}/nifskope-mingw-static.nsi (100%) rename {win-install => install/win-install}/nifskope-msvc-static.nsi (100%) rename {win-install => install/win-install}/nifskope.nsh (100%) rename {win-install => install/win-install}/nifskope.svnrev.in (100%) rename {NvTriStrip => lib/NvTriStrip}/NvTriStrip.cpp (100%) rename {NvTriStrip => lib/NvTriStrip}/NvTriStrip.h (100%) rename {NvTriStrip => lib/NvTriStrip}/NvTriStripObjects.cpp (100%) rename {NvTriStrip => lib/NvTriStrip}/NvTriStripObjects.h (100%) rename {NvTriStrip => lib/NvTriStrip}/VertexCache.cpp (100%) rename {NvTriStrip => lib/NvTriStrip}/VertexCache.h (100%) rename {fsengine => lib/fsengine}/bsa.cpp (100%) rename {fsengine => lib/fsengine}/bsa.h (100%) rename {fsengine => lib/fsengine}/bsatest.pro (100%) rename {fsengine => lib/fsengine}/fsengine.cpp (100%) rename {fsengine => lib/fsengine}/fsengine.h (100%) rename {fsengine => lib/fsengine}/fsmanager.cpp (100%) rename {fsengine => lib/fsengine}/fsmanager.h (100%) rename qhull => lib/qhull (100%) rename icon.ico => res/icon.ico (100%) rename icon.rc => res/icon.rc (100%) rename {resources => res/icon}/arrow_left.png (100%) rename {resources => res/icon}/arrow_right.png (100%) rename {resources => res/icon}/button_loop.png (100%) rename {resources => res/icon}/button_play.png (100%) rename {resources => res/icon}/button_switch.png (100%) rename {resources => res/icon}/button_view_flip.png (100%) rename {resources => res/icon}/button_view_front.png (100%) rename {resources => res/icon}/button_view_pers.png (100%) rename {resources => res/icon}/button_view_side.png (100%) rename {resources => res/icon}/button_view_top.png (100%) rename {resources => res/icon}/button_view_user.png (100%) rename {resources => res/icon}/button_view_walk.png (100%) rename {resources => res/icon}/havok_logo.png (100%) rename {resources => res/icon}/img_flag.png (100%) rename {resources => res/icon}/img_link.png (100%) rename {resources => res/icon}/img_update.png (100%) rename {resources => res/icon}/qhull_cone.gif (100%) rename {lang => res/lang}/NifSkope_de.ts (100%) rename {lang => res/lang}/NifSkope_fr.ts (100%) rename nifskope.png => res/nifskope.png (100%) rename nifskope.qrc => res/nifskope.qrc (100%) rename {shaders => res/shaders}/ob_glowmap.vert (100%) rename {shaders => res/shaders}/ob_material_default.vert (100%) rename {shaders => res/shaders}/ob_normal+glowmap.prog (100%) rename {shaders => res/shaders}/ob_normalglowmap.frag (100%) rename {shaders => res/shaders}/ob_normalmap.frag (100%) rename {shaders => res/shaders}/ob_normalmap.prog (100%) rename {shaders => res/shaders}/ob_normalmap_vcol_ad.prog (100%) rename {shaders => res/shaders}/ob_normalmap_vcol_e.prog (100%) rename {shaders => res/shaders}/ob_parallax+glowmap.prog (100%) rename {shaders => res/shaders}/ob_parallax.frag (100%) rename {shaders => res/shaders}/ob_parallax.prog (100%) rename {shaders => res/shaders}/ob_parallax_vcol_ad.prog (100%) rename {shaders => res/shaders}/ob_parallax_vcol_e.prog (100%) rename {shaders => res/shaders}/ob_parallaxglowmap.frag (100%) rename {shaders => res/shaders}/ob_vcolors_ad.vert (100%) rename {shaders => res/shaders}/ob_vcolors_e.vert (100%) rename style.qss => res/style.qss (100%) rename basemodel.cpp => src/basemodel.cpp (100%) rename basemodel.h => src/basemodel.h (100%) rename config.h => src/config.h (100%) rename {gl => src/gl}/GLee.cpp (100%) rename {gl => src/gl}/GLee.h (100%) rename {gl => src/gl}/dds/BlockDXT.cpp (100%) rename {gl => src/gl}/dds/BlockDXT.h (100%) rename {gl => src/gl}/dds/Color.h (100%) rename {gl => src/gl}/dds/ColorBlock.cpp (100%) rename {gl => src/gl}/dds/ColorBlock.h (100%) rename {gl => src/gl}/dds/Common.h (100%) rename {gl => src/gl}/dds/DirectDrawSurface.cpp (100%) rename {gl => src/gl}/dds/DirectDrawSurface.h (100%) rename {gl => src/gl}/dds/Image.cpp (100%) rename {gl => src/gl}/dds/Image.h (100%) rename {gl => src/gl}/dds/PixelFormat.h (100%) rename {gl => src/gl}/dds/Stream.cpp (100%) rename {gl => src/gl}/dds/Stream.h (100%) rename {gl => src/gl}/dds/dds_api.cpp (100%) rename {gl => src/gl}/dds/dds_api.h (100%) rename {gl => src/gl}/glcontrolable.h (100%) rename {gl => src/gl}/glcontroller.cpp (100%) rename {gl => src/gl}/glcontroller.h (100%) rename {gl => src/gl}/glmarker.cpp (100%) rename {gl => src/gl}/glmarker.h (100%) rename {gl => src/gl}/glmesh.cpp (100%) rename {gl => src/gl}/glmesh.h (100%) rename {gl => src/gl}/glnode.cpp (100%) rename {gl => src/gl}/glnode.h (100%) rename {gl => src/gl}/glparticles.cpp (100%) rename {gl => src/gl}/glparticles.h (100%) rename {gl => src/gl}/glproperty.cpp (100%) rename {gl => src/gl}/glproperty.h (100%) rename {gl => src/gl}/glscene.cpp (100%) rename {gl => src/gl}/glscene.h (100%) rename {gl => src/gl}/gltex.cpp (100%) rename {gl => src/gl}/gltex.h (100%) rename {gl => src/gl}/gltexloaders.cpp (100%) rename {gl => src/gl}/gltexloaders.h (100%) rename {gl => src/gl}/gltools.cpp (100%) rename {gl => src/gl}/gltools.h (100%) rename {gl => src/gl}/marker/constraints.h (100%) rename {gl => src/gl}/marker/furniture.h (100%) rename {gl => src/gl}/renderer.cpp (100%) rename {gl => src/gl}/renderer.h (100%) rename glview.cpp => src/glview.cpp (100%) rename glview.h => src/glview.h (100%) rename hacking.h => src/hacking.h (100%) rename {importex => src/importex}/3ds.cpp (100%) rename {importex => src/importex}/3ds.h (100%) rename {importex => src/importex}/col.cpp (100%) rename {importex => src/importex}/importex.cpp (100%) rename {importex => src/importex}/obj.cpp (100%) rename kfmmodel.cpp => src/kfmmodel.cpp (100%) rename kfmmodel.h => src/kfmmodel.h (100%) rename kfmxml.cpp => src/kfmxml.cpp (100%) rename message.cpp => src/message.cpp (100%) rename message.h => src/message.h (100%) rename nifdelegate.cpp => src/nifdelegate.cpp (100%) rename nifexpr.cpp => src/nifexpr.cpp (100%) rename nifexpr.h => src/nifexpr.h (100%) rename nifitem.h => src/nifitem.h (100%) rename nifmodel.cpp => src/nifmodel.cpp (100%) rename nifmodel.h => src/nifmodel.h (100%) rename nifproxy.cpp => src/nifproxy.cpp (100%) rename nifproxy.h => src/nifproxy.h (100%) rename nifskope.cpp => src/nifskope.cpp (100%) rename nifskope.h => src/nifskope.h (100%) rename niftypes.cpp => src/niftypes.cpp (100%) rename niftypes.h => src/niftypes.h (100%) rename nifvalue.cpp => src/nifvalue.cpp (100%) rename nifvalue.h => src/nifvalue.h (100%) rename nifxml.cpp => src/nifxml.cpp (100%) rename options.cpp => src/options.cpp (100%) rename options.h => src/options.h (100%) rename qhull.cpp => src/qhull.cpp (100%) rename qhull.h => src/qhull.h (100%) rename {NvTriStrip => src}/qtwrapper.cpp (100%) rename {NvTriStrip => src}/qtwrapper.h (100%) rename spellbook.cpp => src/spellbook.cpp (100%) rename spellbook.h => src/spellbook.h (100%) rename {spells => src/spells}/animation.cpp (100%) rename {spells => src/spells}/blocks.cpp (100%) rename {spells => src/spells}/blocks.h (100%) rename {spells => src/spells}/bounds.cpp (100%) rename {spells => src/spells}/color.cpp (100%) rename {spells => src/spells}/flags.cpp (100%) rename {spells => src/spells}/fo3only.cpp (100%) rename {spells => src/spells}/havok.cpp (100%) rename {spells => src/spells}/headerstring.cpp (100%) rename {spells => src/spells}/light.cpp (100%) rename {spells => src/spells}/material.cpp (100%) rename {spells => src/spells}/mesh.cpp (100%) rename {spells => src/spells}/mesh.h (100%) rename {spells => src/spells}/misc.cpp (100%) rename {spells => src/spells}/misc.h (100%) rename {spells => src/spells}/moppcode.cpp (100%) rename {spells => src/spells}/morphctrl.cpp (100%) rename {spells => src/spells}/normals.cpp (100%) rename {spells => src/spells}/optimize.cpp (100%) rename {spells => src/spells}/sanitize.cpp (100%) rename {spells => src/spells}/skel.dat (100%) rename {spells => src/spells}/skeleton.cpp (100%) rename {spells => src/spells}/skeleton.h (100%) rename {spells => src/spells}/stringpalette.cpp (100%) rename {spells => src/spells}/stringpalette.h (100%) rename {spells => src/spells}/strippify.cpp (100%) rename {spells => src/spells}/tangentspace.cpp (100%) rename {spells => src/spells}/tangentspace.h (100%) rename {spells => src/spells}/texture.cpp (100%) rename {spells => src/spells}/texture.h (100%) rename {spells => src/spells}/transform.cpp (100%) rename {spells => src/spells}/transform.h (100%) rename {ui => src/ui}/about_dialog.cpp (100%) rename {ui => src/ui}/about_dialog.h (100%) rename {ui => src/ui}/about_dialog.ui (100%) rename {widgets => src/widgets}/colorwheel.cpp (100%) rename {widgets => src/widgets}/colorwheel.h (100%) rename {widgets => src/widgets}/copyfnam.cpp (100%) rename {widgets => src/widgets}/copyfnam.h (100%) rename {widgets => src/widgets}/fileselect.cpp (100%) rename {widgets => src/widgets}/fileselect.h (100%) rename {widgets => src/widgets}/floatedit.cpp (100%) rename {widgets => src/widgets}/floatedit.h (100%) rename {widgets => src/widgets}/floatslider.cpp (100%) rename {widgets => src/widgets}/floatslider.h (100%) rename {widgets => src/widgets}/groupbox.cpp (100%) rename {widgets => src/widgets}/groupbox.h (100%) rename {widgets => src/widgets}/inspect.cpp (100%) rename {widgets => src/widgets}/inspect.h (100%) rename {widgets => src/widgets}/nifcheckboxlist.cpp (100%) rename {widgets => src/widgets}/nifcheckboxlist.h (100%) rename {widgets => src/widgets}/nifeditors.cpp (100%) rename {widgets => src/widgets}/nifeditors.h (100%) rename {widgets => src/widgets}/nifview.cpp (100%) rename {widgets => src/widgets}/nifview.h (100%) rename {widgets => src/widgets}/refrbrowser.cpp (100%) rename {widgets => src/widgets}/refrbrowser.h (100%) rename {widgets => src/widgets}/uvedit.cpp (100%) rename {widgets => src/widgets}/uvedit.h (100%) rename {widgets => src/widgets}/valueedit.cpp (100%) rename {widgets => src/widgets}/valueedit.h (100%) rename {widgets => src/widgets}/xmlcheck.cpp (100%) rename {widgets => src/widgets}/xmlcheck.h (100%) diff --git a/.gitmodules b/.gitmodules index f9d3204ea..d82e9563a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = docsys url = git://niftools.git.sourceforge.net/gitroot/niftools/nifdocsys [submodule "qhull"] - path = qhull + path = lib/qhull url = git://gitorious.org/qhull/qhull.git diff --git a/Doxyfile.in b/build/Doxyfile.in similarity index 100% rename from Doxyfile.in rename to build/Doxyfile.in diff --git a/README.txt.in b/build/README.txt.in similarity index 100% rename from README.txt.in rename to build/README.txt.in diff --git a/doxygen_makeapidocs.bat b/build/doxygen_makeapidocs.bat similarity index 100% rename from doxygen_makeapidocs.bat rename to build/doxygen_makeapidocs.bat diff --git a/doxygen_makeapidocs.sh b/build/doxygen_makeapidocs.sh old mode 100755 new mode 100644 similarity index 100% rename from doxygen_makeapidocs.sh rename to build/doxygen_makeapidocs.sh diff --git a/doxygen_makeqttag.bat b/build/doxygen_makeqttag.bat similarity index 100% rename from doxygen_makeqttag.bat rename to build/doxygen_makeqttag.bat diff --git a/doxygen_makeqttag.sh b/build/doxygen_makeqttag.sh old mode 100755 new mode 100644 similarity index 100% rename from doxygen_makeqttag.sh rename to build/doxygen_makeqttag.sh diff --git a/makeconfig.sh b/build/makeconfig.sh old mode 100755 new mode 100644 similarity index 100% rename from makeconfig.sh rename to build/makeconfig.sh diff --git a/qhull-mingw-w64-patch.diff b/build/qhull-mingw-w64-patch.diff similarity index 100% rename from qhull-mingw-w64-patch.diff rename to build/qhull-mingw-w64-patch.diff diff --git a/NifMopp.dll b/dep/NifMopp.dll similarity index 100% rename from NifMopp.dll rename to dep/NifMopp.dll diff --git a/linux-install/maketarball.sh b/install/linux-install/maketarball.sh old mode 100755 new mode 100644 similarity index 100% rename from linux-install/maketarball.sh rename to install/linux-install/maketarball.sh diff --git a/linux-install/nifskope.desktop b/install/linux-install/nifskope.desktop similarity index 100% rename from linux-install/nifskope.desktop rename to install/linux-install/nifskope.desktop diff --git a/linux-install/nifskope.spec.in b/install/linux-install/nifskope.spec.in similarity index 100% rename from linux-install/nifskope.spec.in rename to install/linux-install/nifskope.spec.in diff --git a/linux-install/vnd.gamebryo-kf.xml b/install/linux-install/vnd.gamebryo-kf.xml similarity index 100% rename from linux-install/vnd.gamebryo-kf.xml rename to install/linux-install/vnd.gamebryo-kf.xml diff --git a/linux-install/vnd.gamebryo-kfm.xml b/install/linux-install/vnd.gamebryo-kfm.xml similarity index 100% rename from linux-install/vnd.gamebryo-kfm.xml rename to install/linux-install/vnd.gamebryo-kfm.xml diff --git a/linux-install/vnd.gamebryo-nif.xml b/install/linux-install/vnd.gamebryo-nif.xml similarity index 100% rename from linux-install/vnd.gamebryo-nif.xml rename to install/linux-install/vnd.gamebryo-nif.xml diff --git a/win-install/inst.ico b/install/win-install/inst.ico similarity index 100% rename from win-install/inst.ico rename to install/win-install/inst.ico diff --git a/win-install/makeexe.bat b/install/win-install/makeexe.bat similarity index 100% rename from win-install/makeexe.bat rename to install/win-install/makeexe.bat diff --git a/win-install/makeexe.sh b/install/win-install/makeexe.sh old mode 100755 new mode 100644 similarity index 100% rename from win-install/makeexe.sh rename to install/win-install/makeexe.sh diff --git a/win-install/nif_file.ico b/install/win-install/nif_file.ico similarity index 100% rename from win-install/nif_file.ico rename to install/win-install/nif_file.ico diff --git a/win-install/nifskope-fedora-mingw-dynamic.nsi b/install/win-install/nifskope-fedora-mingw-dynamic.nsi similarity index 100% rename from win-install/nifskope-fedora-mingw-dynamic.nsi rename to install/win-install/nifskope-fedora-mingw-dynamic.nsi diff --git a/win-install/nifskope-mingw-dynamic.nsi b/install/win-install/nifskope-mingw-dynamic.nsi similarity index 100% rename from win-install/nifskope-mingw-dynamic.nsi rename to install/win-install/nifskope-mingw-dynamic.nsi diff --git a/win-install/nifskope-mingw-static.nsi b/install/win-install/nifskope-mingw-static.nsi similarity index 100% rename from win-install/nifskope-mingw-static.nsi rename to install/win-install/nifskope-mingw-static.nsi diff --git a/win-install/nifskope-msvc-static.nsi b/install/win-install/nifskope-msvc-static.nsi similarity index 100% rename from win-install/nifskope-msvc-static.nsi rename to install/win-install/nifskope-msvc-static.nsi diff --git a/win-install/nifskope.nsh b/install/win-install/nifskope.nsh similarity index 100% rename from win-install/nifskope.nsh rename to install/win-install/nifskope.nsh diff --git a/win-install/nifskope.svnrev.in b/install/win-install/nifskope.svnrev.in similarity index 100% rename from win-install/nifskope.svnrev.in rename to install/win-install/nifskope.svnrev.in diff --git a/NvTriStrip/NvTriStrip.cpp b/lib/NvTriStrip/NvTriStrip.cpp similarity index 100% rename from NvTriStrip/NvTriStrip.cpp rename to lib/NvTriStrip/NvTriStrip.cpp diff --git a/NvTriStrip/NvTriStrip.h b/lib/NvTriStrip/NvTriStrip.h similarity index 100% rename from NvTriStrip/NvTriStrip.h rename to lib/NvTriStrip/NvTriStrip.h diff --git a/NvTriStrip/NvTriStripObjects.cpp b/lib/NvTriStrip/NvTriStripObjects.cpp similarity index 100% rename from NvTriStrip/NvTriStripObjects.cpp rename to lib/NvTriStrip/NvTriStripObjects.cpp diff --git a/NvTriStrip/NvTriStripObjects.h b/lib/NvTriStrip/NvTriStripObjects.h similarity index 100% rename from NvTriStrip/NvTriStripObjects.h rename to lib/NvTriStrip/NvTriStripObjects.h diff --git a/NvTriStrip/VertexCache.cpp b/lib/NvTriStrip/VertexCache.cpp similarity index 100% rename from NvTriStrip/VertexCache.cpp rename to lib/NvTriStrip/VertexCache.cpp diff --git a/NvTriStrip/VertexCache.h b/lib/NvTriStrip/VertexCache.h similarity index 100% rename from NvTriStrip/VertexCache.h rename to lib/NvTriStrip/VertexCache.h diff --git a/fsengine/bsa.cpp b/lib/fsengine/bsa.cpp similarity index 100% rename from fsengine/bsa.cpp rename to lib/fsengine/bsa.cpp diff --git a/fsengine/bsa.h b/lib/fsengine/bsa.h similarity index 100% rename from fsengine/bsa.h rename to lib/fsengine/bsa.h diff --git a/fsengine/bsatest.pro b/lib/fsengine/bsatest.pro similarity index 100% rename from fsengine/bsatest.pro rename to lib/fsengine/bsatest.pro diff --git a/fsengine/fsengine.cpp b/lib/fsengine/fsengine.cpp similarity index 100% rename from fsengine/fsengine.cpp rename to lib/fsengine/fsengine.cpp diff --git a/fsengine/fsengine.h b/lib/fsengine/fsengine.h similarity index 100% rename from fsengine/fsengine.h rename to lib/fsengine/fsengine.h diff --git a/fsengine/fsmanager.cpp b/lib/fsengine/fsmanager.cpp similarity index 100% rename from fsengine/fsmanager.cpp rename to lib/fsengine/fsmanager.cpp diff --git a/fsengine/fsmanager.h b/lib/fsengine/fsmanager.h similarity index 100% rename from fsengine/fsmanager.h rename to lib/fsengine/fsmanager.h diff --git a/qhull b/lib/qhull similarity index 100% rename from qhull rename to lib/qhull diff --git a/icon.ico b/res/icon.ico similarity index 100% rename from icon.ico rename to res/icon.ico diff --git a/icon.rc b/res/icon.rc similarity index 100% rename from icon.rc rename to res/icon.rc diff --git a/resources/arrow_left.png b/res/icon/arrow_left.png similarity index 100% rename from resources/arrow_left.png rename to res/icon/arrow_left.png diff --git a/resources/arrow_right.png b/res/icon/arrow_right.png similarity index 100% rename from resources/arrow_right.png rename to res/icon/arrow_right.png diff --git a/resources/button_loop.png b/res/icon/button_loop.png similarity index 100% rename from resources/button_loop.png rename to res/icon/button_loop.png diff --git a/resources/button_play.png b/res/icon/button_play.png similarity index 100% rename from resources/button_play.png rename to res/icon/button_play.png diff --git a/resources/button_switch.png b/res/icon/button_switch.png similarity index 100% rename from resources/button_switch.png rename to res/icon/button_switch.png diff --git a/resources/button_view_flip.png b/res/icon/button_view_flip.png similarity index 100% rename from resources/button_view_flip.png rename to res/icon/button_view_flip.png diff --git a/resources/button_view_front.png b/res/icon/button_view_front.png similarity index 100% rename from resources/button_view_front.png rename to res/icon/button_view_front.png diff --git a/resources/button_view_pers.png b/res/icon/button_view_pers.png similarity index 100% rename from resources/button_view_pers.png rename to res/icon/button_view_pers.png diff --git a/resources/button_view_side.png b/res/icon/button_view_side.png similarity index 100% rename from resources/button_view_side.png rename to res/icon/button_view_side.png diff --git a/resources/button_view_top.png b/res/icon/button_view_top.png similarity index 100% rename from resources/button_view_top.png rename to res/icon/button_view_top.png diff --git a/resources/button_view_user.png b/res/icon/button_view_user.png similarity index 100% rename from resources/button_view_user.png rename to res/icon/button_view_user.png diff --git a/resources/button_view_walk.png b/res/icon/button_view_walk.png similarity index 100% rename from resources/button_view_walk.png rename to res/icon/button_view_walk.png diff --git a/resources/havok_logo.png b/res/icon/havok_logo.png similarity index 100% rename from resources/havok_logo.png rename to res/icon/havok_logo.png diff --git a/resources/img_flag.png b/res/icon/img_flag.png similarity index 100% rename from resources/img_flag.png rename to res/icon/img_flag.png diff --git a/resources/img_link.png b/res/icon/img_link.png similarity index 100% rename from resources/img_link.png rename to res/icon/img_link.png diff --git a/resources/img_update.png b/res/icon/img_update.png similarity index 100% rename from resources/img_update.png rename to res/icon/img_update.png diff --git a/resources/qhull_cone.gif b/res/icon/qhull_cone.gif similarity index 100% rename from resources/qhull_cone.gif rename to res/icon/qhull_cone.gif diff --git a/lang/NifSkope_de.ts b/res/lang/NifSkope_de.ts similarity index 100% rename from lang/NifSkope_de.ts rename to res/lang/NifSkope_de.ts diff --git a/lang/NifSkope_fr.ts b/res/lang/NifSkope_fr.ts similarity index 100% rename from lang/NifSkope_fr.ts rename to res/lang/NifSkope_fr.ts diff --git a/nifskope.png b/res/nifskope.png similarity index 100% rename from nifskope.png rename to res/nifskope.png diff --git a/nifskope.qrc b/res/nifskope.qrc similarity index 100% rename from nifskope.qrc rename to res/nifskope.qrc diff --git a/shaders/ob_glowmap.vert b/res/shaders/ob_glowmap.vert similarity index 100% rename from shaders/ob_glowmap.vert rename to res/shaders/ob_glowmap.vert diff --git a/shaders/ob_material_default.vert b/res/shaders/ob_material_default.vert similarity index 100% rename from shaders/ob_material_default.vert rename to res/shaders/ob_material_default.vert diff --git a/shaders/ob_normal+glowmap.prog b/res/shaders/ob_normal+glowmap.prog similarity index 100% rename from shaders/ob_normal+glowmap.prog rename to res/shaders/ob_normal+glowmap.prog diff --git a/shaders/ob_normalglowmap.frag b/res/shaders/ob_normalglowmap.frag similarity index 100% rename from shaders/ob_normalglowmap.frag rename to res/shaders/ob_normalglowmap.frag diff --git a/shaders/ob_normalmap.frag b/res/shaders/ob_normalmap.frag similarity index 100% rename from shaders/ob_normalmap.frag rename to res/shaders/ob_normalmap.frag diff --git a/shaders/ob_normalmap.prog b/res/shaders/ob_normalmap.prog similarity index 100% rename from shaders/ob_normalmap.prog rename to res/shaders/ob_normalmap.prog diff --git a/shaders/ob_normalmap_vcol_ad.prog b/res/shaders/ob_normalmap_vcol_ad.prog similarity index 100% rename from shaders/ob_normalmap_vcol_ad.prog rename to res/shaders/ob_normalmap_vcol_ad.prog diff --git a/shaders/ob_normalmap_vcol_e.prog b/res/shaders/ob_normalmap_vcol_e.prog similarity index 100% rename from shaders/ob_normalmap_vcol_e.prog rename to res/shaders/ob_normalmap_vcol_e.prog diff --git a/shaders/ob_parallax+glowmap.prog b/res/shaders/ob_parallax+glowmap.prog similarity index 100% rename from shaders/ob_parallax+glowmap.prog rename to res/shaders/ob_parallax+glowmap.prog diff --git a/shaders/ob_parallax.frag b/res/shaders/ob_parallax.frag similarity index 100% rename from shaders/ob_parallax.frag rename to res/shaders/ob_parallax.frag diff --git a/shaders/ob_parallax.prog b/res/shaders/ob_parallax.prog similarity index 100% rename from shaders/ob_parallax.prog rename to res/shaders/ob_parallax.prog diff --git a/shaders/ob_parallax_vcol_ad.prog b/res/shaders/ob_parallax_vcol_ad.prog similarity index 100% rename from shaders/ob_parallax_vcol_ad.prog rename to res/shaders/ob_parallax_vcol_ad.prog diff --git a/shaders/ob_parallax_vcol_e.prog b/res/shaders/ob_parallax_vcol_e.prog similarity index 100% rename from shaders/ob_parallax_vcol_e.prog rename to res/shaders/ob_parallax_vcol_e.prog diff --git a/shaders/ob_parallaxglowmap.frag b/res/shaders/ob_parallaxglowmap.frag similarity index 100% rename from shaders/ob_parallaxglowmap.frag rename to res/shaders/ob_parallaxglowmap.frag diff --git a/shaders/ob_vcolors_ad.vert b/res/shaders/ob_vcolors_ad.vert similarity index 100% rename from shaders/ob_vcolors_ad.vert rename to res/shaders/ob_vcolors_ad.vert diff --git a/shaders/ob_vcolors_e.vert b/res/shaders/ob_vcolors_e.vert similarity index 100% rename from shaders/ob_vcolors_e.vert rename to res/shaders/ob_vcolors_e.vert diff --git a/style.qss b/res/style.qss similarity index 100% rename from style.qss rename to res/style.qss diff --git a/basemodel.cpp b/src/basemodel.cpp similarity index 100% rename from basemodel.cpp rename to src/basemodel.cpp diff --git a/basemodel.h b/src/basemodel.h similarity index 100% rename from basemodel.h rename to src/basemodel.h diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/gl/GLee.cpp b/src/gl/GLee.cpp similarity index 100% rename from gl/GLee.cpp rename to src/gl/GLee.cpp diff --git a/gl/GLee.h b/src/gl/GLee.h similarity index 100% rename from gl/GLee.h rename to src/gl/GLee.h diff --git a/gl/dds/BlockDXT.cpp b/src/gl/dds/BlockDXT.cpp similarity index 100% rename from gl/dds/BlockDXT.cpp rename to src/gl/dds/BlockDXT.cpp diff --git a/gl/dds/BlockDXT.h b/src/gl/dds/BlockDXT.h similarity index 100% rename from gl/dds/BlockDXT.h rename to src/gl/dds/BlockDXT.h diff --git a/gl/dds/Color.h b/src/gl/dds/Color.h similarity index 100% rename from gl/dds/Color.h rename to src/gl/dds/Color.h diff --git a/gl/dds/ColorBlock.cpp b/src/gl/dds/ColorBlock.cpp similarity index 100% rename from gl/dds/ColorBlock.cpp rename to src/gl/dds/ColorBlock.cpp diff --git a/gl/dds/ColorBlock.h b/src/gl/dds/ColorBlock.h similarity index 100% rename from gl/dds/ColorBlock.h rename to src/gl/dds/ColorBlock.h diff --git a/gl/dds/Common.h b/src/gl/dds/Common.h similarity index 100% rename from gl/dds/Common.h rename to src/gl/dds/Common.h diff --git a/gl/dds/DirectDrawSurface.cpp b/src/gl/dds/DirectDrawSurface.cpp similarity index 100% rename from gl/dds/DirectDrawSurface.cpp rename to src/gl/dds/DirectDrawSurface.cpp diff --git a/gl/dds/DirectDrawSurface.h b/src/gl/dds/DirectDrawSurface.h similarity index 100% rename from gl/dds/DirectDrawSurface.h rename to src/gl/dds/DirectDrawSurface.h diff --git a/gl/dds/Image.cpp b/src/gl/dds/Image.cpp similarity index 100% rename from gl/dds/Image.cpp rename to src/gl/dds/Image.cpp diff --git a/gl/dds/Image.h b/src/gl/dds/Image.h similarity index 100% rename from gl/dds/Image.h rename to src/gl/dds/Image.h diff --git a/gl/dds/PixelFormat.h b/src/gl/dds/PixelFormat.h similarity index 100% rename from gl/dds/PixelFormat.h rename to src/gl/dds/PixelFormat.h diff --git a/gl/dds/Stream.cpp b/src/gl/dds/Stream.cpp similarity index 100% rename from gl/dds/Stream.cpp rename to src/gl/dds/Stream.cpp diff --git a/gl/dds/Stream.h b/src/gl/dds/Stream.h similarity index 100% rename from gl/dds/Stream.h rename to src/gl/dds/Stream.h diff --git a/gl/dds/dds_api.cpp b/src/gl/dds/dds_api.cpp similarity index 100% rename from gl/dds/dds_api.cpp rename to src/gl/dds/dds_api.cpp diff --git a/gl/dds/dds_api.h b/src/gl/dds/dds_api.h similarity index 100% rename from gl/dds/dds_api.h rename to src/gl/dds/dds_api.h diff --git a/gl/glcontrolable.h b/src/gl/glcontrolable.h similarity index 100% rename from gl/glcontrolable.h rename to src/gl/glcontrolable.h diff --git a/gl/glcontroller.cpp b/src/gl/glcontroller.cpp similarity index 100% rename from gl/glcontroller.cpp rename to src/gl/glcontroller.cpp diff --git a/gl/glcontroller.h b/src/gl/glcontroller.h similarity index 100% rename from gl/glcontroller.h rename to src/gl/glcontroller.h diff --git a/gl/glmarker.cpp b/src/gl/glmarker.cpp similarity index 100% rename from gl/glmarker.cpp rename to src/gl/glmarker.cpp diff --git a/gl/glmarker.h b/src/gl/glmarker.h similarity index 100% rename from gl/glmarker.h rename to src/gl/glmarker.h diff --git a/gl/glmesh.cpp b/src/gl/glmesh.cpp similarity index 100% rename from gl/glmesh.cpp rename to src/gl/glmesh.cpp diff --git a/gl/glmesh.h b/src/gl/glmesh.h similarity index 100% rename from gl/glmesh.h rename to src/gl/glmesh.h diff --git a/gl/glnode.cpp b/src/gl/glnode.cpp similarity index 100% rename from gl/glnode.cpp rename to src/gl/glnode.cpp diff --git a/gl/glnode.h b/src/gl/glnode.h similarity index 100% rename from gl/glnode.h rename to src/gl/glnode.h diff --git a/gl/glparticles.cpp b/src/gl/glparticles.cpp similarity index 100% rename from gl/glparticles.cpp rename to src/gl/glparticles.cpp diff --git a/gl/glparticles.h b/src/gl/glparticles.h similarity index 100% rename from gl/glparticles.h rename to src/gl/glparticles.h diff --git a/gl/glproperty.cpp b/src/gl/glproperty.cpp similarity index 100% rename from gl/glproperty.cpp rename to src/gl/glproperty.cpp diff --git a/gl/glproperty.h b/src/gl/glproperty.h similarity index 100% rename from gl/glproperty.h rename to src/gl/glproperty.h diff --git a/gl/glscene.cpp b/src/gl/glscene.cpp similarity index 100% rename from gl/glscene.cpp rename to src/gl/glscene.cpp diff --git a/gl/glscene.h b/src/gl/glscene.h similarity index 100% rename from gl/glscene.h rename to src/gl/glscene.h diff --git a/gl/gltex.cpp b/src/gl/gltex.cpp similarity index 100% rename from gl/gltex.cpp rename to src/gl/gltex.cpp diff --git a/gl/gltex.h b/src/gl/gltex.h similarity index 100% rename from gl/gltex.h rename to src/gl/gltex.h diff --git a/gl/gltexloaders.cpp b/src/gl/gltexloaders.cpp similarity index 100% rename from gl/gltexloaders.cpp rename to src/gl/gltexloaders.cpp diff --git a/gl/gltexloaders.h b/src/gl/gltexloaders.h similarity index 100% rename from gl/gltexloaders.h rename to src/gl/gltexloaders.h diff --git a/gl/gltools.cpp b/src/gl/gltools.cpp similarity index 100% rename from gl/gltools.cpp rename to src/gl/gltools.cpp diff --git a/gl/gltools.h b/src/gl/gltools.h similarity index 100% rename from gl/gltools.h rename to src/gl/gltools.h diff --git a/gl/marker/constraints.h b/src/gl/marker/constraints.h similarity index 100% rename from gl/marker/constraints.h rename to src/gl/marker/constraints.h diff --git a/gl/marker/furniture.h b/src/gl/marker/furniture.h similarity index 100% rename from gl/marker/furniture.h rename to src/gl/marker/furniture.h diff --git a/gl/renderer.cpp b/src/gl/renderer.cpp similarity index 100% rename from gl/renderer.cpp rename to src/gl/renderer.cpp diff --git a/gl/renderer.h b/src/gl/renderer.h similarity index 100% rename from gl/renderer.h rename to src/gl/renderer.h diff --git a/glview.cpp b/src/glview.cpp similarity index 100% rename from glview.cpp rename to src/glview.cpp diff --git a/glview.h b/src/glview.h similarity index 100% rename from glview.h rename to src/glview.h diff --git a/hacking.h b/src/hacking.h similarity index 100% rename from hacking.h rename to src/hacking.h diff --git a/importex/3ds.cpp b/src/importex/3ds.cpp similarity index 100% rename from importex/3ds.cpp rename to src/importex/3ds.cpp diff --git a/importex/3ds.h b/src/importex/3ds.h similarity index 100% rename from importex/3ds.h rename to src/importex/3ds.h diff --git a/importex/col.cpp b/src/importex/col.cpp similarity index 100% rename from importex/col.cpp rename to src/importex/col.cpp diff --git a/importex/importex.cpp b/src/importex/importex.cpp similarity index 100% rename from importex/importex.cpp rename to src/importex/importex.cpp diff --git a/importex/obj.cpp b/src/importex/obj.cpp similarity index 100% rename from importex/obj.cpp rename to src/importex/obj.cpp diff --git a/kfmmodel.cpp b/src/kfmmodel.cpp similarity index 100% rename from kfmmodel.cpp rename to src/kfmmodel.cpp diff --git a/kfmmodel.h b/src/kfmmodel.h similarity index 100% rename from kfmmodel.h rename to src/kfmmodel.h diff --git a/kfmxml.cpp b/src/kfmxml.cpp similarity index 100% rename from kfmxml.cpp rename to src/kfmxml.cpp diff --git a/message.cpp b/src/message.cpp similarity index 100% rename from message.cpp rename to src/message.cpp diff --git a/message.h b/src/message.h similarity index 100% rename from message.h rename to src/message.h diff --git a/nifdelegate.cpp b/src/nifdelegate.cpp similarity index 100% rename from nifdelegate.cpp rename to src/nifdelegate.cpp diff --git a/nifexpr.cpp b/src/nifexpr.cpp similarity index 100% rename from nifexpr.cpp rename to src/nifexpr.cpp diff --git a/nifexpr.h b/src/nifexpr.h similarity index 100% rename from nifexpr.h rename to src/nifexpr.h diff --git a/nifitem.h b/src/nifitem.h similarity index 100% rename from nifitem.h rename to src/nifitem.h diff --git a/nifmodel.cpp b/src/nifmodel.cpp similarity index 100% rename from nifmodel.cpp rename to src/nifmodel.cpp diff --git a/nifmodel.h b/src/nifmodel.h similarity index 100% rename from nifmodel.h rename to src/nifmodel.h diff --git a/nifproxy.cpp b/src/nifproxy.cpp similarity index 100% rename from nifproxy.cpp rename to src/nifproxy.cpp diff --git a/nifproxy.h b/src/nifproxy.h similarity index 100% rename from nifproxy.h rename to src/nifproxy.h diff --git a/nifskope.cpp b/src/nifskope.cpp similarity index 100% rename from nifskope.cpp rename to src/nifskope.cpp diff --git a/nifskope.h b/src/nifskope.h similarity index 100% rename from nifskope.h rename to src/nifskope.h diff --git a/niftypes.cpp b/src/niftypes.cpp similarity index 100% rename from niftypes.cpp rename to src/niftypes.cpp diff --git a/niftypes.h b/src/niftypes.h similarity index 100% rename from niftypes.h rename to src/niftypes.h diff --git a/nifvalue.cpp b/src/nifvalue.cpp similarity index 100% rename from nifvalue.cpp rename to src/nifvalue.cpp diff --git a/nifvalue.h b/src/nifvalue.h similarity index 100% rename from nifvalue.h rename to src/nifvalue.h diff --git a/nifxml.cpp b/src/nifxml.cpp similarity index 100% rename from nifxml.cpp rename to src/nifxml.cpp diff --git a/options.cpp b/src/options.cpp similarity index 100% rename from options.cpp rename to src/options.cpp diff --git a/options.h b/src/options.h similarity index 100% rename from options.h rename to src/options.h diff --git a/qhull.cpp b/src/qhull.cpp similarity index 100% rename from qhull.cpp rename to src/qhull.cpp diff --git a/qhull.h b/src/qhull.h similarity index 100% rename from qhull.h rename to src/qhull.h diff --git a/NvTriStrip/qtwrapper.cpp b/src/qtwrapper.cpp similarity index 100% rename from NvTriStrip/qtwrapper.cpp rename to src/qtwrapper.cpp diff --git a/NvTriStrip/qtwrapper.h b/src/qtwrapper.h similarity index 100% rename from NvTriStrip/qtwrapper.h rename to src/qtwrapper.h diff --git a/spellbook.cpp b/src/spellbook.cpp similarity index 100% rename from spellbook.cpp rename to src/spellbook.cpp diff --git a/spellbook.h b/src/spellbook.h similarity index 100% rename from spellbook.h rename to src/spellbook.h diff --git a/spells/animation.cpp b/src/spells/animation.cpp similarity index 100% rename from spells/animation.cpp rename to src/spells/animation.cpp diff --git a/spells/blocks.cpp b/src/spells/blocks.cpp similarity index 100% rename from spells/blocks.cpp rename to src/spells/blocks.cpp diff --git a/spells/blocks.h b/src/spells/blocks.h similarity index 100% rename from spells/blocks.h rename to src/spells/blocks.h diff --git a/spells/bounds.cpp b/src/spells/bounds.cpp similarity index 100% rename from spells/bounds.cpp rename to src/spells/bounds.cpp diff --git a/spells/color.cpp b/src/spells/color.cpp similarity index 100% rename from spells/color.cpp rename to src/spells/color.cpp diff --git a/spells/flags.cpp b/src/spells/flags.cpp similarity index 100% rename from spells/flags.cpp rename to src/spells/flags.cpp diff --git a/spells/fo3only.cpp b/src/spells/fo3only.cpp similarity index 100% rename from spells/fo3only.cpp rename to src/spells/fo3only.cpp diff --git a/spells/havok.cpp b/src/spells/havok.cpp similarity index 100% rename from spells/havok.cpp rename to src/spells/havok.cpp diff --git a/spells/headerstring.cpp b/src/spells/headerstring.cpp similarity index 100% rename from spells/headerstring.cpp rename to src/spells/headerstring.cpp diff --git a/spells/light.cpp b/src/spells/light.cpp similarity index 100% rename from spells/light.cpp rename to src/spells/light.cpp diff --git a/spells/material.cpp b/src/spells/material.cpp similarity index 100% rename from spells/material.cpp rename to src/spells/material.cpp diff --git a/spells/mesh.cpp b/src/spells/mesh.cpp similarity index 100% rename from spells/mesh.cpp rename to src/spells/mesh.cpp diff --git a/spells/mesh.h b/src/spells/mesh.h similarity index 100% rename from spells/mesh.h rename to src/spells/mesh.h diff --git a/spells/misc.cpp b/src/spells/misc.cpp similarity index 100% rename from spells/misc.cpp rename to src/spells/misc.cpp diff --git a/spells/misc.h b/src/spells/misc.h similarity index 100% rename from spells/misc.h rename to src/spells/misc.h diff --git a/spells/moppcode.cpp b/src/spells/moppcode.cpp similarity index 100% rename from spells/moppcode.cpp rename to src/spells/moppcode.cpp diff --git a/spells/morphctrl.cpp b/src/spells/morphctrl.cpp similarity index 100% rename from spells/morphctrl.cpp rename to src/spells/morphctrl.cpp diff --git a/spells/normals.cpp b/src/spells/normals.cpp similarity index 100% rename from spells/normals.cpp rename to src/spells/normals.cpp diff --git a/spells/optimize.cpp b/src/spells/optimize.cpp similarity index 100% rename from spells/optimize.cpp rename to src/spells/optimize.cpp diff --git a/spells/sanitize.cpp b/src/spells/sanitize.cpp similarity index 100% rename from spells/sanitize.cpp rename to src/spells/sanitize.cpp diff --git a/spells/skel.dat b/src/spells/skel.dat similarity index 100% rename from spells/skel.dat rename to src/spells/skel.dat diff --git a/spells/skeleton.cpp b/src/spells/skeleton.cpp similarity index 100% rename from spells/skeleton.cpp rename to src/spells/skeleton.cpp diff --git a/spells/skeleton.h b/src/spells/skeleton.h similarity index 100% rename from spells/skeleton.h rename to src/spells/skeleton.h diff --git a/spells/stringpalette.cpp b/src/spells/stringpalette.cpp similarity index 100% rename from spells/stringpalette.cpp rename to src/spells/stringpalette.cpp diff --git a/spells/stringpalette.h b/src/spells/stringpalette.h similarity index 100% rename from spells/stringpalette.h rename to src/spells/stringpalette.h diff --git a/spells/strippify.cpp b/src/spells/strippify.cpp similarity index 100% rename from spells/strippify.cpp rename to src/spells/strippify.cpp diff --git a/spells/tangentspace.cpp b/src/spells/tangentspace.cpp similarity index 100% rename from spells/tangentspace.cpp rename to src/spells/tangentspace.cpp diff --git a/spells/tangentspace.h b/src/spells/tangentspace.h similarity index 100% rename from spells/tangentspace.h rename to src/spells/tangentspace.h diff --git a/spells/texture.cpp b/src/spells/texture.cpp similarity index 100% rename from spells/texture.cpp rename to src/spells/texture.cpp diff --git a/spells/texture.h b/src/spells/texture.h similarity index 100% rename from spells/texture.h rename to src/spells/texture.h diff --git a/spells/transform.cpp b/src/spells/transform.cpp similarity index 100% rename from spells/transform.cpp rename to src/spells/transform.cpp diff --git a/spells/transform.h b/src/spells/transform.h similarity index 100% rename from spells/transform.h rename to src/spells/transform.h diff --git a/ui/about_dialog.cpp b/src/ui/about_dialog.cpp similarity index 100% rename from ui/about_dialog.cpp rename to src/ui/about_dialog.cpp diff --git a/ui/about_dialog.h b/src/ui/about_dialog.h similarity index 100% rename from ui/about_dialog.h rename to src/ui/about_dialog.h diff --git a/ui/about_dialog.ui b/src/ui/about_dialog.ui similarity index 100% rename from ui/about_dialog.ui rename to src/ui/about_dialog.ui diff --git a/widgets/colorwheel.cpp b/src/widgets/colorwheel.cpp similarity index 100% rename from widgets/colorwheel.cpp rename to src/widgets/colorwheel.cpp diff --git a/widgets/colorwheel.h b/src/widgets/colorwheel.h similarity index 100% rename from widgets/colorwheel.h rename to src/widgets/colorwheel.h diff --git a/widgets/copyfnam.cpp b/src/widgets/copyfnam.cpp similarity index 100% rename from widgets/copyfnam.cpp rename to src/widgets/copyfnam.cpp diff --git a/widgets/copyfnam.h b/src/widgets/copyfnam.h similarity index 100% rename from widgets/copyfnam.h rename to src/widgets/copyfnam.h diff --git a/widgets/fileselect.cpp b/src/widgets/fileselect.cpp similarity index 100% rename from widgets/fileselect.cpp rename to src/widgets/fileselect.cpp diff --git a/widgets/fileselect.h b/src/widgets/fileselect.h similarity index 100% rename from widgets/fileselect.h rename to src/widgets/fileselect.h diff --git a/widgets/floatedit.cpp b/src/widgets/floatedit.cpp similarity index 100% rename from widgets/floatedit.cpp rename to src/widgets/floatedit.cpp diff --git a/widgets/floatedit.h b/src/widgets/floatedit.h similarity index 100% rename from widgets/floatedit.h rename to src/widgets/floatedit.h diff --git a/widgets/floatslider.cpp b/src/widgets/floatslider.cpp similarity index 100% rename from widgets/floatslider.cpp rename to src/widgets/floatslider.cpp diff --git a/widgets/floatslider.h b/src/widgets/floatslider.h similarity index 100% rename from widgets/floatslider.h rename to src/widgets/floatslider.h diff --git a/widgets/groupbox.cpp b/src/widgets/groupbox.cpp similarity index 100% rename from widgets/groupbox.cpp rename to src/widgets/groupbox.cpp diff --git a/widgets/groupbox.h b/src/widgets/groupbox.h similarity index 100% rename from widgets/groupbox.h rename to src/widgets/groupbox.h diff --git a/widgets/inspect.cpp b/src/widgets/inspect.cpp similarity index 100% rename from widgets/inspect.cpp rename to src/widgets/inspect.cpp diff --git a/widgets/inspect.h b/src/widgets/inspect.h similarity index 100% rename from widgets/inspect.h rename to src/widgets/inspect.h diff --git a/widgets/nifcheckboxlist.cpp b/src/widgets/nifcheckboxlist.cpp similarity index 100% rename from widgets/nifcheckboxlist.cpp rename to src/widgets/nifcheckboxlist.cpp diff --git a/widgets/nifcheckboxlist.h b/src/widgets/nifcheckboxlist.h similarity index 100% rename from widgets/nifcheckboxlist.h rename to src/widgets/nifcheckboxlist.h diff --git a/widgets/nifeditors.cpp b/src/widgets/nifeditors.cpp similarity index 100% rename from widgets/nifeditors.cpp rename to src/widgets/nifeditors.cpp diff --git a/widgets/nifeditors.h b/src/widgets/nifeditors.h similarity index 100% rename from widgets/nifeditors.h rename to src/widgets/nifeditors.h diff --git a/widgets/nifview.cpp b/src/widgets/nifview.cpp similarity index 100% rename from widgets/nifview.cpp rename to src/widgets/nifview.cpp diff --git a/widgets/nifview.h b/src/widgets/nifview.h similarity index 100% rename from widgets/nifview.h rename to src/widgets/nifview.h diff --git a/widgets/refrbrowser.cpp b/src/widgets/refrbrowser.cpp similarity index 100% rename from widgets/refrbrowser.cpp rename to src/widgets/refrbrowser.cpp diff --git a/widgets/refrbrowser.h b/src/widgets/refrbrowser.h similarity index 100% rename from widgets/refrbrowser.h rename to src/widgets/refrbrowser.h diff --git a/widgets/uvedit.cpp b/src/widgets/uvedit.cpp similarity index 100% rename from widgets/uvedit.cpp rename to src/widgets/uvedit.cpp diff --git a/widgets/uvedit.h b/src/widgets/uvedit.h similarity index 100% rename from widgets/uvedit.h rename to src/widgets/uvedit.h diff --git a/widgets/valueedit.cpp b/src/widgets/valueedit.cpp similarity index 100% rename from widgets/valueedit.cpp rename to src/widgets/valueedit.cpp diff --git a/widgets/valueedit.h b/src/widgets/valueedit.h similarity index 100% rename from widgets/valueedit.h rename to src/widgets/valueedit.h diff --git a/widgets/xmlcheck.cpp b/src/widgets/xmlcheck.cpp similarity index 100% rename from widgets/xmlcheck.cpp rename to src/widgets/xmlcheck.cpp diff --git a/widgets/xmlcheck.h b/src/widgets/xmlcheck.h similarity index 100% rename from widgets/xmlcheck.h rename to src/widgets/xmlcheck.h From 1fca18a66b98acb40038d15ace3ccf7d87b839e6 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 14:26:30 -0500 Subject: [PATCH 025/836] [Restructure] Move skel.dat, rename NvTriStrip Wrapper --- {src/spells => res}/skel.dat | Bin src/{qtwrapper.cpp => nvtristripwrapper.cpp} | 0 src/{qtwrapper.h => nvtristripwrapper.h} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {src/spells => res}/skel.dat (100%) rename src/{qtwrapper.cpp => nvtristripwrapper.cpp} (100%) rename src/{qtwrapper.h => nvtristripwrapper.h} (100%) diff --git a/src/spells/skel.dat b/res/skel.dat similarity index 100% rename from src/spells/skel.dat rename to res/skel.dat diff --git a/src/qtwrapper.cpp b/src/nvtristripwrapper.cpp similarity index 100% rename from src/qtwrapper.cpp rename to src/nvtristripwrapper.cpp diff --git a/src/qtwrapper.h b/src/nvtristripwrapper.h similarity index 100% rename from src/qtwrapper.h rename to src/nvtristripwrapper.h From 3f02e58dbf2555874e4092b472ab66fbccb1fd36 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Mon, 3 Mar 2014 14:43:44 -0500 Subject: [PATCH 026/836] [Restructure] Modify include/source/resource paths Updates files to reflect new directory structure. --- NifSkope.pro | 352 +++++++++++++++++++----------------- lib/fsengine/fsmanager.cpp | 2 +- res/nifskope.qrc | 36 ++-- src/gl/glnode.cpp | 2 +- src/gl/gltex.cpp | 4 +- src/importex/3ds.cpp | 2 +- src/importex/col.cpp | 2 +- src/importex/obj.cpp | 2 +- src/nifskope.cpp | 2 +- src/nvtristripwrapper.cpp | 2 +- src/nvtristripwrapper.h | 2 +- src/qhull.cpp | 36 ++-- src/spells/havok.cpp | 2 +- src/spells/normals.cpp | 2 +- src/spells/skeleton.cpp | 4 +- src/spells/strippify.cpp | 2 +- src/spells/tangentspace.cpp | 2 +- src/spells/texture.cpp | 2 +- src/widgets/uvedit.cpp | 2 +- 19 files changed, 237 insertions(+), 223 deletions(-) diff --git a/NifSkope.pro b/NifSkope.pro index 9d6250e5c..58397c326 100644 --- a/NifSkope.pro +++ b/NifSkope.pro @@ -6,7 +6,9 @@ QT += xml opengl network CONFIG += qt debug_and_release debug_and_release_target thread warn_on -CONFIG += fsengine +CONFIG += fsengine nvtristrip qhull + +INCLUDEPATH += lib unix:!macx { LIBS += -lGLU @@ -51,184 +53,196 @@ count(GIT_HEAD, 1) { } HEADERS += \ - basemodel.h \ - config.h \ - gl/dds/BlockDXT.h \ - gl/dds/Color.h \ - gl/dds/ColorBlock.h \ - gl/dds/Common.h \ - gl/dds/dds_api.h \ - gl/dds/DirectDrawSurface.h \ - gl/dds/Image.h \ - gl/dds/PixelFormat.h \ - gl/dds/Stream.h \ - gl/glcontrolable.h \ - gl/glcontroller.h \ - gl/GLee.h \ - gl/glmarker.h \ - gl/glmesh.h \ - gl/glnode.h \ - gl/glparticles.h \ - gl/glproperty.h \ - gl/glscene.h \ - gl/gltex.h \ - gl/gltexloaders.h \ - gl/gltools.h \ - gl/marker/constraints.h \ - gl/marker/furniture.h \ - gl/renderer.h \ - glview.h \ - hacking.h \ - importex/3ds.h \ - kfmmodel.h \ - message.h \ - nifexpr.h \ - nifitem.h \ - nifmodel.h \ - nifproxy.h \ - nifskope.h \ - niftypes.h \ - nifvalue.h \ - NvTriStrip/NvTriStrip.h \ - NvTriStrip/NvTriStripObjects.h \ - NvTriStrip/qtwrapper.h \ - NvTriStrip/VertexCache.h \ - options.h \ - qhull/src/libqhull/geom.h \ - qhull/src/libqhull/io.h \ - qhull/src/libqhull/libqhull.h \ - qhull/src/libqhull/mem.h \ - qhull/src/libqhull/merge.h \ - qhull/src/libqhull/poly.h \ - qhull/src/libqhull/qhull_a.h \ - qhull/src/libqhull/qset.h \ - qhull/src/libqhull/random.h \ - qhull/src/libqhull/stat.h \ - qhull/src/libqhull/user.h \ - qhull.h \ - spellbook.h \ - spells/blocks.h \ - spells/mesh.h \ - spells/misc.h \ - spells/skeleton.h \ - spells/stringpalette.h \ - spells/tangentspace.h \ - spells/texture.h \ - spells/transform.h \ - widgets/colorwheel.h \ - widgets/copyfnam.h \ - widgets/fileselect.h \ - widgets/floatedit.h \ - widgets/floatslider.h \ - widgets/groupbox.h \ - widgets/inspect.h \ - widgets/nifcheckboxlist.h \ - widgets/nifeditors.h \ - widgets/nifview.h \ - widgets/refrbrowser.h \ - widgets/uvedit.h \ - widgets/valueedit.h \ - widgets/xmlcheck.h \ - ui/about_dialog.h + src/basemodel.h \ + src/config.h \ + src/gl/dds/BlockDXT.h \ + src/gl/dds/Color.h \ + src/gl/dds/ColorBlock.h \ + src/gl/dds/Common.h \ + src/gl/dds/dds_api.h \ + src/gl/dds/DirectDrawSurface.h \ + src/gl/dds/Image.h \ + src/gl/dds/PixelFormat.h \ + src/gl/dds/Stream.h \ + src/gl/glcontrolable.h \ + src/gl/glcontroller.h \ + src/gl/GLee.h \ + src/gl/glmarker.h \ + src/gl/glmesh.h \ + src/gl/glnode.h \ + src/gl/glparticles.h \ + src/gl/glproperty.h \ + src/gl/glscene.h \ + src/gl/gltex.h \ + src/gl/gltexloaders.h \ + src/gl/gltools.h \ + src/gl/marker/constraints.h \ + src/gl/marker/furniture.h \ + src/gl/renderer.h \ + src/glview.h \ + src/hacking.h \ + src/importex/3ds.h \ + src/kfmmodel.h \ + src/message.h \ + src/nifexpr.h \ + src/nifitem.h \ + src/nifmodel.h \ + src/nifproxy.h \ + src/nifskope.h \ + src/niftypes.h \ + src/nifvalue.h \ + src/nvtristripwrapper.h \ + src/options.h \ + src/qhull.h \ + src/spellbook.h \ + src/spells/blocks.h \ + src/spells/mesh.h \ + src/spells/misc.h \ + src/spells/skeleton.h \ + src/spells/stringpalette.h \ + src/spells/tangentspace.h \ + src/spells/texture.h \ + src/spells/transform.h \ + src/widgets/colorwheel.h \ + src/widgets/copyfnam.h \ + src/widgets/fileselect.h \ + src/widgets/floatedit.h \ + src/widgets/floatslider.h \ + src/widgets/groupbox.h \ + src/widgets/inspect.h \ + src/widgets/nifcheckboxlist.h \ + src/widgets/nifeditors.h \ + src/widgets/nifview.h \ + src/widgets/refrbrowser.h \ + src/widgets/uvedit.h \ + src/widgets/valueedit.h \ + src/widgets/xmlcheck.h \ + src/ui/about_dialog.h SOURCES += \ - basemodel.cpp \ - gl/dds/BlockDXT.cpp \ - gl/dds/ColorBlock.cpp \ - gl/dds/dds_api.cpp \ - gl/dds/DirectDrawSurface.cpp \ - gl/dds/Image.cpp \ - gl/dds/Stream.cpp \ - gl/glcontroller.cpp \ - gl/GLee.cpp \ - gl/glmarker.cpp \ - gl/glmesh.cpp \ - gl/glnode.cpp \ - gl/glparticles.cpp \ - gl/glproperty.cpp \ - gl/glscene.cpp \ - gl/gltex.cpp \ - gl/gltexloaders.cpp \ - gl/gltools.cpp \ - gl/renderer.cpp \ - glview.cpp \ - importex/3ds.cpp \ - importex/importex.cpp \ - importex/obj.cpp \ - importex/col.cpp \ - kfmmodel.cpp \ - kfmxml.cpp \ - message.cpp \ - nifdelegate.cpp \ - nifexpr.cpp \ - nifmodel.cpp \ - nifproxy.cpp \ - nifskope.cpp \ - niftypes.cpp \ - nifvalue.cpp \ - nifxml.cpp \ - NvTriStrip/NvTriStrip.cpp \ - NvTriStrip/NvTriStripObjects.cpp \ - NvTriStrip/qtwrapper.cpp \ - NvTriStrip/VertexCache.cpp \ - options.cpp \ - qhull.cpp \ - spellbook.cpp \ - spells/animation.cpp \ - spells/blocks.cpp \ - spells/bounds.cpp \ - spells/color.cpp \ - spells/flags.cpp \ - spells/fo3only.cpp \ - spells/havok.cpp \ - spells/headerstring.cpp \ - spells/light.cpp \ - spells/material.cpp \ - spells/mesh.cpp \ - spells/misc.cpp \ - spells/moppcode.cpp \ - spells/morphctrl.cpp \ - spells/normals.cpp \ - spells/optimize.cpp \ - spells/sanitize.cpp \ - spells/skeleton.cpp \ - spells/stringpalette.cpp \ - spells/strippify.cpp \ - spells/tangentspace.cpp \ - spells/texture.cpp \ - spells/transform.cpp \ - widgets/colorwheel.cpp \ - widgets/copyfnam.cpp \ - widgets/fileselect.cpp \ - widgets/floatedit.cpp \ - widgets/floatslider.cpp \ - widgets/groupbox.cpp \ - widgets/inspect.cpp \ - widgets/nifcheckboxlist.cpp \ - widgets/nifeditors.cpp \ - widgets/nifview.cpp \ - widgets/refrbrowser.cpp \ - widgets/uvedit.cpp \ - widgets/valueedit.cpp \ - widgets/xmlcheck.cpp \ - ui/about_dialog.cpp + src/basemodel.cpp \ + src/gl/dds/BlockDXT.cpp \ + src/gl/dds/ColorBlock.cpp \ + src/gl/dds/dds_api.cpp \ + src/gl/dds/DirectDrawSurface.cpp \ + src/gl/dds/Image.cpp \ + src/gl/dds/Stream.cpp \ + src/gl/glcontroller.cpp \ + src/gl/GLee.cpp \ + src/gl/glmarker.cpp \ + src/gl/glmesh.cpp \ + src/gl/glnode.cpp \ + src/gl/glparticles.cpp \ + src/gl/glproperty.cpp \ + src/gl/glscene.cpp \ + src/gl/gltex.cpp \ + src/gl/gltexloaders.cpp \ + src/gl/gltools.cpp \ + src/gl/renderer.cpp \ + src/glview.cpp \ + src/importex/3ds.cpp \ + src/importex/importex.cpp \ + src/importex/obj.cpp \ + src/importex/col.cpp \ + src/kfmmodel.cpp \ + src/kfmxml.cpp \ + src/message.cpp \ + src/nifdelegate.cpp \ + src/nifexpr.cpp \ + src/nifmodel.cpp \ + src/nifproxy.cpp \ + src/nifskope.cpp \ + src/niftypes.cpp \ + src/nifvalue.cpp \ + src/nifxml.cpp \ + src/nvtristripwrapper.cpp \ + src/options.cpp \ + src/qhull.cpp \ + src/spellbook.cpp \ + src/spells/animation.cpp \ + src/spells/blocks.cpp \ + src/spells/bounds.cpp \ + src/spells/color.cpp \ + src/spells/flags.cpp \ + src/spells/fo3only.cpp \ + src/spells/havok.cpp \ + src/spells/headerstring.cpp \ + src/spells/light.cpp \ + src/spells/material.cpp \ + src/spells/mesh.cpp \ + src/spells/misc.cpp \ + src/spells/moppcode.cpp \ + src/spells/morphctrl.cpp \ + src/spells/normals.cpp \ + src/spells/optimize.cpp \ + src/spells/sanitize.cpp \ + src/spells/skeleton.cpp \ + src/spells/stringpalette.cpp \ + src/spells/strippify.cpp \ + src/spells/tangentspace.cpp \ + src/spells/texture.cpp \ + src/spells/transform.cpp \ + src/widgets/colorwheel.cpp \ + src/widgets/copyfnam.cpp \ + src/widgets/fileselect.cpp \ + src/widgets/floatedit.cpp \ + src/widgets/floatslider.cpp \ + src/widgets/groupbox.cpp \ + src/widgets/inspect.cpp \ + src/widgets/nifcheckboxlist.cpp \ + src/widgets/nifeditors.cpp \ + src/widgets/nifview.cpp \ + src/widgets/refrbrowser.cpp \ + src/widgets/uvedit.cpp \ + src/widgets/valueedit.cpp \ + src/widgets/xmlcheck.cpp \ + src/ui/about_dialog.cpp RESOURCES += \ - nifskope.qrc + res/nifskope.qrc FORMS += \ - ui/about_dialog.ui + src/ui/about_dialog.ui fsengine { DEFINES += FSENGINE + INCLUDEPATH += lib/fsengine HEADERS += \ - fsengine/bsa.h \ - fsengine/fsengine.h \ - fsengine/fsmanager.h + lib/fsengine/bsa.h \ + lib/fsengine/fsengine.h \ + lib/fsengine/fsmanager.h SOURCES += \ - fsengine/bsa.cpp \ - fsengine/fsengine.cpp \ - fsengine/fsmanager.cpp + lib/fsengine/bsa.cpp \ + lib/fsengine/fsengine.cpp \ + lib/fsengine/fsmanager.cpp +} + +nvtristrip { + INCLUDEPATH += lib/NvTriStrip + HEADERS += \ + lib/NvTriStrip/NvTriStrip.h \ + lib/NvTriStrip/NvTriStripObjects.h \ + lib/NvTriStrip/VertexCache.h + SOURCES += \ + lib/NvTriStrip/NvTriStrip.cpp \ + lib/NvTriStrip/NvTriStripObjects.cpp \ + lib/NvTriStrip/VertexCache.cpp +} + +qhull { + INCLUDEPATH += lib/qhull/src/ + HEADERS += \ + lib/qhull/src/libqhull/geom.h \ + lib/qhull/src/libqhull/io.h \ + lib/qhull/src/libqhull/libqhull.h \ + lib/qhull/src/libqhull/mem.h \ + lib/qhull/src/libqhull/merge.h \ + lib/qhull/src/libqhull/poly.h \ + lib/qhull/src/libqhull/qhull_a.h \ + lib/qhull/src/libqhull/qset.h \ + lib/qhull/src/libqhull/random.h \ + lib/qhull/src/libqhull/stat.h \ + lib/qhull/src/libqhull/user.h } win32 { @@ -236,7 +250,7 @@ win32 { CONFIG += embed_manifest_exe CONFIG -= flat - RC_FILE = icon.rc + RC_FILE = res/icon.rc DEFINES += EDIT_ON_ACTIVATE # Ignore specific errors that are very common in the code diff --git a/lib/fsengine/fsmanager.cpp b/lib/fsengine/fsmanager.cpp index a3d1faf91..7d7e404fd 100644 --- a/lib/fsengine/fsmanager.cpp +++ b/lib/fsengine/fsmanager.cpp @@ -43,7 +43,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../options.h" +//#include "../options.h" //! Global BSA file manager static FSManager *theFSManager = NULL; diff --git a/res/nifskope.qrc b/res/nifskope.qrc index 1ed96ca35..d0d695b00 100644 --- a/res/nifskope.qrc +++ b/res/nifskope.qrc @@ -2,27 +2,27 @@ nifskope.png - spells/skel.dat + skel.dat - resources/arrow_left.png - resources/arrow_right.png - resources/img_update.png - resources/img_link.png - resources/img_flag.png - resources/havok_logo.png - resources/qhull_cone.gif + icon/arrow_left.png + icon/arrow_right.png + icon/img_update.png + icon/img_link.png + icon/img_flag.png + icon/havok_logo.png + icon/qhull_cone.gif - resources/button_play.png - resources/button_loop.png - resources/button_switch.png - resources/button_view_top.png - resources/button_view_front.png - resources/button_view_side.png - resources/button_view_walk.png - resources/button_view_user.png - resources/button_view_flip.png - resources/button_view_pers.png + icon/button_play.png + icon/button_loop.png + icon/button_switch.png + icon/button_view_top.png + icon/button_view_front.png + icon/button_view_side.png + icon/button_view_walk.png + icon/button_view_user.png + icon/button_view_flip.png + icon/button_view_pers.png diff --git a/src/gl/glnode.cpp b/src/gl/glnode.cpp index 8be58ab9c..31f4c1f9d 100644 --- a/src/gl/glnode.cpp +++ b/src/gl/glnode.cpp @@ -37,7 +37,7 @@ int Node::SELECTING = 0; #include "glcontroller.h" #include "../options.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../nvtristripwrapper.h" #include "marker/furniture.h" #include "marker/constraints.h" diff --git a/src/gl/gltex.cpp b/src/gl/gltex.cpp index 94ba2c25e..766b5f1af 100644 --- a/src/gl/gltex.cpp +++ b/src/gl/gltex.cpp @@ -46,8 +46,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "gltex.h" #include "gltexloaders.h" #include "../options.h" -#include "../fsengine/fsmanager.h" -#include "../fsengine/fsengine.h" +#include +#include //! \file gltex.cpp TexCache management diff --git a/src/importex/3ds.cpp b/src/importex/3ds.cpp index 4291b23aa..9ef435a86 100644 --- a/src/importex/3ds.cpp +++ b/src/importex/3ds.cpp @@ -2,7 +2,7 @@ #include "../spellbook.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../nvtristripwrapper.h" #include #include diff --git a/src/importex/col.cpp b/src/importex/col.cpp index 5f2386cb5..d7fd2421c 100644 --- a/src/importex/col.cpp +++ b/src/importex/col.cpp @@ -42,7 +42,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../nifmodel.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include "../gl/gltex.h" diff --git a/src/importex/obj.cpp b/src/importex/obj.cpp index a91be15f6..475ff9e7f 100644 --- a/src/importex/obj.cpp +++ b/src/importex/obj.cpp @@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../nifmodel.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include #include diff --git a/src/nifskope.cpp b/src/nifskope.cpp index 997fda32e..dd16c565e 100644 --- a/src/nifskope.cpp +++ b/src/nifskope.cpp @@ -92,7 +92,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef FSENGINE -#include "fsengine/fsmanager.h" +#include FSManager * fsmanager = 0; diff --git a/src/nvtristripwrapper.cpp b/src/nvtristripwrapper.cpp index 127166bbe..30da36237 100644 --- a/src/nvtristripwrapper.cpp +++ b/src/nvtristripwrapper.cpp @@ -1,4 +1,4 @@ -#include "qtwrapper.h" +#include "nvtristripwrapper.h" #include "NvTriStrip.h" diff --git a/src/nvtristripwrapper.h b/src/nvtristripwrapper.h index 2e6469ce8..d9e091f6c 100644 --- a/src/nvtristripwrapper.h +++ b/src/nvtristripwrapper.h @@ -1,7 +1,7 @@ #ifndef NVTRISTRIP_WRAPPER_H #define NVTRISTRIP_WRAPPER_H -#include "../niftypes.h" +#include "niftypes.h" #include #include diff --git a/src/qhull.cpp b/src/qhull.cpp index 2e6790366..ad583071e 100644 --- a/src/qhull.cpp +++ b/src/qhull.cpp @@ -40,25 +40,25 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. extern "C" { -#include "qhull/src/libqhull/qhull_a.h" +#include -#include "qhull/src/libqhull/libqhull.c" -#include "qhull/src/libqhull/mem.c" -#include "qhull/src/libqhull/qset.c" -#include "qhull/src/libqhull/geom.c" -#include "qhull/src/libqhull/merge.c" -#include "qhull/src/libqhull/poly.c" -#include "qhull/src/libqhull/io.c" -#include "qhull/src/libqhull/stat.c" -#include "qhull/src/libqhull/global.c" -#include "qhull/src/libqhull/user.c" -#include "qhull/src/libqhull/poly2.c" -#include "qhull/src/libqhull/geom2.c" -#include "qhull/src/libqhull/userprintf.c" -#include "qhull/src/libqhull/userprintf_rbox.c" -#include "qhull/src/libqhull/usermem.c" -#include "qhull/src/libqhull/random.c" -#include "qhull/src/libqhull/rboxlib.c" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include }; //! \file qhull.cpp Computes a convex hull diff --git a/src/spells/havok.cpp b/src/spells/havok.cpp index 48f964220..caa598a06 100644 --- a/src/spells/havok.cpp +++ b/src/spells/havok.cpp @@ -1,7 +1,7 @@ #include "../spellbook.h" #include "../qhull.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include "blocks.h" diff --git a/src/spells/normals.cpp b/src/spells/normals.cpp index d5d67444f..0f62413a1 100644 --- a/src/spells/normals.cpp +++ b/src/spells/normals.cpp @@ -1,6 +1,6 @@ #include "../spellbook.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include #include diff --git a/src/spells/skeleton.cpp b/src/spells/skeleton.cpp index 323cdc11d..28ea800a8 100644 --- a/src/spells/skeleton.cpp +++ b/src/spells/skeleton.cpp @@ -4,7 +4,7 @@ #include "../gl/gltools.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include #include @@ -14,7 +14,7 @@ #include #include -#define SKEL_DAT ":/res/spells/skel.dat" +#define SKEL_DAT ":/res/skel.dat" // Brief description is deliberately not autolinked to class Spell /*! \file skeleton.cpp diff --git a/src/spells/strippify.cpp b/src/spells/strippify.cpp index ef8fb880e..350fc9df3 100644 --- a/src/spells/strippify.cpp +++ b/src/spells/strippify.cpp @@ -1,6 +1,6 @@ #include "../spellbook.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" // TODO: Move these to blocks.h / misc.h / wherever template void copyArray( NifModel * nif, const QModelIndex & iDst, const QModelIndex & iSrc ) diff --git a/src/spells/tangentspace.cpp b/src/spells/tangentspace.cpp index db35dd3cc..c81d95f55 100644 --- a/src/spells/tangentspace.cpp +++ b/src/spells/tangentspace.cpp @@ -1,6 +1,6 @@ #include "tangentspace.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include diff --git a/src/spells/texture.cpp b/src/spells/texture.cpp index 58441cab8..d5d26c122 100644 --- a/src/spells/texture.cpp +++ b/src/spells/texture.cpp @@ -11,7 +11,7 @@ #include "../config.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include "../widgets/fileselect.h" #include "../widgets/uvedit.h" diff --git a/src/widgets/uvedit.cpp b/src/widgets/uvedit.cpp index e25976258..06c3e7c03 100644 --- a/src/widgets/uvedit.cpp +++ b/src/widgets/uvedit.cpp @@ -36,7 +36,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../nifmodel.h" #include "../niftypes.h" #include "../options.h" -#include "../NvTriStrip/qtwrapper.h" +#include "../NvTriStripwrapper.h" #include "../gl/gltex.h" #include "../gl/gltools.h" From 2ea6183e1554a8c5e6337b0f9947d1300a0a2a1e Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Tue, 4 Mar 2014 13:24:55 -0500 Subject: [PATCH 027/836] [Restructure] Update docsys to one at Github --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d82e9563a..6c664cde5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "docsys"] path = docsys - url = git://niftools.git.sourceforge.net/gitroot/niftools/nifdocsys + url = git://github.com/niftools/nifdocsys.git [submodule "qhull"] path = lib/qhull url = git://gitorious.org/qhull/qhull.git From d5875fa316c310b336074b9814424ac82689bbdb Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Tue, 4 Mar 2014 13:42:31 -0500 Subject: [PATCH 028/836] [Restructure] Remove hardcoded shader paths Debug/release builds are hardcoded to expect the shaders folder in a different path. This is unnecessary as the new NifSkope.pro will put the shaders with the EXE just like in the official install. --- src/gl/renderer.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gl/renderer.cpp b/src/gl/renderer.cpp index 83a03e087..c142aa007 100644 --- a/src/gl/renderer.cpp +++ b/src/gl/renderer.cpp @@ -383,17 +383,8 @@ void Renderer::updateShaders() releaseShaders(); QDir dir( QApplication::applicationDirPath() ); - if ( 0 == dir.dirName().compare("Release",Qt::CaseInsensitive) - ||0 == dir.dirName().compare("Debug",Qt::CaseInsensitive) - ) - { - dir.cd( ".." ); - } - if ( dir.exists( "shaders" ) ) dir.cd( "shaders" ); - else if ( dir.exists( "/usr/share/nifskope/shaders" ) ) - dir.cd( "/usr/share/nifskope/shaders" ); // linux does not want to load the shaders so disable them for now #ifdef WIN32 From 5c3fcaae86729d377b31e04f3f6d7a939d33617e Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Tue, 4 Mar 2014 17:51:08 -0500 Subject: [PATCH 029/836] [Restructure] Remove docsys --- docsys | 1 - 1 file changed, 1 deletion(-) delete mode 160000 docsys diff --git a/docsys b/docsys deleted file mode 160000 index cf445940a..000000000 --- a/docsys +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf445940a8e3e2f40316d24d383cc9aad5e9b265 From 0f14784b643cd7c309fedd54e7388cad2c41e037 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Tue, 4 Mar 2014 17:53:54 -0500 Subject: [PATCH 030/836] [Restructure] Re-add docsys --- docsys | 1 + 1 file changed, 1 insertion(+) create mode 160000 docsys diff --git a/docsys b/docsys new file mode 160000 index 000000000..e67ce4a6f --- /dev/null +++ b/docsys @@ -0,0 +1 @@ +Subproject commit e67ce4a6fc3bd0e9ae793bd6f08c3e2bf1bfdf74 From 34fc88b5e6f2761846cbe0ecce7e0533d578f0f2 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 13:04:34 -0500 Subject: [PATCH 031/836] [Restructure] Update LICENSE.TXT --- LICENSE.TXT | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index 49d7496f3..68b04db2a 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,6 +1,6 @@ NIFSKOPE LICENSE -Copyright (c) 2005-2012, NIF File Format Library and Tools. +Copyright (c) 2005-2014, NIF File Format Library and Tools. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,13 +29,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. CREDITS -The Windows build of NifSkope uses Havok(R) for the generation of mopp code. -(C)Copyright 1999-2008 Havok.com Inc. (and its Licensors). +The Windows build of NifSkope uses Havok(R) for the generation of MOPP code. +Copyright (c) 1999-2014 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. -NifSkope uses Qhull for the generation of convex hulls, from www.qhull.org. -Copyright (c) 1993-2010 C.B. Barber and The Geometry Center; see -Qhull_COPYING.txt for details and http://gitorious.org/qhull/ for the source. +NifSkope uses Qhull for the generation of convex hulls, from http://www.qhull.org. +Copyright (c) 1993-2012 C.B. Barber and The Geometry Center. +See Qhull_COPYING.txt for details and http://gitorious.org/qhull/ for the source. NOTICE From 0ead07389433399367d0adf74bc506a6d8eab794 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 14:08:15 -0500 Subject: [PATCH 032/836] [Restructure] Rename sfannounce.txt > README.md --- sfannounce.txt => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sfannounce.txt => README.md (100%) diff --git a/sfannounce.txt b/README.md similarity index 100% rename from sfannounce.txt rename to README.md From 5c1e95f3d981b41ea8f4af15d1ef7d155c40c0ce Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 14:21:01 -0500 Subject: [PATCH 033/836] [Restructure] Remove TODO.TXT in favor of tracker/wiki --- TODO.TXT | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 TODO.TXT diff --git a/TODO.TXT b/TODO.TXT deleted file mode 100644 index 433a9449d..000000000 --- a/TODO.TXT +++ /dev/null @@ -1,24 +0,0 @@ -To do: - -- Verify this TODO list -- Copy/Paste from 20.0.0.5 to 20.2.0.7 does not work as expected -- Size update not calculated correctly after string edits and array edits -- Initialise arrays from XML defaults -- Multitexturing of particles (eg. Tribunal.bsa\meshes\i\act_rockslide01.nif, Bloodmoon.bsa\meshes\w\w_art_ice_mace.nif) -- doxygen documentation of all classes and files -- Display all particle systems (eg. Florensia) -- Tag old releases -- Check i18n of strings, use QLocale for numbers -- Fix constraints display and spells -- Implement realtime mouse-driven scaling of UV data -- Investigate splitting a Morrowind anim.nif to xAnim.nif and xAnim.kf -- Fix endianness!!! Use QDataStream >> with custom operators -- Link "Update Center/Radius" spell from NiTriShape, not just the data -- Call "Update Center/Radius" spell automatically when scaling vertices or as sanitize spell -- Fix minor bugs in UV editor when data is shared across multiple shapes -- Track down all qWarning() uses where QMessageBox is more appropriate -- Use qAssert more often for debugging -- Force combine spells, etc. - see #3012991 -- Investigate adding a QScriptEngine for spells -- support 20.5.0.0+ NIFs using new NiDataStream format (compile in debug mode to see existing support) - From 425a689597d9b143f46d90042213663e74841fa6 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 16:14:24 -0500 Subject: [PATCH 034/836] [Restructure] Update README --- README.md | 58 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a2d513f93..16bcaec6e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,49 @@ -NIF is a popular file format used by 3D games such as Morrowind, Oblivion, Fallout 3, Civilization IV, and many more. NifSkope enables you to read and write files that are compatible with these games using an interactive editor. +================= + NifSkope +================= + +NifSkope is a tool for opening and editing the NetImmerse file format (NIF). NIF is used by video games such as Morrowind, Oblivion, Skyrim, Fallout 3, Fallout: New Vegas, Civilization IV, and more. + +Download +----------------- + +You can download the latest official release from [Sourceforge](https://sourceforge.net/projects/niftools/files/nifskope/). + + +Discussion & Help +----------------- + +Visit our forum at [NifTools.org](http://niftools.sourceforge.net/forum). To receive support for NifSkope please use the [NifSkope Help subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=24). + +#### Issues + +Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues) or in the [Bug Reports subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=24) at NifTools.org. -Changes: -*** changes **** - -Download nifskope here: -https://sourceforge.net/projects/niftools/files/nifskope/ - -For more documentation and help, visit the wiki or the forum: - -http://niftools.sourceforge.net/wiki -http://niftools.sourceforge.net/forum +Contribute +----------------- + +You can fork the latest source from [GitHub](https://github.com/niftools/nifskope). See [Fork A Repo](https://help.github.com/articles/fork-a-repo) on how to send your contributions upstream. To grab all submodules, make sure to use `--recursive` like so: + +``` +git clone --recursive git://github.com//nifskope.git +``` + +For information about development: + +- Visit the [NifSkope development subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=4) at NifTools.org. +- Refer to our [GitHub wiki](https://github.com/niftools/nifskope/wiki#wiki-development) for information on compilation. + + +Miscellaneous +----------------- + +Refer to these other documents in your installation folder or at the links provided: + +### [TROUBLESHOOTING](https://github.com/niftools/nifskope/blob/develop/TROUBLESHOOTING.md) + +### [CHANGELOG](https://github.com/niftools/nifskope/blob/develop/CHANGELOG.md) + +### [CONTRIBUTORS](https://github.com/niftools/nifskope/blob/develop/CONTRIBUTORS.md) + +### [LICENSE](https://github.com/niftools/nifskope/blob/develop/LICENSE.md) From bc4f8a8a00c0187b99822f52618d61944817cad6 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 16:23:29 -0500 Subject: [PATCH 035/836] [Restructure] Rename TXT files, create stubs --- CHANGELOG.TXT => CHANGELOG.md | 0 CONTRIBUTORS.md | 0 LICENSE.TXT => LICENSE.md | 0 TROUBLESHOOTING.md | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.TXT => CHANGELOG.md (100%) create mode 100644 CONTRIBUTORS.md rename LICENSE.TXT => LICENSE.md (100%) create mode 100644 TROUBLESHOOTING.md diff --git a/CHANGELOG.TXT b/CHANGELOG.md similarity index 100% rename from CHANGELOG.TXT rename to CHANGELOG.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 000000000..e69de29bb diff --git a/LICENSE.TXT b/LICENSE.md similarity index 100% rename from LICENSE.TXT rename to LICENSE.md diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md new file mode 100644 index 000000000..e69de29bb From a926e0d276172abc75e30d62647e7196593252c6 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 19:58:23 -0500 Subject: [PATCH 036/836] [Restructure] Move VERSION to /build --- VERSION => build/VERSION | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename VERSION => build/VERSION (100%) diff --git a/VERSION b/build/VERSION similarity index 100% rename from VERSION rename to build/VERSION From 4d5f533347782c52f9a3ff4cd32caa0ce3365c3d Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Wed, 5 Mar 2014 20:00:34 -0500 Subject: [PATCH 037/836] [Restructure] Add input file for README version --- README.md | 2 +- build/README.md.in | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 build/README.md.in diff --git a/README.md b/README.md index 16bcaec6e..c9d3564c1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ================= - NifSkope + NifSkope 1.1.4a0.dev0 ================= NifSkope is a tool for opening and editing the NetImmerse file format (NIF). NIF is used by video games such as Morrowind, Oblivion, Skyrim, Fallout 3, Fallout: New Vegas, Civilization IV, and more. diff --git a/build/README.md.in b/build/README.md.in new file mode 100644 index 000000000..fb46d5364 --- /dev/null +++ b/build/README.md.in @@ -0,0 +1,49 @@ +================= + NifSkope @VERSION@ +================= + +NifSkope is a tool for opening and editing the NetImmerse file format (NIF). NIF is used by video games such as Morrowind, Oblivion, Skyrim, Fallout 3, Fallout: New Vegas, Civilization IV, and more. + +Download +----------------- + +You can download the latest official release from [Sourceforge](https://sourceforge.net/projects/niftools/files/nifskope/). + + +Discussion & Help +----------------- + +Visit our forum at [NifTools.org](http://niftools.sourceforge.net/forum). To receive support for NifSkope please use the [NifSkope Help subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=24). + +#### Issues + +Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues) or in the [Bug Reports subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=24) at NifTools.org. + + +Contribute +----------------- + +You can fork the latest source from [GitHub](https://github.com/niftools/nifskope). See [Fork A Repo](https://help.github.com/articles/fork-a-repo) on how to send your contributions upstream. To grab all submodules, make sure to use `--recursive` like so: + +``` +git clone --recursive git://github.com//nifskope.git +``` + +For information about development: + +- Visit the [NifSkope development subforum](http://niftools.sourceforge.net/forum/viewforum.php?f=4) at NifTools.org. +- Refer to our [GitHub wiki](https://github.com/niftools/nifskope/wiki#wiki-development) for information on compilation. + + +Miscellaneous +----------------- + +Refer to these other documents in your installation folder or at the links provided: + +### [TROUBLESHOOTING](https://github.com/niftools/nifskope/blob/develop/TROUBLESHOOTING.md) + +### [CHANGELOG](https://github.com/niftools/nifskope/blob/develop/CHANGELOG.md) + +### [CONTRIBUTORS](https://github.com/niftools/nifskope/blob/develop/CONTRIBUTORS.md) + +### [LICENSE](https://github.com/niftools/nifskope/blob/develop/LICENSE.md) From 894827813f0883b5b7f6cd59544bdfb8f2adff24 Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Thu, 6 Mar 2014 09:04:02 -0500 Subject: [PATCH 038/836] [Restructure] Move docsys --- .gitmodules | 2 +- docsys => build/docsys | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename docsys => build/docsys (100%) diff --git a/.gitmodules b/.gitmodules index 6c664cde5..1c3d4b553 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "docsys"] - path = docsys + path = build/docsys url = git://github.com/niftools/nifdocsys.git [submodule "qhull"] path = lib/qhull diff --git a/docsys b/build/docsys similarity index 100% rename from docsys rename to build/docsys From 0f474d27017904dab938e26455a34d065cf9929c Mon Sep 17 00:00:00 2001 From: jonwd7 Date: Thu, 6 Mar 2014 17:02:39 -0500 Subject: [PATCH 039/836] [Restructure] New Doxyfile.in --- build/Doxyfile.in | 2526 ++++++++++++++++++++++++++++++++------------- 1 file changed, 1825 insertions(+), 701 deletions(-) diff --git a/build/Doxyfile.in b/build/Doxyfile.in index f705c51f4..e3c93597e 100644 --- a/build/Doxyfile.in +++ b/build/Doxyfile.in @@ -1,1257 +1,2381 @@ -# Doxyfile 1.5.2 +# Doxyfile 1.8.6 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. # The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of -# possible encodings. +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. -PROJECT_NAME = NifSkope +PROJECT_NAME = NifSkope -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. PROJECT_NUMBER = @VERSION@ -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# the documentation. The maximum height of the logo should not exceed 55 pixels +# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo +# to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. OUTPUT_DIRECTORY = apidocs -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. +# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. +# The default value is: YES. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief # description. +# The default value is: NO. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. +# The default value is: NO. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. +# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. JAVADOC_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. -MULTILINE_CPP_IS_BRIEF = NO +QT_AUTOBRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. -DETAILS_AT_TOP = NO +MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a +# new page for each member. If set to NO, the documentation of a member will be +# part of the file/class/namespace that contains it. +# The default value is: NO. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 4 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. +# +# Note For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. +# The default value is: NO. BUILTIN_STL_SUPPORT = NO # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. +# The default value is: NO. CPP_CLI_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. +# The default value is: NO. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. SUBGROUPING = YES +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 3 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# be included in the documentation. +# The default value is: NO. EXTRACT_PRIVATE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# included in the documentation. +# The default value is: NO. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. +# This flag is only useful for Objective-C code. When set to YES local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO only methods in the interface are +# included. +# The default value is: NO. -EXTRACT_LOCAL_METHODS = YES +EXTRACT_LOCAL_METHODS = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO these classes will be included in the various overviews. This option has +# no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO these declarations will be +# included in the documentation. +# The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. +# The default value is: system dependent. -CASE_SENSE_NAMES = YES +CASE_SENSE_NAMES = NO -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES the +# scope will be hidden. +# The default value is: NO. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: YES. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the +# todo list. This list is created by putting \todo commands in the +# documentation. +# The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. +# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the +# test list. This list is created by putting \test commands in the +# documentation. +# The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. +# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. +# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES the list +# will mention the files that were used to generate the documentation. +# The default value is: YES. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. -SHOW_DIRECTORIES = NO +SHOW_NAMESPACES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. FILE_VERSION_FILTER = +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. Do not use file names with spaces, bibtex cannot handle them. See +# also \cite for info how to create references. + +CITE_BIB_FILES = + #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# Configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. +# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO doxygen will only warn about wrong or incomplete parameter +# documentation, but not about the absence of documentation. +# The default value is: NO. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. -INPUT = +INPUT = @INPUT@ -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. -# See http://www.gnu.org/software/libiconv for the list of possible encodings. +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.f90 \ + *.f \ + *.for \ + *.tcl \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf \ + *.as \ + *.js + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. -EXCLUDE = release debug qhull docsys .git +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. +# The default value is: NO. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = moc_* GLee.* +EXCLUDE_PATTERNS = moc_* \ + GLee.* -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, -# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = * -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER ) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. FILTER_SOURCE_FILES = NO +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + #--------------------------------------------------------------------------- -# configuration options related to source browsing +# Configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. -REFERENCED_BY_RELATION = YES +REFERENCED_BY_RELATION = NO -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. -REFERENCES_RELATION = YES +REFERENCES_RELATION = NO -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more acurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# compiled with the --with-libclang option. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. -ALPHABETICAL_INDEX = NO +ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. +# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# The default value is: YES. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a # standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- +# defined cascading style sheet that is included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefor more robust against future updates. +# Doxygen will copy the style sheet file to the output directory. For an example +# see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the stylesheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.NifSkope + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be # written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated ( +# YES) or that it should be included in the master .chm file ( NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated ( +# YES) or a normal table of contents ( NO) in the .chm file. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = @GENERATE_QHP@ + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = ./NifSkope.qch + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = NifSkope + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = NifSkope + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = @QT_INSTALL_BINS@\qhelpgenerator.exe + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. ENUM_VALUES_PER_LINE = 4 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 -GENERATE_TREEVIEW = ALL +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. +EXT_LINKS_IN_WINDOW = NO -TREEVIEW_WIDTH = 250 +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /