diff --git a/bsa/bsa_archive.cpp b/bsa/bsa_archive.cpp index a08937c9eb..304dfd57af 100644 --- a/bsa/bsa_archive.cpp +++ b/bsa/bsa_archive.cpp @@ -153,7 +153,8 @@ public: static bool init = false; -// This is the only publicly exposed part in this file +// The functions below are the only publicly exposed part of this file + void insertBSAFactory() { if(!init) @@ -167,5 +168,5 @@ void addBSA(const char* name, const char* group) { insertBSAFactory(); ResourceGroupManager::getSingleton(). - addResourceLocation(name, "BSA", "General"); + addResourceLocation(name, "BSA", group); } diff --git a/nif/nif_file.cpp b/nif/nif_file.cpp index 3a4c2f37f8..8e9f5c8bb5 100644 --- a/nif/nif_file.cpp +++ b/nif/nif_file.cpp @@ -72,77 +72,78 @@ void NIFFile::parse() rec == "RootCollisionNode" || rec == "NiBSParticleNode" || rec == "NiBSAnimationNode" || - rec == "NiBillboardNode") r = new NiNode; + rec == "NiBillboardNode") { r = new NiNode; r->recType = RC_NiNode; } // Other nodes - else if(rec == "NiTriShape") r = new NiTriShape; - else if(rec == "NiRotatingParticles") r = new NiRotatingParticles; - else if(rec == "NiAutoNormalParticles") r = new NiAutoNormalParticles; - else if(rec == "NiCamera") r = new NiCamera; + else if(rec == "NiTriShape") { r = new NiTriShape; r->recType = RC_NiTriShape; } + else if(rec == "NiRotatingParticles") { r = new NiRotatingParticles; r->recType = RC_NiRotatingParticles; } + else if(rec == "NiAutoNormalParticles") { r = new NiAutoNormalParticles; r->recType = RC_NiAutoNormalParticles; } + else if(rec == "NiCamera") { r = new NiCamera; r->recType = RC_NiCamera; } // Properties - else if(rec == "NiTexturingProperty") r = new NiTexturingProperty; - else if(rec == "NiMaterialProperty") r = new NiMaterialProperty; - else if(rec == "NiZBufferProperty") r = new NiZBufferProperty; - else if(rec == "NiAlphaProperty") r = new NiAlphaProperty; - else if(rec == "NiVertexColorProperty") r = new NiVertexColorProperty; - else if(rec == "NiShadeProperty") r = new NiShadeProperty; - else if(rec == "NiDitherProperty") r = new NiDitherProperty; - else if(rec == "NiWireframeProperty") r = new NiWireframeProperty; - else if(rec == "NiSpecularProperty") r = new NiSpecularProperty; + else if(rec == "NiTexturingProperty") { r = new NiTexturingProperty; r->recType = RC_NitexturingProperty; } + else if(rec == "NiMaterialProperty") { r = new NiMaterialProperty; r->recType = RC_NiMaterialProperty; } + else if(rec == "NiZBufferProperty") { r = new NiZBufferProperty; r->recType = RC_NiZBufferProperty; } + else if(rec == "NiAlphaProperty") { r = new NiAlphaProperty; r->recType = RC_NiAlphaProperty; } + else if(rec == "NiVertexColorProperty") { r = new NiVertexColorProperty; r->recType = RC_NiVertexColorProperty; } + else if(rec == "NiShadeProperty") { r = new NiShadeProperty; r->recType = RC_NiShadeProperty; } + else if(rec == "NiDitherProperty") { r = new NiDitherProperty; r->recType = RC_NiDitherProperty; } + else if(rec == "NiWireframeProperty") { r = new NiWireframeProperty; r->recType = RC_NiWireframeProperty; } + else if(rec == "NiSpecularProperty") { r = new NiSpecularProperty; r->recType = RC_NiSpecularProperty; } // Controllers - else if(rec == "NiVisController") r = new NiVisController; - else if(rec == "NiGeomMorpherController") r = new NiGeomMorpherController; - else if(rec == "NiKeyframeController") r = new NiKeyframeController; - else if(rec == "NiAlphaController") r = new NiAlphaController; - else if(rec == "NiUVController") r = new NiUVController; - else if(rec == "NiPathController") r = new NiPathController; - else if(rec == "NiMaterialColorController") r = new NiMaterialColorController; - else if(rec == "NiBSPArrayController") r = new NiBSPArrayController; - else if(rec == "NiParticleSystemController") r = new NiParticleSystemController; + else if(rec == "NiVisController") { r = new NiVisController; r->recType = RC_NiVisController; } + else if(rec == "NiGeomMorpherController") { r = new NiGeomMorpherController; r->recType = RC_NiGeomMorpherController; } + else if(rec == "NiKeyframeController") { r = new NiKeyframeController; r->recType = RC_NiKeyframeController; } + else if(rec == "NiAlphaController") { r = new NiAlphaController; r->recType = RC_NiAlphaController; } + else if(rec == "NiUVController") { r = new NiUVController; r->recType = RC_NiUVController; } + else if(rec == "NiPathController") { r = new NiPathController; r->recType = RC_NiPathController; } + else if(rec == "NiMaterialColorController") { r = new NiMaterialColorController; r->recType = RC_NiMaterialColorController; } + else if(rec == "NiBSPArrayController") { r = new NiBSPArrayController; r->recType = RC_NiBSPArrayController; } + else if(rec == "NiParticleSystemController") { r = new NiParticleSystemController; r->recType = RC_NiParticleSystemController; } // Effects else if(rec == "NiAmbientLight" || - rec == "NiDirectionalLight") r = new NiLight; - else if(rec == "NiTextureEffect") r = new NiTextureEffect; + rec == "NiDirectionalLight") { r = new NiLight; r->recType = RC_NiLight; } + else if(rec == "NiTextureEffect") { r = new NiTextureEffect; r->recType = RC_NiTextureEffect; } // Extra Data - else if(rec == "NiVertWeightsExtraData") r = new NiVertWeightsExtraData; - else if(rec == "NiTextKeyExtraData") r = new NiTextKeyExtraData; - else if(rec == "NiStringExtraData") r = new NiStringExtraData; + else if(rec == "NiVertWeightsExtraData") { r = new NiVertWeightsExtraData; r->recType = RC_NiVertWeightsExtraData; } + else if(rec == "NiTextKeyExtraData") { r = new NiTextKeyExtraData; r->recType = RC_NiTextKeyExtraData; } + else if(rec == "NiStringExtraData") { r = new NiStringExtraData; r->recType = RC_NiStringExtraData; } - else if(rec == "NiGravity") r = new NiGravity; - else if(rec == "NiPlanarCollider") r = new NiPlanarCollider; - else if(rec == "NiParticleGrowFade") r = new NiParticleGrowFade; - else if(rec == "NiParticleColorModifier") r = new NiParticleColorModifier; - else if(rec == "NiParticleRotation") r = new NiParticleRotation; + else if(rec == "NiGravity") { r = new NiGravity; r->recType = RC_NiGravity; } + else if(rec == "NiPlanarCollider") { r = new NiPlanarCollider; r->recType = RC_NiPlanarCollider; } + else if(rec == "NiParticleGrowFade") { r = new NiParticleGrowFade; r->recType = RC_NiParticleGrowFade; } + else if(rec == "NiParticleColorModifier") { r = new NiParticleColorModifier; r->recType = RC_NiParticleColorModifier; } + else if(rec == "NiParticleRotation") { r = new NiParticleRotation; r->recType = RC_NiParticleRotation; } // Data - else if(rec == "NiFloatData") r = new NiFloatData; - else if(rec == "NiTriShapeData") r = new NiTriShapeData; - else if(rec == "NiVisData") r = new NiVisData; - else if(rec == "NiColorData") r = new NiColorData; - else if(rec == "NiPixelData") r = new NiPixelData; - else if(rec == "NiMorphData") r = new NiMorphData; - else if(rec == "NiKeyframeData") r = new NiKeyframeData; - else if(rec == "NiSkinData") r = new NiSkinData; - else if(rec == "NiUVData") r = new NiUVData; - else if(rec == "NiPosData") r = new NiPosData; - else if(rec == "NiRotatingParticlesData") r = new NiRotatingParticlesData; - else if(rec == "NiAutoNormalParticlesData") r = new NiAutoNormalParticlesData; + else if(rec == "NiFloatData") { r = new NiFloatData; r->recType = RC_NiFloatData; } + else if(rec == "NiTriShapeData") { r = new NiTriShapeData; r->recType = RC_NiTriShapeData; } + else if(rec == "NiVisData") { r = new NiVisData; r->recType = RC_NiVisData; } + else if(rec == "NiColorData") { r = new NiColorData; r->recType = RC_NiColorData; } + else if(rec == "NiPixelData") { r = new NiPixelData; r->recType = RC_NiPixelData; } + else if(rec == "NiMorphData") { r = new NiMorphData; r->recType = RC_NiMorphData; } + else if(rec == "NiKeyframeData") { r = new NiKeyframeData; r->recType = RC_NiKeyframeData; } + else if(rec == "NiSkinData") { r = new NiSkinData; r->recType = RC_NiSkindata; } + else if(rec == "NiUVData") { r = new NiUVData; r->recType = RC_NiUVData; } + else if(rec == "NiPosData") { r = new NiPosData; r->recType = RC_NiPosData; } + else if(rec == "NiRotatingParticlesData") { r = new NiRotatingParticlesData; r->recType = RC_NiRotatingParticlesData; } + else if(rec == "NiAutoNormalParticlesData") { r = new NiAutoNormalParticlesData; r->recType = RC_NiAutoNormalParticlesData; } // Other - else if(rec == "NiSequenceStreamHelper") r = new NiSequenceStreamHelper; - else if(rec == "NiSourceTexture") r = new NiSourceTexture; - else if(rec == "NiSkinInstance") r = new NiSkinInstance; + else if(rec == "NiSequenceStreamHelper") { r = new NiSequenceStreamHelper; r->recType = RC_NiSequenceStreamHelper; } + else if(rec == "NiSourceTexture") { r = new NiSourceTexture; r->recType = RC_NiSourceTexture; } + else if(rec == "NiSkinInstance") { r = new NiSkinInstance; r->recType = RC_NiSkinInstance; } // Failure else fail("Unknown record type " + rec.toString()); assert(r != NULL); - r->recType = rec; + assert(r->recType != RC_NONE); + r->recName = rec; records[i] = r; r->read(this); } diff --git a/nif/record.h b/nif/record.h index 07a7cc82df..fe0115834b 100644 --- a/nif/record.h +++ b/nif/record.h @@ -29,11 +29,67 @@ namespace Nif class NIFFile; +enum RecordType +{ + RC_NONE = 0, + RC_NiNode, + RC_NiTriShape, + RC_NiRotatingParticles, + RC_NiAutoNormalParticles, + RC_NiCamera, + RC_NitexturingProperty, + RC_NiMaterialProperty, + RC_NiZBufferProperty, + RC_NiAlphaProperty, + RC_NiVertexColorProperty, + RC_NiShadeProperty, + RC_NiDitherProperty, + RC_NiWireframeProperty, + RC_NiSpecularProperty, + RC_NiVisController, + RC_NiGeomMorpherController, + RC_NiKeyframeController, + RC_NiAlphaController, + RC_NiUVController, + RC_NiPathController, + RC_NiMaterialColorController, + RC_NiBSPArrayController, + RC_NiParticleSystemController, + RC_NiLight, + RC_NiTextureEffect, + RC_NiVertWeightsExtraData, + RC_NiTextKeyExtraData, + RC_NiStringExtraData, + RC_NiGravity, + RC_NiPlanarCollider, + RC_NiParticleGrowFade, + RC_NiParticleColorModifier, + RC_NiParticleRotation, + RC_NiFloatData, + RC_NiTriShapeData, + RC_NiVisData, + RC_NiColorData, + RC_NiPixelData, + RC_NiMorphData, + RC_NiKeyframeData, + RC_NiSkindata, + RC_NiUVData, + RC_NiPosData, + RC_NiRotatingParticlesData, + RC_NiAutoNormalParticlesData, + RC_NiSequenceStreamHelper, + RC_NiSourceTexture, + RC_NiSkinInstance +}; + /// Base class for all records struct Record { - // Record type name - SString recType; + // Record type and type name + int recType; + SString recName; + + Record() : recType(RC_NONE) {} virtual void read(NIFFile *nif) = 0; diff --git a/nifogre/ogre_nif_loader.cpp b/nifogre/ogre_nif_loader.cpp index 680637fd54..2c53cc65dc 100644 --- a/nifogre/ogre_nif_loader.cpp +++ b/nifogre/ogre_nif_loader.cpp @@ -72,7 +72,7 @@ void NIFLoader::loadResource(Resource *resource) int n = nif.numRecords(); cout << "Number of records: " << n << endl; if(n) - cout << "First record type: " << nif.getRecord(0)->recType.toString() << endl; + cout << "First record type: " << nif.getRecord(0)->recName.toString() << endl; } MeshPtr NIFLoader::load(const char* name, const char* group)