From 9be00bfdc05db5ed16e16d45a94599c501606326 Mon Sep 17 00:00:00 2001 From: Shon Ferguson <shonferg@users.sourceforge.net> Date: Sun, 6 May 2007 03:30:40 +0000 Subject: [PATCH] Fixed spelling of license. Updated Niflib to the latest XML which adds support for bhkMeshShape, NiMultiTextureProperty, NiRawImageData, and NiSequence. --- include/ComplexShape.h | 2 +- include/Key.h | 2 +- include/NIF_IO.h | 2 +- include/Ref.h | 2 +- include/Type.h | 2 +- include/dll_export.h | 2 +- include/gen/ByteColor3.h | 46 + include/gen/LODRange.h | 4 + include/gen/RagDollDescriptor.h | 10 +- include/gen/obj_defines.h | 79 +- include/nif_basic_types.h | 2 +- include/nif_math.h | 2 +- include/nif_versions.h | 2 +- include/obj/ABoneLODController.h | 2 +- include/obj/AKeyedData.h | 2 +- include/obj/APSysCtlr.h | 2 +- include/obj/APSysData.h | 2 +- include/obj/AParticleModifier.h | 2 +- include/obj/AbhkConstraint.h | 2 +- include/obj/AbhkRagdollConstraint.h | 4 +- include/obj/AbhkShapeCollection.h | 2 +- include/obj/AvoidNode.h | 4 +- include/obj/BSBound.h | 2 +- include/obj/BSFurnitureMarker.h | 2 +- include/obj/BSKeyframeController.h | 2 +- include/obj/BSPSysArrayEmitter.h | 2 +- include/obj/BSParentVelocityModifier.h | 2 +- include/obj/BSXFlags.h | 2 +- include/obj/FxButton.h | 2 +- include/obj/FxRadioButton.h | 2 +- include/obj/FxWidget.h | 2 +- include/obj/NiAVObject.h | 2 +- include/obj/NiAlphaController.h | 2 +- include/obj/NiAlphaProperty.h | 2 +- include/obj/NiAmbientLight.h | 2 +- include/obj/NiAutoNormalParticles.h | 2 +- include/obj/NiAutoNormalParticlesData.h | 2 +- include/obj/NiBSAnimationNode.h | 2 +- include/obj/NiBSBoneLODController.h | 2 +- include/obj/NiBSPArrayController.h | 2 +- include/obj/NiBSParticleNode.h | 2 +- include/obj/NiBSplineBasisData.h | 2 +- include/obj/NiBSplineCompFloatInterpolator.h | 2 +- include/obj/NiBSplineCompPoint3Interpolator.h | 2 +- .../obj/NiBSplineCompTransformInterpolator.h | 2 +- include/obj/NiBSplineData.h | 2 +- include/obj/NiBSplineInterpolator.h | 2 +- include/obj/NiBillboardNode.h | 2 +- include/obj/NiBinaryExtraData.h | 2 +- include/obj/NiBlendBoolInterpolator.h | 2 +- include/obj/NiBlendFloatInterpolator.h | 2 +- include/obj/NiBlendInterpolator.h | 2 +- include/obj/NiBlendPoint3Interpolator.h | 2 +- include/obj/NiBlendTransformInterpolator.h | 2 +- include/obj/NiBoneLODController.h | 2 +- include/obj/NiBoolData.h | 2 +- include/obj/NiBoolInterpolator.h | 2 +- include/obj/NiBoolTimelineInterpolator.h | 2 +- include/obj/NiBooleanExtraData.h | 2 +- include/obj/NiCamera.h | 2 +- include/obj/NiClod.h | 2 +- include/obj/NiClodData.h | 2 +- include/obj/NiClodSkinInstance.h | 2 +- include/obj/NiCollisionData.h | 2 +- include/obj/NiCollisionObject.h | 2 +- include/obj/NiColorData.h | 2 +- include/obj/NiColorExtraData.h | 2 +- include/obj/NiControllerManager.h | 2 +- include/obj/NiControllerSequence.h | 4 +- include/obj/NiDefaultAVObjectPalette.h | 2 +- include/obj/NiDirectionalLight.h | 2 +- include/obj/NiDitherProperty.h | 2 +- include/obj/NiDynamicEffect.h | 2 +- include/obj/NiExtraData.h | 2 +- include/obj/NiFlipController.h | 2 +- include/obj/NiFloatData.h | 2 +- include/obj/NiFloatExtraData.h | 2 +- include/obj/NiFloatExtraDataController.h | 2 +- include/obj/NiFloatInterpolator.h | 2 +- include/obj/NiFloatsExtraData.h | 2 +- include/obj/NiFogProperty.h | 2 +- include/obj/NiGeomMorpherController.h | 2 +- include/obj/NiGeometry.h | 2 +- include/obj/NiGeometryData.h | 2 +- include/obj/NiGravity.h | 2 +- include/obj/NiImage.h | 2 +- include/obj/NiIntegerExtraData.h | 2 +- include/obj/NiIntegersExtraData.h | 2 +- include/obj/NiInterpolator.h | 2 +- include/obj/NiKeyframeController.h | 2 +- include/obj/NiKeyframeData.h | 2 +- include/obj/NiLODData.h | 2 +- include/obj/NiLODNode.h | 2 +- include/obj/NiLight.h | 2 +- include/obj/NiLightColorController.h | 2 +- include/obj/NiLightDimmerController.h | 2 +- include/obj/NiLookAtController.h | 2 +- include/obj/NiLookAtInterpolator.h | 2 +- include/obj/NiMaterialColorController.h | 2 +- include/obj/NiMaterialProperty.h | 2 +- include/obj/NiMeshPSysData.h | 2 +- include/obj/NiMeshParticleSystem.h | 2 +- include/obj/NiMorphData.h | 2 +- .../obj/NiMultiTargetTransformController.h | 2 +- include/obj/NiMultiTextureProperty.h | 48 + include/obj/NiNode.h | 2 +- include/obj/NiObject.h | 2 +- include/obj/NiObjectNET.h | 2 +- include/obj/NiPSysAgeDeathModifier.h | 2 +- include/obj/NiPSysBombModifier.h | 2 +- include/obj/NiPSysBoundUpdateModifier.h | 2 +- include/obj/NiPSysBoxEmitter.h | 2 +- include/obj/NiPSysColliderManager.h | 2 +- include/obj/NiPSysColorModifier.h | 2 +- include/obj/NiPSysCylinderEmitter.h | 2 +- include/obj/NiPSysData.h | 2 +- include/obj/NiPSysDragModifier.h | 2 +- include/obj/NiPSysEmitter.h | 2 +- include/obj/NiPSysEmitterCtlr.h | 2 +- include/obj/NiPSysEmitterCtlrData.h | 2 +- include/obj/NiPSysEmitterDeclinationCtlr.h | 2 +- include/obj/NiPSysEmitterDeclinationVarCtlr.h | 2 +- include/obj/NiPSysEmitterInitialRadiusCtlr.h | 2 +- include/obj/NiPSysEmitterLifeSpanCtlr.h | 2 +- include/obj/NiPSysEmitterSpeedCtlr.h | 2 +- include/obj/NiPSysGravityModifier.h | 2 +- include/obj/NiPSysGravityStrengthCtlr.h | 2 +- include/obj/NiPSysGrowFadeModifier.h | 2 +- include/obj/NiPSysMeshEmitter.h | 2 +- include/obj/NiPSysMeshUpdateModifier.h | 2 +- include/obj/NiPSysModifier.h | 2 +- include/obj/NiPSysModifierActiveCtlr.h | 2 +- include/obj/NiPSysPlanarCollider.h | 2 +- include/obj/NiPSysPositionModifier.h | 2 +- include/obj/NiPSysResetOnLoopCtlr.h | 2 +- include/obj/NiPSysRotationModifier.h | 2 +- include/obj/NiPSysSpawnModifier.h | 2 +- include/obj/NiPSysSphereEmitter.h | 2 +- include/obj/NiPSysUpdateCtlr.h | 2 +- include/obj/NiPSysVolumeEmitter.h | 2 +- include/obj/NiPalette.h | 2 +- include/obj/NiParticleBomb.h | 2 +- include/obj/NiParticleColorModifier.h | 2 +- include/obj/NiParticleGrowFade.h | 2 +- include/obj/NiParticleMeshModifier.h | 2 +- include/obj/NiParticleMeshes.h | 2 +- include/obj/NiParticleMeshesData.h | 2 +- include/obj/NiParticleRotation.h | 2 +- include/obj/NiParticleSystem.h | 2 +- include/obj/NiParticleSystemController.h | 2 +- include/obj/NiParticles.h | 2 +- include/obj/NiParticlesData.h | 2 +- include/obj/NiPathController.h | 2 +- include/obj/NiPathInterpolator.h | 2 +- include/obj/NiPixelData.h | 2 +- include/obj/NiPlanarCollider.h | 2 +- include/obj/NiPoint3Interpolator.h | 2 +- include/obj/NiPointLight.h | 2 +- include/obj/NiPosData.h | 2 +- include/obj/NiProperty.h | 2 +- include/obj/NiRangeLODData.h | 2 +- include/obj/NiRawImageData.h | 45 + include/obj/NiRotatingParticles.h | 2 +- include/obj/NiRotatingParticlesData.h | 2 +- include/obj/NiScreenLODData.h | 2 +- include/obj/NiSequence.h | 49 + include/obj/NiSequenceStreamHelper.h | 2 +- include/obj/NiShadeProperty.h | 2 +- include/obj/NiSingleInterpolatorController.h | 2 +- include/obj/NiSkinData.h | 2 +- include/obj/NiSkinInstance.h | 2 +- include/obj/NiSkinPartition.h | 2 +- include/obj/NiSourceTexture.h | 2 +- include/obj/NiSpecularProperty.h | 2 +- include/obj/NiSphericalCollider.h | 2 +- include/obj/NiSpotLight.h | 2 +- include/obj/NiStencilProperty.h | 2 +- include/obj/NiStringExtraData.h | 2 +- include/obj/NiStringPalette.h | 2 +- include/obj/NiStringsExtraData.h | 2 +- include/obj/NiTextKeyExtraData.h | 2 +- include/obj/NiTextureEffect.h | 2 +- include/obj/NiTextureModeProperty.h | 2 +- include/obj/NiTextureProperty.h | 2 +- include/obj/NiTextureTransformController.h | 2 +- include/obj/NiTexturingProperty.h | 2 +- include/obj/NiTimeController.h | 2 +- include/obj/NiTransformController.h | 2 +- include/obj/NiTransformData.h | 2 +- include/obj/NiTransformInterpolator.h | 2 +- include/obj/NiTriBasedGeom.h | 2 +- include/obj/NiTriBasedGeomData.h | 2 +- include/obj/NiTriShape.h | 2 +- include/obj/NiTriShapeData.h | 2 +- include/obj/NiTriStrips.h | 2 +- include/obj/NiTriStripsData.h | 2 +- include/obj/NiUVController.h | 2 +- include/obj/NiUVData.h | 2 +- include/obj/NiVectorExtraData.h | 2 +- include/obj/NiVertWeightsExtraData.h | 2 +- include/obj/NiVertexColorProperty.h | 2 +- include/obj/NiVisController.h | 2 +- include/obj/NiVisData.h | 2 +- include/obj/NiWireframeProperty.h | 2 +- include/obj/NiZBufferProperty.h | 2 +- include/obj/RootCollisionNode.h | 2 +- include/obj/bhkBlendCollisionObject.h | 2 +- include/obj/bhkBlendController.h | 2 +- include/obj/bhkBoxShape.h | 2 +- include/obj/bhkCapsuleShape.h | 2 +- include/obj/bhkCollisionObject.h | 2 +- include/obj/bhkConvexShape.h | 2 +- include/obj/bhkConvexTransformShape.h | 2 +- include/obj/bhkConvexVerticesShape.h | 2 +- include/obj/bhkEntity.h | 2 +- include/obj/bhkHingeConstraint.h | 2 +- include/obj/bhkLimitedHingeConstraint.h | 2 +- include/obj/bhkListShape.h | 2 +- include/obj/bhkMalleableConstraint.h | 2 +- include/obj/bhkMeshShape.h | 47 + include/obj/bhkMoppBvTreeShape.h | 2 +- include/obj/bhkMultiSphereShape.h | 2 +- include/obj/bhkNiTriStripsShape.h | 2 +- include/obj/bhkPackedNiTriStripsShape.h | 2 +- include/obj/bhkPrismaticConstraint.h | 2 +- include/obj/bhkRagdollConstraint.h | 2 +- include/obj/bhkRefObject.h | 2 +- include/obj/bhkRigidBody.h | 2 +- include/obj/bhkRigidBodyT.h | 2 +- include/obj/bhkSPCollisionObject.h | 2 +- include/obj/bhkSerializable.h | 2 +- include/obj/bhkShape.h | 2 +- include/obj/bhkSimpleShapePhantom.h | 2 +- include/obj/bhkSphereRepShape.h | 2 +- include/obj/bhkSphereShape.h | 2 +- include/obj/bhkStiffSpringConstraint.h | 2 +- include/obj/bhkTransformShape.h | 2 +- include/obj/bhkWorldObject.h | 2 +- include/obj/hkPackedNiTriStripsData.h | 2 +- niflib.vcproj | 40 + src/ComplexShape.cpp | 2 +- src/NIF_IO.cpp | 2 +- src/Type.cpp | 2 +- src/gen/ByteColor3.cpp | 28 + src/gen/LODRange.cpp | 1 + src/gen/RagDollDescriptor.cpp | 10 +- src/gen/obj_impl.cpp | 902 +++++++++++++----- src/nif_math.cpp | 2 +- src/niflib.cpp | 2 +- src/obj/ABoneLODController.cpp | 2 +- src/obj/AKeyedData.cpp | 2 +- src/obj/APSysCtlr.cpp | 2 +- src/obj/APSysData.cpp | 2 +- src/obj/AParticleModifier.cpp | 2 +- src/obj/AbhkConstraint.cpp | 2 +- src/obj/AbhkRagdollConstraint.cpp | 2 +- src/obj/AbhkShapeCollection.cpp | 2 +- src/obj/AvoidNode.cpp | 7 +- src/obj/BSBound.cpp | 2 +- src/obj/BSFurnitureMarker.cpp | 2 +- src/obj/BSKeyframeController.cpp | 2 +- src/obj/BSPSysArrayEmitter.cpp | 2 +- src/obj/BSParentVelocityModifier.cpp | 2 +- src/obj/BSXFlags.cpp | 2 +- src/obj/FxButton.cpp | 2 +- src/obj/FxRadioButton.cpp | 2 +- src/obj/FxWidget.cpp | 2 +- src/obj/NiAVObject.cpp | 2 +- src/obj/NiAlphaController.cpp | 2 +- src/obj/NiAlphaProperty.cpp | 2 +- src/obj/NiAmbientLight.cpp | 2 +- src/obj/NiAutoNormalParticles.cpp | 2 +- src/obj/NiAutoNormalParticlesData.cpp | 2 +- src/obj/NiBSAnimationNode.cpp | 2 +- src/obj/NiBSBoneLODController.cpp | 2 +- src/obj/NiBSPArrayController.cpp | 2 +- src/obj/NiBSParticleNode.cpp | 2 +- src/obj/NiBSplineBasisData.cpp | 2 +- src/obj/NiBSplineCompFloatInterpolator.cpp | 2 +- src/obj/NiBSplineCompPoint3Interpolator.cpp | 2 +- .../NiBSplineCompTransformInterpolator.cpp | 2 +- src/obj/NiBSplineData.cpp | 2 +- src/obj/NiBSplineInterpolator.cpp | 2 +- src/obj/NiBillboardNode.cpp | 2 +- src/obj/NiBinaryExtraData.cpp | 2 +- src/obj/NiBlendBoolInterpolator.cpp | 2 +- src/obj/NiBlendFloatInterpolator.cpp | 2 +- src/obj/NiBlendInterpolator.cpp | 2 +- src/obj/NiBlendPoint3Interpolator.cpp | 2 +- src/obj/NiBlendTransformInterpolator.cpp | 2 +- src/obj/NiBoneLODController.cpp | 2 +- src/obj/NiBoolData.cpp | 2 +- src/obj/NiBoolInterpolator.cpp | 2 +- src/obj/NiBoolTimelineInterpolator.cpp | 2 +- src/obj/NiBooleanExtraData.cpp | 2 +- src/obj/NiCamera.cpp | 2 +- src/obj/NiClod.cpp | 2 +- src/obj/NiClodData.cpp | 2 +- src/obj/NiClodSkinInstance.cpp | 2 +- src/obj/NiCollisionData.cpp | 2 +- src/obj/NiCollisionObject.cpp | 2 +- src/obj/NiColorData.cpp | 2 +- src/obj/NiColorExtraData.cpp | 2 +- src/obj/NiControllerManager.cpp | 2 +- src/obj/NiControllerSequence.cpp | 2 +- src/obj/NiDefaultAVObjectPalette.cpp | 2 +- src/obj/NiDirectionalLight.cpp | 2 +- src/obj/NiDitherProperty.cpp | 2 +- src/obj/NiDynamicEffect.cpp | 2 +- src/obj/NiExtraData.cpp | 2 +- src/obj/NiFlipController.cpp | 2 +- src/obj/NiFloatData.cpp | 2 +- src/obj/NiFloatExtraData.cpp | 2 +- src/obj/NiFloatExtraDataController.cpp | 2 +- src/obj/NiFloatInterpolator.cpp | 2 +- src/obj/NiFloatsExtraData.cpp | 2 +- src/obj/NiFogProperty.cpp | 2 +- src/obj/NiGeomMorpherController.cpp | 2 +- src/obj/NiGeometry.cpp | 2 +- src/obj/NiGeometryData.cpp | 2 +- src/obj/NiGravity.cpp | 2 +- src/obj/NiImage.cpp | 2 +- src/obj/NiIntegerExtraData.cpp | 2 +- src/obj/NiIntegersExtraData.cpp | 2 +- src/obj/NiInterpolator.cpp | 2 +- src/obj/NiKeyframeController.cpp | 2 +- src/obj/NiKeyframeData.cpp | 2 +- src/obj/NiLODData.cpp | 2 +- src/obj/NiLODNode.cpp | 2 +- src/obj/NiLight.cpp | 2 +- src/obj/NiLightColorController.cpp | 2 +- src/obj/NiLightDimmerController.cpp | 2 +- src/obj/NiLookAtController.cpp | 2 +- src/obj/NiLookAtInterpolator.cpp | 2 +- src/obj/NiMaterialColorController.cpp | 2 +- src/obj/NiMaterialProperty.cpp | 2 +- src/obj/NiMeshPSysData.cpp | 2 +- src/obj/NiMeshParticleSystem.cpp | 2 +- src/obj/NiMorphData.cpp | 2 +- src/obj/NiMultiTargetTransformController.cpp | 2 +- src/obj/NiMultiTextureProperty.cpp | 62 ++ src/obj/NiNode.cpp | 2 +- src/obj/NiObject.cpp | 2 +- src/obj/NiObjectNET.cpp | 2 +- src/obj/NiPSysAgeDeathModifier.cpp | 2 +- src/obj/NiPSysBombModifier.cpp | 2 +- src/obj/NiPSysBoundUpdateModifier.cpp | 2 +- src/obj/NiPSysBoxEmitter.cpp | 2 +- src/obj/NiPSysColliderManager.cpp | 2 +- src/obj/NiPSysColorModifier.cpp | 2 +- src/obj/NiPSysCylinderEmitter.cpp | 2 +- src/obj/NiPSysData.cpp | 2 +- src/obj/NiPSysDragModifier.cpp | 2 +- src/obj/NiPSysEmitter.cpp | 2 +- src/obj/NiPSysEmitterCtlr.cpp | 2 +- src/obj/NiPSysEmitterCtlrData.cpp | 2 +- src/obj/NiPSysEmitterDeclinationCtlr.cpp | 2 +- src/obj/NiPSysEmitterDeclinationVarCtlr.cpp | 2 +- src/obj/NiPSysEmitterInitialRadiusCtlr.cpp | 2 +- src/obj/NiPSysEmitterLifeSpanCtlr.cpp | 2 +- src/obj/NiPSysEmitterSpeedCtlr.cpp | 2 +- src/obj/NiPSysGravityModifier.cpp | 2 +- src/obj/NiPSysGravityStrengthCtlr.cpp | 2 +- src/obj/NiPSysGrowFadeModifier.cpp | 2 +- src/obj/NiPSysMeshEmitter.cpp | 2 +- src/obj/NiPSysMeshUpdateModifier.cpp | 2 +- src/obj/NiPSysModifier.cpp | 2 +- src/obj/NiPSysModifierActiveCtlr.cpp | 2 +- src/obj/NiPSysPlanarCollider.cpp | 2 +- src/obj/NiPSysPositionModifier.cpp | 2 +- src/obj/NiPSysResetOnLoopCtlr.cpp | 2 +- src/obj/NiPSysRotationModifier.cpp | 2 +- src/obj/NiPSysSpawnModifier.cpp | 2 +- src/obj/NiPSysSphereEmitter.cpp | 2 +- src/obj/NiPSysUpdateCtlr.cpp | 2 +- src/obj/NiPSysVolumeEmitter.cpp | 2 +- src/obj/NiPalette.cpp | 2 +- src/obj/NiParticleBomb.cpp | 2 +- src/obj/NiParticleColorModifier.cpp | 2 +- src/obj/NiParticleGrowFade.cpp | 2 +- src/obj/NiParticleMeshModifier.cpp | 2 +- src/obj/NiParticleMeshes.cpp | 2 +- src/obj/NiParticleMeshesData.cpp | 2 +- src/obj/NiParticleRotation.cpp | 2 +- src/obj/NiParticleSystem.cpp | 2 +- src/obj/NiParticleSystemController.cpp | 2 +- src/obj/NiParticles.cpp | 2 +- src/obj/NiParticlesData.cpp | 2 +- src/obj/NiPathController.cpp | 2 +- src/obj/NiPathInterpolator.cpp | 2 +- src/obj/NiPixelData.cpp | 2 +- src/obj/NiPlanarCollider.cpp | 2 +- src/obj/NiPoint3Interpolator.cpp | 2 +- src/obj/NiPointLight.cpp | 2 +- src/obj/NiPosData.cpp | 2 +- src/obj/NiProperty.cpp | 2 +- src/obj/NiRangeLODData.cpp | 2 +- src/obj/NiRawImageData.cpp | 62 ++ src/obj/NiRotatingParticles.cpp | 2 +- src/obj/NiRotatingParticlesData.cpp | 2 +- src/obj/NiScreenLODData.cpp | 2 +- src/obj/NiSequence.cpp | 67 ++ src/obj/NiSequenceStreamHelper.cpp | 2 +- src/obj/NiShadeProperty.cpp | 2 +- src/obj/NiSingleInterpolatorController.cpp | 2 +- src/obj/NiSkinData.cpp | 2 +- src/obj/NiSkinInstance.cpp | 2 +- src/obj/NiSkinPartition.cpp | 2 +- src/obj/NiSourceTexture.cpp | 2 +- src/obj/NiSpecularProperty.cpp | 2 +- src/obj/NiSphericalCollider.cpp | 2 +- src/obj/NiSpotLight.cpp | 2 +- src/obj/NiStencilProperty.cpp | 2 +- src/obj/NiStringExtraData.cpp | 2 +- src/obj/NiStringPalette.cpp | 2 +- src/obj/NiStringsExtraData.cpp | 2 +- src/obj/NiTextKeyExtraData.cpp | 2 +- src/obj/NiTextureEffect.cpp | 2 +- src/obj/NiTextureModeProperty.cpp | 2 +- src/obj/NiTextureProperty.cpp | 2 +- src/obj/NiTextureTransformController.cpp | 2 +- src/obj/NiTexturingProperty.cpp | 2 +- src/obj/NiTimeController.cpp | 2 +- src/obj/NiTransformController.cpp | 2 +- src/obj/NiTransformData.cpp | 2 +- src/obj/NiTransformInterpolator.cpp | 2 +- src/obj/NiTriBasedGeom.cpp | 2 +- src/obj/NiTriBasedGeomData.cpp | 2 +- src/obj/NiTriShape.cpp | 2 +- src/obj/NiTriShapeData.cpp | 2 +- src/obj/NiTriStrips.cpp | 2 +- src/obj/NiTriStripsData.cpp | 2 +- src/obj/NiUVController.cpp | 2 +- src/obj/NiUVData.cpp | 2 +- src/obj/NiVectorExtraData.cpp | 2 +- src/obj/NiVertWeightsExtraData.cpp | 2 +- src/obj/NiVertexColorProperty.cpp | 2 +- src/obj/NiVisController.cpp | 2 +- src/obj/NiVisData.cpp | 2 +- src/obj/NiWireframeProperty.cpp | 2 +- src/obj/NiZBufferProperty.cpp | 2 +- src/obj/RootCollisionNode.cpp | 2 +- src/obj/bhkBlendCollisionObject.cpp | 2 +- src/obj/bhkBlendController.cpp | 2 +- src/obj/bhkBoxShape.cpp | 2 +- src/obj/bhkCapsuleShape.cpp | 2 +- src/obj/bhkCollisionObject.cpp | 2 +- src/obj/bhkConvexShape.cpp | 2 +- src/obj/bhkConvexTransformShape.cpp | 2 +- src/obj/bhkConvexVerticesShape.cpp | 2 +- src/obj/bhkEntity.cpp | 2 +- src/obj/bhkHingeConstraint.cpp | 2 +- src/obj/bhkLimitedHingeConstraint.cpp | 2 +- src/obj/bhkListShape.cpp | 2 +- src/obj/bhkMalleableConstraint.cpp | 2 +- src/obj/bhkMeshShape.cpp | 62 ++ src/obj/bhkMoppBvTreeShape.cpp | 2 +- src/obj/bhkMultiSphereShape.cpp | 2 +- src/obj/bhkNiTriStripsShape.cpp | 2 +- src/obj/bhkPackedNiTriStripsShape.cpp | 2 +- src/obj/bhkPrismaticConstraint.cpp | 2 +- src/obj/bhkRagdollConstraint.cpp | 2 +- src/obj/bhkRefObject.cpp | 2 +- src/obj/bhkRigidBody.cpp | 2 +- src/obj/bhkRigidBodyT.cpp | 2 +- src/obj/bhkSPCollisionObject.cpp | 2 +- src/obj/bhkSerializable.cpp | 2 +- src/obj/bhkShape.cpp | 2 +- src/obj/bhkSimpleShapePhantom.cpp | 2 +- src/obj/bhkSphereRepShape.cpp | 2 +- src/obj/bhkSphereShape.cpp | 2 +- src/obj/bhkStiffSpringConstraint.cpp | 2 +- src/obj/bhkTransformShape.cpp | 2 +- src/obj/bhkWorldObject.cpp | 2 +- src/obj/hkPackedNiTriStripsData.cpp | 2 +- 475 files changed, 1763 insertions(+), 726 deletions(-) create mode 100644 include/gen/ByteColor3.h create mode 100644 include/obj/NiMultiTextureProperty.h create mode 100644 include/obj/NiRawImageData.h create mode 100644 include/obj/NiSequence.h create mode 100644 include/obj/bhkMeshShape.h create mode 100644 src/gen/ByteColor3.cpp create mode 100644 src/obj/NiMultiTextureProperty.cpp create mode 100644 src/obj/NiRawImageData.cpp create mode 100644 src/obj/NiSequence.cpp create mode 100644 src/obj/bhkMeshShape.cpp diff --git a/include/ComplexShape.h b/include/ComplexShape.h index 02f943ec..abdaed0c 100644 --- a/include/ComplexShape.h +++ b/include/ComplexShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _COMPLEX_SHAPE_H_ #define _COMPLEX_SHAPE_H_ diff --git a/include/Key.h b/include/Key.h index 7e54e510..f1506148 100644 --- a/include/Key.h +++ b/include/Key.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLIB_KEY_H_ #define _NIFLIB_KEY_H_ diff --git a/include/NIF_IO.h b/include/NIF_IO.h index 97edff3d..ebf5b4c3 100644 --- a/include/NIF_IO.h +++ b/include/NIF_IO.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIF_IO_H #define _NIF_IO_H diff --git a/include/Ref.h b/include/Ref.h index 16c98080..48ebab5e 100644 --- a/include/Ref.h +++ b/include/Ref.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLIB_REF_H_ #define _NIFLIB_REF_H_ diff --git a/include/Type.h b/include/Type.h index cfb35c49..7d141a5b 100644 --- a/include/Type.h +++ b/include/Type.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _TYPE_H_ #define _TYPE_H_ diff --git a/include/dll_export.h b/include/dll_export.h index d8bd6d33..575929ef 100644 --- a/include/dll_export.h +++ b/include/dll_export.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _DLL_EXPORT_H_ #define _DLL_EXPORT_H_ diff --git a/include/gen/ByteColor3.h b/include/gen/ByteColor3.h new file mode 100644 index 00000000..f4787611 --- /dev/null +++ b/include/gen/ByteColor3.h @@ -0,0 +1,46 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +//---THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT---// + +//To change this file, alter the niftools/docsys/nifxml_niflib.py Python script. + +#ifndef _BYTECOLOR3_H_ +#define _BYTECOLOR3_H_ + +#include "../NIF_IO.h" + +namespace Niflib { + + +/*! + * + */ +struct ByteColor3 { + /*! Default Constructor */ + NIFLIB_API ByteColor3(); + /*! Default Destructor */ + NIFLIB_API ~ByteColor3(); + /*! Copy Constructor */ + NIFLIB_API ByteColor3( const ByteColor3 & src ); + //This operator give SWIG problems + #ifndef SWIG + /*! Copy Operator */ + NIFLIB_API ByteColor3 & operator=( const ByteColor3 & src ); + #endif + /*! + * Red color component. + */ + byte r; + /*! + * Green color component. + */ + byte g; + /*! + * Blue color component. + */ + byte b; +}; + +} +#endif diff --git a/include/gen/LODRange.h b/include/gen/LODRange.h index 12674033..fbc724bb 100644 --- a/include/gen/LODRange.h +++ b/include/gen/LODRange.h @@ -36,6 +36,10 @@ struct LODRange { * End of Range. */ float farExtent; + /*! + * Unknown (0,0,0). + */ + array<3,unsigned int > unknownInts; }; } diff --git a/include/gen/RagDollDescriptor.h b/include/gen/RagDollDescriptor.h index e16d101b..c897b4e7 100644 --- a/include/gen/RagDollDescriptor.h +++ b/include/gen/RagDollDescriptor.h @@ -16,17 +16,17 @@ namespace Niflib { /*! * */ -struct RagDollDescriptor { +struct RagdollDescriptor { /*! Default Constructor */ - NIFLIB_API RagDollDescriptor(); + NIFLIB_API RagdollDescriptor(); /*! Default Destructor */ - NIFLIB_API ~RagDollDescriptor(); + NIFLIB_API ~RagdollDescriptor(); /*! Copy Constructor */ - NIFLIB_API RagDollDescriptor( const RagDollDescriptor & src ); + NIFLIB_API RagdollDescriptor( const RagdollDescriptor & src ); //This operator give SWIG problems #ifndef SWIG /*! Copy Operator */ - NIFLIB_API RagDollDescriptor & operator=( const RagDollDescriptor & src ); + NIFLIB_API RagdollDescriptor & operator=( const RagdollDescriptor & src ); #endif /*! * Unknown. diff --git a/include/gen/obj_defines.h b/include/gen/obj_defines.h index b24e3090..6139a48a 100644 --- a/include/gen/obj_defines.h +++ b/include/gen/obj_defines.h @@ -29,18 +29,7 @@ vector<bhkShape * > bodies; \ unsigned int priority; \ #define ABHK_RAGDOLL_CONSTRAINT_MEMBERS \ -Float4 pivotA; \ -Float4 planeA; \ -Float4 twistA; \ -Float4 pivotB; \ -Float4 planeB; \ -Float4 twistB; \ -float coneMinAngle; \ -float planeMinAngle; \ -float planeMaxAngle; \ -float twistMinAngle; \ -float twistMaxAngle; \ -float maxFriction; \ +RagdollDescriptor ragdoll; \ #define BHK_SHAPE_MEMBERS \ @@ -237,7 +226,11 @@ mutable unsigned int numNormals; \ vector<Float4 > normals; \ #define BHK_HINGE_CONSTRAINT_MEMBERS \ -array< 5, array<4,float > > unknownFloats; \ +Float4 pivotA; \ +Float4 perp2axleina1; \ +Float4 perp2axleina2; \ +Float4 pivotB; \ +Float4 axleB; \ #define BHK_LIMITED_HINGE_CONSTRAINT_MEMBERS \ LimitedHingeDescriptor limitedHinge; \ @@ -256,7 +249,7 @@ unsigned int unknownInt2; \ Ref<NiObject > unknownLink1; \ Ref<NiObject > unknownLink2; \ unsigned int unknownInt3; \ -RagDollDescriptor ragdoll; \ +RagdollDescriptor ragdoll; \ LimitedHingeDescriptor limitedHinge; \ float tau; \ float damping; \ @@ -290,6 +283,13 @@ vector<Ref<NiTriStripsData > > stripsData; \ mutable unsigned int numDataLayers; \ vector<OblivionColFilter > dataLayers; \ +#define BHK_MESH_SHAPE_MEMBERS \ +array<8,int > unknown; \ +mutable int unknownCount; \ +vector< array<3,float > > unknownFloats; \ +mutable unsigned int numStripsData; \ +vector<Ref<NiTriStripsData > > stripsData; \ + #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_MEMBERS \ mutable unsigned short numSubShapes; \ vector<OblivionSubShape > subShapes; \ @@ -506,14 +506,17 @@ mutable unsigned int numControllerSequences; \ vector<Ref<NiControllerSequence > > controllerSequences; \ Ref<NiDefaultAVObjectPalette > objectPalette; \ -#define NI_CONTROLLER_SEQUENCE_MEMBERS \ +#define NI_SEQUENCE_MEMBERS \ string name; \ string textKeysName; \ Ref<NiTextKeyExtraData > textKeys; \ mutable unsigned int numControlledBlocks; \ unsigned int unknownInt1; \ vector<ControllerLink > controlledBlocks; \ + +#define NI_CONTROLLER_SEQUENCE_MEMBERS \ float weight; \ +Ref<NiTextKeyExtraData > textKeys; \ CycleType cycleType; \ unsigned int unknownInt0; \ float frequency; \ @@ -791,6 +794,7 @@ float unknownFloat13_; \ unsigned int unknownInt1_; \ unsigned int unknownInt2_; \ unsigned short unknownShort3_; \ +Particle particle; \ mutable unsigned short numParticles; \ unsigned short numValid; \ vector<Particle > particles; \ @@ -798,6 +802,7 @@ Ref<NiObject > unknownLink; \ Ref<AParticleModifier > particleExtra; \ Ref<NiObject > unknownLink2; \ byte trailer; \ +array<3,float > unkownFloats; \ #define NI_B_S_P_ARRAY_CONTROLLER_MEMBERS \ @@ -1139,6 +1144,17 @@ array<4,short > unknown4Shorts; \ unsigned short flags; \ Ref<NiImage > image; \ +#define NI_MULTI_TEXTURE_PROPERTY_MEMBERS \ +unsigned short flags; \ +unsigned int unknownInt1; \ +unsigned int unknownInt2; \ +Ref<NiImage > image; \ +unsigned int unknownInt3; \ +unsigned int unknownInt4; \ +unsigned int unknownInt5; \ +array<11,short > unknownShorts; \ +array<11,short > unknownExtraShorts; \ + #define NI_TEXTURING_PROPERTY_MEMBERS \ unsigned short flags; \ ApplyMode applyMode; \ @@ -1247,6 +1263,12 @@ CompareMode function; \ #define ROOT_COLLISION_NODE_MEMBERS \ +#define NI_RAW_IMAGE_DATA_MEMBERS \ +mutable unsigned int width; \ +mutable unsigned int height; \ +unsigned int unknownInt; \ +vector< vector<ByteColor3 > > imageData; \ + #else #define NI_OBJECT_MEMBERS #define A_KEYED_DATA_MEMBERS @@ -1296,6 +1318,7 @@ CompareMode function; \ #define BHK_MOPP_BV_TREE_SHAPE_MEMBERS #define BHK_MULTI_SPHERE_SHAPE_MEMBERS #define BHK_NI_TRI_STRIPS_SHAPE_MEMBERS +#define BHK_MESH_SHAPE_MEMBERS #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_MEMBERS #define BHK_PRISMATIC_CONSTRAINT_MEMBERS #define BHK_RAGDOLL_CONSTRAINT_MEMBERS @@ -1338,6 +1361,7 @@ CompareMode function; \ #define NI_COLOR_DATA_MEMBERS #define NI_COLOR_EXTRA_DATA_MEMBERS #define NI_CONTROLLER_MANAGER_MEMBERS +#define NI_SEQUENCE_MEMBERS #define NI_CONTROLLER_SEQUENCE_MEMBERS #define NI_DEFAULT_A_V_OBJECT_PALETTE_MEMBERS #define NI_DIRECTIONAL_LIGHT_MEMBERS @@ -1450,6 +1474,7 @@ CompareMode function; \ #define NI_TEXTURE_MODE_PROPERTY_MEMBERS #define NI_IMAGE_MEMBERS #define NI_TEXTURE_PROPERTY_MEMBERS +#define NI_MULTI_TEXTURE_PROPERTY_MEMBERS #define NI_TEXTURING_PROPERTY_MEMBERS #define NI_TRANSFORM_CONTROLLER_MEMBERS #define NI_TRANSFORM_DATA_MEMBERS @@ -1470,6 +1495,7 @@ CompareMode function; \ #define NI_WIREFRAME_PROPERTY_MEMBERS #define NI_Z_BUFFER_PROPERTY_MEMBERS #define ROOT_COLLISION_NODE_MEMBERS +#define NI_RAW_IMAGE_DATA_MEMBERS #endif #define NI_OBJECT_PARENT @@ -1494,8 +1520,7 @@ CompareMode function; \ #define ABHK_RAGDOLL_CONSTRAINT_PARENT AbhkConstraint -#define ABHK_RAGDOLL_CONSTRAINT_CONSTRUCT : coneMinAngle(0.0f), planeMinAngle(0.0f), planeMaxAngle(0.0f), twistMinAngle(0.0f), twistMaxAngle(0.0f), maxFriction(0.0f) - +#define ABHK_RAGDOLL_CONSTRAINT_CONSTRUCT #define BHK_SHAPE_PARENT bhkSerializable #define BHK_SHAPE_CONSTRUCT @@ -1648,6 +1673,10 @@ CompareMode function; \ #define BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT : unknownFloat1(0.1f), unknownInt1((unsigned int)0x004ABE60), unknownInt2((unsigned int)1), scale(1.0f, 1.0f, 1.0f), unknownInt3((unsigned int)0), numStripsData((unsigned int)0), numDataLayers((unsigned int)0) +#define BHK_MESH_SHAPE_PARENT bhkSphereRepShape + +#define BHK_MESH_SHAPE_CONSTRUCT : unknownCount((int)0), numStripsData((unsigned int)0) + #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT AbhkShapeCollection #define BHK_PACKED_NI_TRI_STRIPS_SHAPE_CONSTRUCT : numSubShapes((unsigned short)0), scale(1.0f), data(NULL) @@ -1799,9 +1828,13 @@ CompareMode function; \ #define NI_CONTROLLER_MANAGER_CONSTRUCT : cumulative(false), numControllerSequences((unsigned int)0), objectPalette(NULL) -#define NI_CONTROLLER_SEQUENCE_PARENT NiObject +#define NI_SEQUENCE_PARENT NiObject + +#define NI_SEQUENCE_CONSTRUCT : textKeys(NULL), numControlledBlocks((unsigned int)0), unknownInt1((unsigned int)0) -#define NI_CONTROLLER_SEQUENCE_CONSTRUCT : textKeys(NULL), numControlledBlocks((unsigned int)0), unknownInt1((unsigned int)0), weight(1.0f), unknownInt0((unsigned int)0), frequency(0.0f), startTime(0.0f), stopTime(0.0f), unknownFloat2(0.0f), unknownByte((byte)0), manager(NULL), stringPalette(NULL) +#define NI_CONTROLLER_SEQUENCE_PARENT NiSequence + +#define NI_CONTROLLER_SEQUENCE_CONSTRUCT : weight(1.0f), textKeys(NULL), unknownInt0((unsigned int)0), frequency(0.0f), startTime(0.0f), stopTime(0.0f), unknownFloat2(0.0f), unknownByte((byte)0), manager(NULL), stringPalette(NULL) #define NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT NiObject @@ -2221,6 +2254,10 @@ CompareMode function; \ #define NI_TEXTURE_PROPERTY_CONSTRUCT : flags((unsigned short)0), image(NULL) +#define NI_MULTI_TEXTURE_PROPERTY_PARENT NiProperty + +#define NI_MULTI_TEXTURE_PROPERTY_CONSTRUCT : flags((unsigned short)0), unknownInt1((unsigned int)5), unknownInt2((unsigned int)0), image(NULL), unknownInt3((unsigned int)0), unknownInt4((unsigned int)0), unknownInt5((unsigned int)0) + #define NI_TEXTURING_PROPERTY_PARENT NiProperty #define NI_TEXTURING_PROPERTY_CONSTRUCT : flags((unsigned short)0), applyMode((ApplyMode)2), textureCount((unsigned int)7), hasBaseTexture(false), hasDarkTexture(false), hasDetailTexture(false), hasGlossTexture(false), hasGlowTexture(false), hasBumpMapTexture(false), bumpMapLumaScale(0.0f), bumpMapLumaOffset(0.0f), hasDecal0Texture(false), hasDecal1Texture(false), hasDecal2Texture(false), hasDecal3Texture(false), numShaderTextures((unsigned int)0) @@ -2294,4 +2331,8 @@ CompareMode function; \ #define ROOT_COLLISION_NODE_PARENT NiNode #define ROOT_COLLISION_NODE_CONSTRUCT +#define NI_RAW_IMAGE_DATA_PARENT NiObject + +#define NI_RAW_IMAGE_DATA_CONSTRUCT : width((unsigned int)0), height((unsigned int)0), unknownInt((unsigned int)0) + #endif diff --git a/include/nif_basic_types.h b/include/nif_basic_types.h index 222b36a1..0f3f1acd 100644 --- a/include/nif_basic_types.h +++ b/include/nif_basic_types.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIF_BASIC_TYPES_H_ #define _NIF_BASIC_TYPES_H_ diff --git a/include/nif_math.h b/include/nif_math.h index 755c03a7..954dad3c 100644 --- a/include/nif_math.h +++ b/include/nif_math.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef NIF_MATH_H #define NIF_MATH_H diff --git a/include/nif_versions.h b/include/nif_versions.h index 86e5f227..9777248a 100644 --- a/include/nif_versions.h +++ b/include/nif_versions.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIF_VERSIONS_H_ #define _NIF_VERSIONS_H_ diff --git a/include/obj/ABoneLODController.h b/include/obj/ABoneLODController.h index a06790e1..271b2c4e 100644 --- a/include/obj/ABoneLODController.h +++ b/include/obj/ABoneLODController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _ABONELODCONTROLLER_H_ #define _ABONELODCONTROLLER_H_ diff --git a/include/obj/AKeyedData.h b/include/obj/AKeyedData.h index e37e3a7a..ba564fd9 100644 --- a/include/obj/AKeyedData.h +++ b/include/obj/AKeyedData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _AKEYEDDATA_H_ #define _AKEYEDDATA_H_ diff --git a/include/obj/APSysCtlr.h b/include/obj/APSysCtlr.h index 8ec0c42c..e45c86ab 100644 --- a/include/obj/APSysCtlr.h +++ b/include/obj/APSysCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _APSYSCTLR_H_ #define _APSYSCTLR_H_ diff --git a/include/obj/APSysData.h b/include/obj/APSysData.h index 461b6d26..4e1ebe37 100644 --- a/include/obj/APSysData.h +++ b/include/obj/APSysData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _APSYSDATA_H_ #define _APSYSDATA_H_ diff --git a/include/obj/AParticleModifier.h b/include/obj/AParticleModifier.h index 920fc2ef..aef5160f 100644 --- a/include/obj/AParticleModifier.h +++ b/include/obj/AParticleModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _APARTICLEMODIFIER_H_ #define _APARTICLEMODIFIER_H_ diff --git a/include/obj/AbhkConstraint.h b/include/obj/AbhkConstraint.h index e075a901..80a7c531 100644 --- a/include/obj/AbhkConstraint.h +++ b/include/obj/AbhkConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _ABHKCONSTRAINT_H_ #define _ABHKCONSTRAINT_H_ diff --git a/include/obj/AbhkRagdollConstraint.h b/include/obj/AbhkRagdollConstraint.h index cd769777..7d36747d 100644 --- a/include/obj/AbhkRagdollConstraint.h +++ b/include/obj/AbhkRagdollConstraint.h @@ -1,10 +1,12 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _ABHKRAGDOLLCONSTRAINT_H_ #define _ABHKRAGDOLLCONSTRAINT_H_ #include "AbhkConstraint.h" +// Include structures +#include "../gen/RagdollDescriptor.h" namespace Niflib { diff --git a/include/obj/AbhkShapeCollection.h b/include/obj/AbhkShapeCollection.h index 84478cdf..d74bd9c3 100644 --- a/include/obj/AbhkShapeCollection.h +++ b/include/obj/AbhkShapeCollection.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _ABHKSHAPECOLLECTION_H_ #define _ABHKSHAPECOLLECTION_H_ diff --git a/include/obj/AvoidNode.h b/include/obj/AvoidNode.h index 2c20b1c8..257b583a 100644 --- a/include/obj/AvoidNode.h +++ b/include/obj/AvoidNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _AVOIDNODE_H_ #define _AVOIDNODE_H_ @@ -7,8 +7,6 @@ All rights reserved. Please see niflib.h for licence. */ #include "NiNode.h" namespace Niflib { -//#include "../gen/obj_defines.h" - class AvoidNode; typedef Ref<AvoidNode> AvoidNodeRef; diff --git a/include/obj/BSBound.h b/include/obj/BSBound.h index d841bc80..739ac55e 100644 --- a/include/obj/BSBound.h +++ b/include/obj/BSBound.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSBOUND_H_ #define _BSBOUND_H_ diff --git a/include/obj/BSFurnitureMarker.h b/include/obj/BSFurnitureMarker.h index 4b841bf1..3693b626 100644 --- a/include/obj/BSFurnitureMarker.h +++ b/include/obj/BSFurnitureMarker.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSFURNITUREMARKER_H_ #define _BSFURNITUREMARKER_H_ diff --git a/include/obj/BSKeyframeController.h b/include/obj/BSKeyframeController.h index 42b42603..33e74ea8 100644 --- a/include/obj/BSKeyframeController.h +++ b/include/obj/BSKeyframeController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSKEYFRAMECONTROLLER_H_ #define _BSKEYFRAMECONTROLLER_H_ diff --git a/include/obj/BSPSysArrayEmitter.h b/include/obj/BSPSysArrayEmitter.h index 4fbc83e0..16db9484 100644 --- a/include/obj/BSPSysArrayEmitter.h +++ b/include/obj/BSPSysArrayEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSPSYSARRAYEMITTER_H_ #define _BSPSYSARRAYEMITTER_H_ diff --git a/include/obj/BSParentVelocityModifier.h b/include/obj/BSParentVelocityModifier.h index 01b34b9a..fc48f900 100644 --- a/include/obj/BSParentVelocityModifier.h +++ b/include/obj/BSParentVelocityModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSPARENTVELOCITYMODIFIER_H_ #define _BSPARENTVELOCITYMODIFIER_H_ diff --git a/include/obj/BSXFlags.h b/include/obj/BSXFlags.h index dcf023e9..1c41015c 100644 --- a/include/obj/BSXFlags.h +++ b/include/obj/BSXFlags.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BSXFLAGS_H_ #define _BSXFLAGS_H_ diff --git a/include/obj/FxButton.h b/include/obj/FxButton.h index 3a609680..e9856135 100644 --- a/include/obj/FxButton.h +++ b/include/obj/FxButton.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _FXBUTTON_H_ #define _FXBUTTON_H_ diff --git a/include/obj/FxRadioButton.h b/include/obj/FxRadioButton.h index da88e343..99a05d16 100644 --- a/include/obj/FxRadioButton.h +++ b/include/obj/FxRadioButton.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _FXRADIOBUTTON_H_ #define _FXRADIOBUTTON_H_ diff --git a/include/obj/FxWidget.h b/include/obj/FxWidget.h index 2d7c1cd6..1affcab7 100644 --- a/include/obj/FxWidget.h +++ b/include/obj/FxWidget.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _FXWIDGET_H_ #define _FXWIDGET_H_ diff --git a/include/obj/NiAVObject.h b/include/obj/NiAVObject.h index 33599cac..57beaef6 100644 --- a/include/obj/NiAVObject.h +++ b/include/obj/NiAVObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIAVOBJECT_H_ #define _NIAVOBJECT_H_ diff --git a/include/obj/NiAlphaController.h b/include/obj/NiAlphaController.h index 465d46bd..f7c9f4e0 100644 --- a/include/obj/NiAlphaController.h +++ b/include/obj/NiAlphaController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIALPHACONTROLLER_H_ #define _NIALPHACONTROLLER_H_ diff --git a/include/obj/NiAlphaProperty.h b/include/obj/NiAlphaProperty.h index 68562c83..b975280f 100644 --- a/include/obj/NiAlphaProperty.h +++ b/include/obj/NiAlphaProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIALPHAPROPERTY_H_ #define _NIALPHAPROPERTY_H_ diff --git a/include/obj/NiAmbientLight.h b/include/obj/NiAmbientLight.h index 36f2d056..2fa4f4af 100644 --- a/include/obj/NiAmbientLight.h +++ b/include/obj/NiAmbientLight.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIAMBIENTLIGHT_H_ #define _NIAMBIENTLIGHT_H_ diff --git a/include/obj/NiAutoNormalParticles.h b/include/obj/NiAutoNormalParticles.h index ba8f36f2..89fb14d3 100644 --- a/include/obj/NiAutoNormalParticles.h +++ b/include/obj/NiAutoNormalParticles.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIAUTONORMALPARTICLES_H_ #define _NIAUTONORMALPARTICLES_H_ diff --git a/include/obj/NiAutoNormalParticlesData.h b/include/obj/NiAutoNormalParticlesData.h index 940511f7..f9797131 100644 --- a/include/obj/NiAutoNormalParticlesData.h +++ b/include/obj/NiAutoNormalParticlesData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIAUTONORMALPARTICLESDATA_H_ #define _NIAUTONORMALPARTICLESDATA_H_ diff --git a/include/obj/NiBSAnimationNode.h b/include/obj/NiBSAnimationNode.h index 2b78cbc6..783cb4c7 100644 --- a/include/obj/NiBSAnimationNode.h +++ b/include/obj/NiBSAnimationNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSANIMATIONNODE_H_ #define _NIBSANIMATIONNODE_H_ diff --git a/include/obj/NiBSBoneLODController.h b/include/obj/NiBSBoneLODController.h index 67e67707..546532f6 100644 --- a/include/obj/NiBSBoneLODController.h +++ b/include/obj/NiBSBoneLODController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSBONELODCONTROLLER_H_ #define _NIBSBONELODCONTROLLER_H_ diff --git a/include/obj/NiBSPArrayController.h b/include/obj/NiBSPArrayController.h index 07d9793c..6efc1cfa 100644 --- a/include/obj/NiBSPArrayController.h +++ b/include/obj/NiBSPArrayController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPARRAYCONTROLLER_H_ #define _NIBSPARRAYCONTROLLER_H_ diff --git a/include/obj/NiBSParticleNode.h b/include/obj/NiBSParticleNode.h index 8939bf20..9117e350 100644 --- a/include/obj/NiBSParticleNode.h +++ b/include/obj/NiBSParticleNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPARTICLENODE_H_ #define _NIBSPARTICLENODE_H_ diff --git a/include/obj/NiBSplineBasisData.h b/include/obj/NiBSplineBasisData.h index 5cc5f2cc..8b97c456 100644 --- a/include/obj/NiBSplineBasisData.h +++ b/include/obj/NiBSplineBasisData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINEBASISDATA_H_ #define _NIBSPLINEBASISDATA_H_ diff --git a/include/obj/NiBSplineCompFloatInterpolator.h b/include/obj/NiBSplineCompFloatInterpolator.h index 84f9d894..4e7113d7 100644 --- a/include/obj/NiBSplineCompFloatInterpolator.h +++ b/include/obj/NiBSplineCompFloatInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINECOMPFLOATINTERPOLATOR_H_ #define _NIBSPLINECOMPFLOATINTERPOLATOR_H_ diff --git a/include/obj/NiBSplineCompPoint3Interpolator.h b/include/obj/NiBSplineCompPoint3Interpolator.h index bd230999..24d85962 100644 --- a/include/obj/NiBSplineCompPoint3Interpolator.h +++ b/include/obj/NiBSplineCompPoint3Interpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINECOMPPOINT3INTERPOLATOR_H_ #define _NIBSPLINECOMPPOINT3INTERPOLATOR_H_ diff --git a/include/obj/NiBSplineCompTransformInterpolator.h b/include/obj/NiBSplineCompTransformInterpolator.h index eaf36c16..cd2ce752 100644 --- a/include/obj/NiBSplineCompTransformInterpolator.h +++ b/include/obj/NiBSplineCompTransformInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINECOMPTRANSFORMINTERPOLATOR_H_ #define _NIBSPLINECOMPTRANSFORMINTERPOLATOR_H_ diff --git a/include/obj/NiBSplineData.h b/include/obj/NiBSplineData.h index 150e5aac..7433969c 100644 --- a/include/obj/NiBSplineData.h +++ b/include/obj/NiBSplineData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINEDATA_H_ #define _NIBSPLINEDATA_H_ diff --git a/include/obj/NiBSplineInterpolator.h b/include/obj/NiBSplineInterpolator.h index 404ba2c9..dced4a01 100644 --- a/include/obj/NiBSplineInterpolator.h +++ b/include/obj/NiBSplineInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBSPLINEINTERPOLATOR_H_ #define _NIBSPLINEINTERPOLATOR_H_ diff --git a/include/obj/NiBillboardNode.h b/include/obj/NiBillboardNode.h index 84ee53ca..dc157652 100644 --- a/include/obj/NiBillboardNode.h +++ b/include/obj/NiBillboardNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBILLBOARDNODE_H_ #define _NIBILLBOARDNODE_H_ diff --git a/include/obj/NiBinaryExtraData.h b/include/obj/NiBinaryExtraData.h index a3829bee..2cfffd39 100644 --- a/include/obj/NiBinaryExtraData.h +++ b/include/obj/NiBinaryExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBINARYEXTRADATA_H_ #define _NIBINARYEXTRADATA_H_ diff --git a/include/obj/NiBlendBoolInterpolator.h b/include/obj/NiBlendBoolInterpolator.h index 1b77f2a8..ad899adb 100644 --- a/include/obj/NiBlendBoolInterpolator.h +++ b/include/obj/NiBlendBoolInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBLENDBOOLINTERPOLATOR_H_ #define _NIBLENDBOOLINTERPOLATOR_H_ diff --git a/include/obj/NiBlendFloatInterpolator.h b/include/obj/NiBlendFloatInterpolator.h index cdfb23ac..df1596f2 100644 --- a/include/obj/NiBlendFloatInterpolator.h +++ b/include/obj/NiBlendFloatInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBLENDFLOATINTERPOLATOR_H_ #define _NIBLENDFLOATINTERPOLATOR_H_ diff --git a/include/obj/NiBlendInterpolator.h b/include/obj/NiBlendInterpolator.h index 5d977df4..23bc7501 100644 --- a/include/obj/NiBlendInterpolator.h +++ b/include/obj/NiBlendInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBLENDINTERPOLATOR_H_ #define _NIBLENDINTERPOLATOR_H_ diff --git a/include/obj/NiBlendPoint3Interpolator.h b/include/obj/NiBlendPoint3Interpolator.h index b9aea723..0586c5f3 100644 --- a/include/obj/NiBlendPoint3Interpolator.h +++ b/include/obj/NiBlendPoint3Interpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBLENDPOINT3INTERPOLATOR_H_ #define _NIBLENDPOINT3INTERPOLATOR_H_ diff --git a/include/obj/NiBlendTransformInterpolator.h b/include/obj/NiBlendTransformInterpolator.h index f791927b..996e3df3 100644 --- a/include/obj/NiBlendTransformInterpolator.h +++ b/include/obj/NiBlendTransformInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBLENDTRANSFORMINTERPOLATOR_H_ #define _NIBLENDTRANSFORMINTERPOLATOR_H_ diff --git a/include/obj/NiBoneLODController.h b/include/obj/NiBoneLODController.h index 2fbcb18d..36d00fd1 100644 --- a/include/obj/NiBoneLODController.h +++ b/include/obj/NiBoneLODController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBONELODCONTROLLER_H_ #define _NIBONELODCONTROLLER_H_ diff --git a/include/obj/NiBoolData.h b/include/obj/NiBoolData.h index b86c8b28..9deba0ed 100644 --- a/include/obj/NiBoolData.h +++ b/include/obj/NiBoolData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBOOLDATA_H_ #define _NIBOOLDATA_H_ diff --git a/include/obj/NiBoolInterpolator.h b/include/obj/NiBoolInterpolator.h index 4bd83ee5..34ac2f79 100644 --- a/include/obj/NiBoolInterpolator.h +++ b/include/obj/NiBoolInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBOOLINTERPOLATOR_H_ #define _NIBOOLINTERPOLATOR_H_ diff --git a/include/obj/NiBoolTimelineInterpolator.h b/include/obj/NiBoolTimelineInterpolator.h index e020983e..abe4bdf7 100644 --- a/include/obj/NiBoolTimelineInterpolator.h +++ b/include/obj/NiBoolTimelineInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBOOLTIMELINEINTERPOLATOR_H_ #define _NIBOOLTIMELINEINTERPOLATOR_H_ diff --git a/include/obj/NiBooleanExtraData.h b/include/obj/NiBooleanExtraData.h index 64a2d286..80a8c1e8 100644 --- a/include/obj/NiBooleanExtraData.h +++ b/include/obj/NiBooleanExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIBOOLEANEXTRADATA_H_ #define _NIBOOLEANEXTRADATA_H_ diff --git a/include/obj/NiCamera.h b/include/obj/NiCamera.h index 5e914980..372e7deb 100644 --- a/include/obj/NiCamera.h +++ b/include/obj/NiCamera.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICAMERA_H_ #define _NICAMERA_H_ diff --git a/include/obj/NiClod.h b/include/obj/NiClod.h index a24d1b35..df74d4e4 100644 --- a/include/obj/NiClod.h +++ b/include/obj/NiClod.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICLOD_H_ #define _NICLOD_H_ diff --git a/include/obj/NiClodData.h b/include/obj/NiClodData.h index 3c3c5795..36d56138 100644 --- a/include/obj/NiClodData.h +++ b/include/obj/NiClodData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICLODDATA_H_ #define _NICLODDATA_H_ diff --git a/include/obj/NiClodSkinInstance.h b/include/obj/NiClodSkinInstance.h index 6a14fde7..4ec58ff7 100644 --- a/include/obj/NiClodSkinInstance.h +++ b/include/obj/NiClodSkinInstance.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICLODSKININSTANCE_H_ #define _NICLODSKININSTANCE_H_ diff --git a/include/obj/NiCollisionData.h b/include/obj/NiCollisionData.h index 38d3b628..2f4a447f 100644 --- a/include/obj/NiCollisionData.h +++ b/include/obj/NiCollisionData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICOLLISIONDATA_H_ #define _NICOLLISIONDATA_H_ diff --git a/include/obj/NiCollisionObject.h b/include/obj/NiCollisionObject.h index cf26860d..af0ed69f 100644 --- a/include/obj/NiCollisionObject.h +++ b/include/obj/NiCollisionObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICOLLISIONOBJECT_H_ #define _NICOLLISIONOBJECT_H_ diff --git a/include/obj/NiColorData.h b/include/obj/NiColorData.h index 3833fa8c..1487ad30 100644 --- a/include/obj/NiColorData.h +++ b/include/obj/NiColorData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICOLORDATA_H_ #define _NICOLORDATA_H_ diff --git a/include/obj/NiColorExtraData.h b/include/obj/NiColorExtraData.h index 5452b694..04cc66fd 100644 --- a/include/obj/NiColorExtraData.h +++ b/include/obj/NiColorExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICOLOREXTRADATA_H_ #define _NICOLOREXTRADATA_H_ diff --git a/include/obj/NiControllerManager.h b/include/obj/NiControllerManager.h index cbf5692a..f7d309ef 100644 --- a/include/obj/NiControllerManager.h +++ b/include/obj/NiControllerManager.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICONTROLLERMANAGER_H_ #define _NICONTROLLERMANAGER_H_ diff --git a/include/obj/NiControllerSequence.h b/include/obj/NiControllerSequence.h index 45b9ad93..e78cadff 100644 --- a/include/obj/NiControllerSequence.h +++ b/include/obj/NiControllerSequence.h @@ -1,10 +1,10 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NICONTROLLERSEQUENCE_H_ #define _NICONTROLLERSEQUENCE_H_ -#include "NiObject.h" +#include "NiSequence.h" // Include structures #include "../gen/ControllerLink.h" #include "../Ref.h" diff --git a/include/obj/NiDefaultAVObjectPalette.h b/include/obj/NiDefaultAVObjectPalette.h index 4ec328ec..87fc3abf 100644 --- a/include/obj/NiDefaultAVObjectPalette.h +++ b/include/obj/NiDefaultAVObjectPalette.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIDEFAULTAVOBJECTPALETTE_H_ #define _NIDEFAULTAVOBJECTPALETTE_H_ diff --git a/include/obj/NiDirectionalLight.h b/include/obj/NiDirectionalLight.h index f8cfab3d..76c2fc81 100644 --- a/include/obj/NiDirectionalLight.h +++ b/include/obj/NiDirectionalLight.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIDIRECTIONALLIGHT_H_ #define _NIDIRECTIONALLIGHT_H_ diff --git a/include/obj/NiDitherProperty.h b/include/obj/NiDitherProperty.h index 7313c753..56c2c916 100644 --- a/include/obj/NiDitherProperty.h +++ b/include/obj/NiDitherProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIDITHERPROPERTY_H_ #define _NIDITHERPROPERTY_H_ diff --git a/include/obj/NiDynamicEffect.h b/include/obj/NiDynamicEffect.h index 679ac192..7955d037 100644 --- a/include/obj/NiDynamicEffect.h +++ b/include/obj/NiDynamicEffect.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIDYNAMICEFFECT_H_ #define _NIDYNAMICEFFECT_H_ diff --git a/include/obj/NiExtraData.h b/include/obj/NiExtraData.h index e0d4cf5f..8d379ea7 100644 --- a/include/obj/NiExtraData.h +++ b/include/obj/NiExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIEXTRADATA_H_ #define _NIEXTRADATA_H_ diff --git a/include/obj/NiFlipController.h b/include/obj/NiFlipController.h index e8d50c88..2724fb98 100644 --- a/include/obj/NiFlipController.h +++ b/include/obj/NiFlipController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLIPCONTROLLER_H_ #define _NIFLIPCONTROLLER_H_ diff --git a/include/obj/NiFloatData.h b/include/obj/NiFloatData.h index de46879a..d1e5df2f 100644 --- a/include/obj/NiFloatData.h +++ b/include/obj/NiFloatData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLOATDATA_H_ #define _NIFLOATDATA_H_ diff --git a/include/obj/NiFloatExtraData.h b/include/obj/NiFloatExtraData.h index 662bc69f..5112db6a 100644 --- a/include/obj/NiFloatExtraData.h +++ b/include/obj/NiFloatExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLOATEXTRADATA_H_ #define _NIFLOATEXTRADATA_H_ diff --git a/include/obj/NiFloatExtraDataController.h b/include/obj/NiFloatExtraDataController.h index 5d19feef..b89269c0 100644 --- a/include/obj/NiFloatExtraDataController.h +++ b/include/obj/NiFloatExtraDataController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLOATEXTRADATACONTROLLER_H_ #define _NIFLOATEXTRADATACONTROLLER_H_ diff --git a/include/obj/NiFloatInterpolator.h b/include/obj/NiFloatInterpolator.h index 460a34bd..d8e43c49 100644 --- a/include/obj/NiFloatInterpolator.h +++ b/include/obj/NiFloatInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLOATINTERPOLATOR_H_ #define _NIFLOATINTERPOLATOR_H_ diff --git a/include/obj/NiFloatsExtraData.h b/include/obj/NiFloatsExtraData.h index ff815c3e..7af984e3 100644 --- a/include/obj/NiFloatsExtraData.h +++ b/include/obj/NiFloatsExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFLOATSEXTRADATA_H_ #define _NIFLOATSEXTRADATA_H_ diff --git a/include/obj/NiFogProperty.h b/include/obj/NiFogProperty.h index c71ffbf0..1642cb8b 100644 --- a/include/obj/NiFogProperty.h +++ b/include/obj/NiFogProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIFOGPROPERTY_H_ #define _NIFOGPROPERTY_H_ diff --git a/include/obj/NiGeomMorpherController.h b/include/obj/NiGeomMorpherController.h index ebc05808..6dcea15f 100644 --- a/include/obj/NiGeomMorpherController.h +++ b/include/obj/NiGeomMorpherController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIGEOMMORPHERCONTROLLER_H_ #define _NIGEOMMORPHERCONTROLLER_H_ diff --git a/include/obj/NiGeometry.h b/include/obj/NiGeometry.h index 00e8c031..55b6a2d8 100644 --- a/include/obj/NiGeometry.h +++ b/include/obj/NiGeometry.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIGEOMETRY_H_ #define _NIGEOMETRY_H_ diff --git a/include/obj/NiGeometryData.h b/include/obj/NiGeometryData.h index b268864f..c8fec40a 100644 --- a/include/obj/NiGeometryData.h +++ b/include/obj/NiGeometryData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIGEOMETRYDATA_H_ #define _NIGEOMETRYDATA_H_ diff --git a/include/obj/NiGravity.h b/include/obj/NiGravity.h index 39f0fe74..c5812e66 100644 --- a/include/obj/NiGravity.h +++ b/include/obj/NiGravity.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIGRAVITY_H_ #define _NIGRAVITY_H_ diff --git a/include/obj/NiImage.h b/include/obj/NiImage.h index 59819636..da82cdc7 100644 --- a/include/obj/NiImage.h +++ b/include/obj/NiImage.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIIMAGE_H_ #define _NIIMAGE_H_ diff --git a/include/obj/NiIntegerExtraData.h b/include/obj/NiIntegerExtraData.h index 1b12207f..26f483c2 100644 --- a/include/obj/NiIntegerExtraData.h +++ b/include/obj/NiIntegerExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIINTEGEREXTRADATA_H_ #define _NIINTEGEREXTRADATA_H_ diff --git a/include/obj/NiIntegersExtraData.h b/include/obj/NiIntegersExtraData.h index 1e46530b..154980fc 100644 --- a/include/obj/NiIntegersExtraData.h +++ b/include/obj/NiIntegersExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIINTEGERSEXTRADATA_H_ #define _NIINTEGERSEXTRADATA_H_ diff --git a/include/obj/NiInterpolator.h b/include/obj/NiInterpolator.h index 032582e7..fb45fc15 100644 --- a/include/obj/NiInterpolator.h +++ b/include/obj/NiInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIINTERPOLATOR_H_ #define _NIINTERPOLATOR_H_ diff --git a/include/obj/NiKeyframeController.h b/include/obj/NiKeyframeController.h index 2c0e43ee..b7ad64aa 100644 --- a/include/obj/NiKeyframeController.h +++ b/include/obj/NiKeyframeController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIKEYFRAMECONTROLLER_H_ #define _NIKEYFRAMECONTROLLER_H_ diff --git a/include/obj/NiKeyframeData.h b/include/obj/NiKeyframeData.h index c764107a..7ac866f8 100644 --- a/include/obj/NiKeyframeData.h +++ b/include/obj/NiKeyframeData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIKEYFRAMEDATA_H_ #define _NIKEYFRAMEDATA_H_ diff --git a/include/obj/NiLODData.h b/include/obj/NiLODData.h index 28c077bc..c5e8563d 100644 --- a/include/obj/NiLODData.h +++ b/include/obj/NiLODData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILODDATA_H_ #define _NILODDATA_H_ diff --git a/include/obj/NiLODNode.h b/include/obj/NiLODNode.h index 152b027e..fc331c63 100644 --- a/include/obj/NiLODNode.h +++ b/include/obj/NiLODNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILODNODE_H_ #define _NILODNODE_H_ diff --git a/include/obj/NiLight.h b/include/obj/NiLight.h index e4995223..40ef285e 100644 --- a/include/obj/NiLight.h +++ b/include/obj/NiLight.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILIGHT_H_ #define _NILIGHT_H_ diff --git a/include/obj/NiLightColorController.h b/include/obj/NiLightColorController.h index 7cb4fd21..b9eb4bde 100644 --- a/include/obj/NiLightColorController.h +++ b/include/obj/NiLightColorController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILIGHTCOLORCONTROLLER_H_ #define _NILIGHTCOLORCONTROLLER_H_ diff --git a/include/obj/NiLightDimmerController.h b/include/obj/NiLightDimmerController.h index 1b99c983..28898103 100644 --- a/include/obj/NiLightDimmerController.h +++ b/include/obj/NiLightDimmerController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILIGHTDIMMERCONTROLLER_H_ #define _NILIGHTDIMMERCONTROLLER_H_ diff --git a/include/obj/NiLookAtController.h b/include/obj/NiLookAtController.h index 88826508..5c159caa 100644 --- a/include/obj/NiLookAtController.h +++ b/include/obj/NiLookAtController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILOOKATCONTROLLER_H_ #define _NILOOKATCONTROLLER_H_ diff --git a/include/obj/NiLookAtInterpolator.h b/include/obj/NiLookAtInterpolator.h index 2651e3b5..07813d5b 100644 --- a/include/obj/NiLookAtInterpolator.h +++ b/include/obj/NiLookAtInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NILOOKATINTERPOLATOR_H_ #define _NILOOKATINTERPOLATOR_H_ diff --git a/include/obj/NiMaterialColorController.h b/include/obj/NiMaterialColorController.h index cd1c902f..7ae0cc25 100644 --- a/include/obj/NiMaterialColorController.h +++ b/include/obj/NiMaterialColorController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMATERIALCOLORCONTROLLER_H_ #define _NIMATERIALCOLORCONTROLLER_H_ diff --git a/include/obj/NiMaterialProperty.h b/include/obj/NiMaterialProperty.h index 374ae6ff..835766ae 100644 --- a/include/obj/NiMaterialProperty.h +++ b/include/obj/NiMaterialProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMATERIALPROPERTY_H_ #define _NIMATERIALPROPERTY_H_ diff --git a/include/obj/NiMeshPSysData.h b/include/obj/NiMeshPSysData.h index 389f58e6..d27492a4 100644 --- a/include/obj/NiMeshPSysData.h +++ b/include/obj/NiMeshPSysData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMESHPSYSDATA_H_ #define _NIMESHPSYSDATA_H_ diff --git a/include/obj/NiMeshParticleSystem.h b/include/obj/NiMeshParticleSystem.h index 3c203f46..7c0fbff0 100644 --- a/include/obj/NiMeshParticleSystem.h +++ b/include/obj/NiMeshParticleSystem.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMESHPARTICLESYSTEM_H_ #define _NIMESHPARTICLESYSTEM_H_ diff --git a/include/obj/NiMorphData.h b/include/obj/NiMorphData.h index 0e22d64a..26d999ad 100644 --- a/include/obj/NiMorphData.h +++ b/include/obj/NiMorphData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMORPHDATA_H_ #define _NIMORPHDATA_H_ diff --git a/include/obj/NiMultiTargetTransformController.h b/include/obj/NiMultiTargetTransformController.h index 05cb0662..808d635f 100644 --- a/include/obj/NiMultiTargetTransformController.h +++ b/include/obj/NiMultiTargetTransformController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIMULTITARGETTRANSFORMCONTROLLER_H_ #define _NIMULTITARGETTRANSFORMCONTROLLER_H_ diff --git a/include/obj/NiMultiTextureProperty.h b/include/obj/NiMultiTextureProperty.h new file mode 100644 index 00000000..59945216 --- /dev/null +++ b/include/obj/NiMultiTextureProperty.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#ifndef _NIMULTITEXTUREPROPERTY_H_ +#define _NIMULTITEXTUREPROPERTY_H_ + +#include "NiProperty.h" + +// Include structures +#include "../Ref.h" +namespace Niflib { + +// Forward define of referenced NIF objects +class NiImage; +class NiMultiTextureProperty; +typedef Ref<NiMultiTextureProperty> NiMultiTexturePropertyRef; + +/*! + * NiMultiTextureProperty - (note: not quite complete yet... but already + * reads most of the DAoC ones) + */ + +class NiMultiTextureProperty : public NI_MULTI_TEXTURE_PROPERTY_PARENT { +public: + NIFLIB_API NiMultiTextureProperty(); + NIFLIB_API ~NiMultiTextureProperty(); + //Run-Time Type Information + NIFLIB_API static const Type TYPE; + NIFLIB_API static NiObject * Create(); + NIFLIB_API virtual const Type & GetType() const; + NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + NIFLIB_API virtual string asString( bool verbose = false ) const; + NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual list<NiObjectRef> GetRefs() const; + +protected: + NI_MULTI_TEXTURE_PROPERTY_MEMBERS +private: + void InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + string InternalAsString( bool verbose ) const; + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + list<NiObjectRef> InternalGetRefs() const; +}; + +} +#endif diff --git a/include/obj/NiNode.h b/include/obj/NiNode.h index ef8fc8d5..811807cb 100644 --- a/include/obj/NiNode.h +++ b/include/obj/NiNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NINODE_H_ #define _NINODE_H_ diff --git a/include/obj/NiObject.h b/include/obj/NiObject.h index aef9fddc..400cedfe 100644 --- a/include/obj/NiObject.h +++ b/include/obj/NiObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIOBJECT_H_ #define _NIOBJECT_H_ diff --git a/include/obj/NiObjectNET.h b/include/obj/NiObjectNET.h index 03f05770..c038d219 100644 --- a/include/obj/NiObjectNET.h +++ b/include/obj/NiObjectNET.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIOBJECTNET_H_ #define _NIOBJECTNET_H_ diff --git a/include/obj/NiPSysAgeDeathModifier.h b/include/obj/NiPSysAgeDeathModifier.h index b7b93400..9fdca03c 100644 --- a/include/obj/NiPSysAgeDeathModifier.h +++ b/include/obj/NiPSysAgeDeathModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSAGEDEATHMODIFIER_H_ #define _NIPSYSAGEDEATHMODIFIER_H_ diff --git a/include/obj/NiPSysBombModifier.h b/include/obj/NiPSysBombModifier.h index 0b4683e6..8af5eacb 100644 --- a/include/obj/NiPSysBombModifier.h +++ b/include/obj/NiPSysBombModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSBOMBMODIFIER_H_ #define _NIPSYSBOMBMODIFIER_H_ diff --git a/include/obj/NiPSysBoundUpdateModifier.h b/include/obj/NiPSysBoundUpdateModifier.h index c93c67e0..edd2455c 100644 --- a/include/obj/NiPSysBoundUpdateModifier.h +++ b/include/obj/NiPSysBoundUpdateModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSBOUNDUPDATEMODIFIER_H_ #define _NIPSYSBOUNDUPDATEMODIFIER_H_ diff --git a/include/obj/NiPSysBoxEmitter.h b/include/obj/NiPSysBoxEmitter.h index 6245aa20..568b73fe 100644 --- a/include/obj/NiPSysBoxEmitter.h +++ b/include/obj/NiPSysBoxEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSBOXEMITTER_H_ #define _NIPSYSBOXEMITTER_H_ diff --git a/include/obj/NiPSysColliderManager.h b/include/obj/NiPSysColliderManager.h index 89074efb..1dbf9f67 100644 --- a/include/obj/NiPSysColliderManager.h +++ b/include/obj/NiPSysColliderManager.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSCOLLIDERMANAGER_H_ #define _NIPSYSCOLLIDERMANAGER_H_ diff --git a/include/obj/NiPSysColorModifier.h b/include/obj/NiPSysColorModifier.h index 5b9b404f..0400c975 100644 --- a/include/obj/NiPSysColorModifier.h +++ b/include/obj/NiPSysColorModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSCOLORMODIFIER_H_ #define _NIPSYSCOLORMODIFIER_H_ diff --git a/include/obj/NiPSysCylinderEmitter.h b/include/obj/NiPSysCylinderEmitter.h index 86316579..ae12ec31 100644 --- a/include/obj/NiPSysCylinderEmitter.h +++ b/include/obj/NiPSysCylinderEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSCYLINDEREMITTER_H_ #define _NIPSYSCYLINDEREMITTER_H_ diff --git a/include/obj/NiPSysData.h b/include/obj/NiPSysData.h index fe7e5acc..4c6ce6ed 100644 --- a/include/obj/NiPSysData.h +++ b/include/obj/NiPSysData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSDATA_H_ #define _NIPSYSDATA_H_ diff --git a/include/obj/NiPSysDragModifier.h b/include/obj/NiPSysDragModifier.h index b9c6aa1c..a43c4f0e 100644 --- a/include/obj/NiPSysDragModifier.h +++ b/include/obj/NiPSysDragModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSDRAGMODIFIER_H_ #define _NIPSYSDRAGMODIFIER_H_ diff --git a/include/obj/NiPSysEmitter.h b/include/obj/NiPSysEmitter.h index 824f700e..b8caa1fa 100644 --- a/include/obj/NiPSysEmitter.h +++ b/include/obj/NiPSysEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTER_H_ #define _NIPSYSEMITTER_H_ diff --git a/include/obj/NiPSysEmitterCtlr.h b/include/obj/NiPSysEmitterCtlr.h index d2a26de2..0e714a4f 100644 --- a/include/obj/NiPSysEmitterCtlr.h +++ b/include/obj/NiPSysEmitterCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERCTLR_H_ #define _NIPSYSEMITTERCTLR_H_ diff --git a/include/obj/NiPSysEmitterCtlrData.h b/include/obj/NiPSysEmitterCtlrData.h index 6c22d0e0..5eb7c94a 100644 --- a/include/obj/NiPSysEmitterCtlrData.h +++ b/include/obj/NiPSysEmitterCtlrData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERCTLRDATA_H_ #define _NIPSYSEMITTERCTLRDATA_H_ diff --git a/include/obj/NiPSysEmitterDeclinationCtlr.h b/include/obj/NiPSysEmitterDeclinationCtlr.h index b8d5c46a..698aab7b 100644 --- a/include/obj/NiPSysEmitterDeclinationCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERDECLINATIONCTLR_H_ #define _NIPSYSEMITTERDECLINATIONCTLR_H_ diff --git a/include/obj/NiPSysEmitterDeclinationVarCtlr.h b/include/obj/NiPSysEmitterDeclinationVarCtlr.h index e5ccc027..04eb553d 100644 --- a/include/obj/NiPSysEmitterDeclinationVarCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationVarCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERDECLINATIONVARCTLR_H_ #define _NIPSYSEMITTERDECLINATIONVARCTLR_H_ diff --git a/include/obj/NiPSysEmitterInitialRadiusCtlr.h b/include/obj/NiPSysEmitterInitialRadiusCtlr.h index e83f1ec3..0a200736 100644 --- a/include/obj/NiPSysEmitterInitialRadiusCtlr.h +++ b/include/obj/NiPSysEmitterInitialRadiusCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERINITIALRADIUSCTLR_H_ #define _NIPSYSEMITTERINITIALRADIUSCTLR_H_ diff --git a/include/obj/NiPSysEmitterLifeSpanCtlr.h b/include/obj/NiPSysEmitterLifeSpanCtlr.h index f48ea390..9f356b0f 100644 --- a/include/obj/NiPSysEmitterLifeSpanCtlr.h +++ b/include/obj/NiPSysEmitterLifeSpanCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERLIFESPANCTLR_H_ #define _NIPSYSEMITTERLIFESPANCTLR_H_ diff --git a/include/obj/NiPSysEmitterSpeedCtlr.h b/include/obj/NiPSysEmitterSpeedCtlr.h index 72e72afe..445f4464 100644 --- a/include/obj/NiPSysEmitterSpeedCtlr.h +++ b/include/obj/NiPSysEmitterSpeedCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSEMITTERSPEEDCTLR_H_ #define _NIPSYSEMITTERSPEEDCTLR_H_ diff --git a/include/obj/NiPSysGravityModifier.h b/include/obj/NiPSysGravityModifier.h index 3cd6a8e6..e799d08c 100644 --- a/include/obj/NiPSysGravityModifier.h +++ b/include/obj/NiPSysGravityModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSGRAVITYMODIFIER_H_ #define _NIPSYSGRAVITYMODIFIER_H_ diff --git a/include/obj/NiPSysGravityStrengthCtlr.h b/include/obj/NiPSysGravityStrengthCtlr.h index 96cb7fa5..4306b1a9 100644 --- a/include/obj/NiPSysGravityStrengthCtlr.h +++ b/include/obj/NiPSysGravityStrengthCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSGRAVITYSTRENGTHCTLR_H_ #define _NIPSYSGRAVITYSTRENGTHCTLR_H_ diff --git a/include/obj/NiPSysGrowFadeModifier.h b/include/obj/NiPSysGrowFadeModifier.h index 864347ee..a837b479 100644 --- a/include/obj/NiPSysGrowFadeModifier.h +++ b/include/obj/NiPSysGrowFadeModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSGROWFADEMODIFIER_H_ #define _NIPSYSGROWFADEMODIFIER_H_ diff --git a/include/obj/NiPSysMeshEmitter.h b/include/obj/NiPSysMeshEmitter.h index 54b1cdfa..0c5eb051 100644 --- a/include/obj/NiPSysMeshEmitter.h +++ b/include/obj/NiPSysMeshEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSMESHEMITTER_H_ #define _NIPSYSMESHEMITTER_H_ diff --git a/include/obj/NiPSysMeshUpdateModifier.h b/include/obj/NiPSysMeshUpdateModifier.h index c32e856c..8d6528a6 100644 --- a/include/obj/NiPSysMeshUpdateModifier.h +++ b/include/obj/NiPSysMeshUpdateModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSMESHUPDATEMODIFIER_H_ #define _NIPSYSMESHUPDATEMODIFIER_H_ diff --git a/include/obj/NiPSysModifier.h b/include/obj/NiPSysModifier.h index b73f947c..e28e3228 100644 --- a/include/obj/NiPSysModifier.h +++ b/include/obj/NiPSysModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSMODIFIER_H_ #define _NIPSYSMODIFIER_H_ diff --git a/include/obj/NiPSysModifierActiveCtlr.h b/include/obj/NiPSysModifierActiveCtlr.h index f968c46c..15ad0c2e 100644 --- a/include/obj/NiPSysModifierActiveCtlr.h +++ b/include/obj/NiPSysModifierActiveCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSMODIFIERACTIVECTLR_H_ #define _NIPSYSMODIFIERACTIVECTLR_H_ diff --git a/include/obj/NiPSysPlanarCollider.h b/include/obj/NiPSysPlanarCollider.h index 55e503d6..ddefa4f8 100644 --- a/include/obj/NiPSysPlanarCollider.h +++ b/include/obj/NiPSysPlanarCollider.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSPLANARCOLLIDER_H_ #define _NIPSYSPLANARCOLLIDER_H_ diff --git a/include/obj/NiPSysPositionModifier.h b/include/obj/NiPSysPositionModifier.h index 0c3ea45b..14947055 100644 --- a/include/obj/NiPSysPositionModifier.h +++ b/include/obj/NiPSysPositionModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSPOSITIONMODIFIER_H_ #define _NIPSYSPOSITIONMODIFIER_H_ diff --git a/include/obj/NiPSysResetOnLoopCtlr.h b/include/obj/NiPSysResetOnLoopCtlr.h index 067b7c7f..e9f7d901 100644 --- a/include/obj/NiPSysResetOnLoopCtlr.h +++ b/include/obj/NiPSysResetOnLoopCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSRESETONLOOPCTLR_H_ #define _NIPSYSRESETONLOOPCTLR_H_ diff --git a/include/obj/NiPSysRotationModifier.h b/include/obj/NiPSysRotationModifier.h index cede80f3..3b4e0408 100644 --- a/include/obj/NiPSysRotationModifier.h +++ b/include/obj/NiPSysRotationModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSROTATIONMODIFIER_H_ #define _NIPSYSROTATIONMODIFIER_H_ diff --git a/include/obj/NiPSysSpawnModifier.h b/include/obj/NiPSysSpawnModifier.h index 3f68f38c..fa9d92ba 100644 --- a/include/obj/NiPSysSpawnModifier.h +++ b/include/obj/NiPSysSpawnModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSSPAWNMODIFIER_H_ #define _NIPSYSSPAWNMODIFIER_H_ diff --git a/include/obj/NiPSysSphereEmitter.h b/include/obj/NiPSysSphereEmitter.h index 4df9cbee..d686e12e 100644 --- a/include/obj/NiPSysSphereEmitter.h +++ b/include/obj/NiPSysSphereEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSSPHEREEMITTER_H_ #define _NIPSYSSPHEREEMITTER_H_ diff --git a/include/obj/NiPSysUpdateCtlr.h b/include/obj/NiPSysUpdateCtlr.h index c631f4f1..fa1a3180 100644 --- a/include/obj/NiPSysUpdateCtlr.h +++ b/include/obj/NiPSysUpdateCtlr.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSUPDATECTLR_H_ #define _NIPSYSUPDATECTLR_H_ diff --git a/include/obj/NiPSysVolumeEmitter.h b/include/obj/NiPSysVolumeEmitter.h index 285248d8..45f085b3 100644 --- a/include/obj/NiPSysVolumeEmitter.h +++ b/include/obj/NiPSysVolumeEmitter.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPSYSVOLUMEEMITTER_H_ #define _NIPSYSVOLUMEEMITTER_H_ diff --git a/include/obj/NiPalette.h b/include/obj/NiPalette.h index c28d8197..7edfe6a1 100644 --- a/include/obj/NiPalette.h +++ b/include/obj/NiPalette.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPALETTE_H_ #define _NIPALETTE_H_ diff --git a/include/obj/NiParticleBomb.h b/include/obj/NiParticleBomb.h index 434466ed..94b353ef 100644 --- a/include/obj/NiParticleBomb.h +++ b/include/obj/NiParticleBomb.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEBOMB_H_ #define _NIPARTICLEBOMB_H_ diff --git a/include/obj/NiParticleColorModifier.h b/include/obj/NiParticleColorModifier.h index c5b88ecd..e6a95cb7 100644 --- a/include/obj/NiParticleColorModifier.h +++ b/include/obj/NiParticleColorModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLECOLORMODIFIER_H_ #define _NIPARTICLECOLORMODIFIER_H_ diff --git a/include/obj/NiParticleGrowFade.h b/include/obj/NiParticleGrowFade.h index 37787c8f..57b98895 100644 --- a/include/obj/NiParticleGrowFade.h +++ b/include/obj/NiParticleGrowFade.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEGROWFADE_H_ #define _NIPARTICLEGROWFADE_H_ diff --git a/include/obj/NiParticleMeshModifier.h b/include/obj/NiParticleMeshModifier.h index 0c35e1e3..5723e02d 100644 --- a/include/obj/NiParticleMeshModifier.h +++ b/include/obj/NiParticleMeshModifier.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEMESHMODIFIER_H_ #define _NIPARTICLEMESHMODIFIER_H_ diff --git a/include/obj/NiParticleMeshes.h b/include/obj/NiParticleMeshes.h index 7209940a..5bce05d9 100644 --- a/include/obj/NiParticleMeshes.h +++ b/include/obj/NiParticleMeshes.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEMESHES_H_ #define _NIPARTICLEMESHES_H_ diff --git a/include/obj/NiParticleMeshesData.h b/include/obj/NiParticleMeshesData.h index 84017669..7f832f84 100644 --- a/include/obj/NiParticleMeshesData.h +++ b/include/obj/NiParticleMeshesData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEMESHESDATA_H_ #define _NIPARTICLEMESHESDATA_H_ diff --git a/include/obj/NiParticleRotation.h b/include/obj/NiParticleRotation.h index 5f3c808e..72f68fd7 100644 --- a/include/obj/NiParticleRotation.h +++ b/include/obj/NiParticleRotation.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLEROTATION_H_ #define _NIPARTICLEROTATION_H_ diff --git a/include/obj/NiParticleSystem.h b/include/obj/NiParticleSystem.h index ee7cba94..0731a825 100644 --- a/include/obj/NiParticleSystem.h +++ b/include/obj/NiParticleSystem.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLESYSTEM_H_ #define _NIPARTICLESYSTEM_H_ diff --git a/include/obj/NiParticleSystemController.h b/include/obj/NiParticleSystemController.h index a8f8da7f..5108364b 100644 --- a/include/obj/NiParticleSystemController.h +++ b/include/obj/NiParticleSystemController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLESYSTEMCONTROLLER_H_ #define _NIPARTICLESYSTEMCONTROLLER_H_ diff --git a/include/obj/NiParticles.h b/include/obj/NiParticles.h index 20987056..f12fcad5 100644 --- a/include/obj/NiParticles.h +++ b/include/obj/NiParticles.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLES_H_ #define _NIPARTICLES_H_ diff --git a/include/obj/NiParticlesData.h b/include/obj/NiParticlesData.h index 9b3b258f..43ed4462 100644 --- a/include/obj/NiParticlesData.h +++ b/include/obj/NiParticlesData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPARTICLESDATA_H_ #define _NIPARTICLESDATA_H_ diff --git a/include/obj/NiPathController.h b/include/obj/NiPathController.h index 2a031ac6..23a446df 100644 --- a/include/obj/NiPathController.h +++ b/include/obj/NiPathController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPATHCONTROLLER_H_ #define _NIPATHCONTROLLER_H_ diff --git a/include/obj/NiPathInterpolator.h b/include/obj/NiPathInterpolator.h index 44c2aa22..924029f0 100644 --- a/include/obj/NiPathInterpolator.h +++ b/include/obj/NiPathInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPATHINTERPOLATOR_H_ #define _NIPATHINTERPOLATOR_H_ diff --git a/include/obj/NiPixelData.h b/include/obj/NiPixelData.h index 3675ffbe..287aba26 100644 --- a/include/obj/NiPixelData.h +++ b/include/obj/NiPixelData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPIXELDATA_H_ #define _NIPIXELDATA_H_ diff --git a/include/obj/NiPlanarCollider.h b/include/obj/NiPlanarCollider.h index b0ddb27d..f349d007 100644 --- a/include/obj/NiPlanarCollider.h +++ b/include/obj/NiPlanarCollider.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPLANARCOLLIDER_H_ #define _NIPLANARCOLLIDER_H_ diff --git a/include/obj/NiPoint3Interpolator.h b/include/obj/NiPoint3Interpolator.h index 797b835b..37534b73 100644 --- a/include/obj/NiPoint3Interpolator.h +++ b/include/obj/NiPoint3Interpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPOINT3INTERPOLATOR_H_ #define _NIPOINT3INTERPOLATOR_H_ diff --git a/include/obj/NiPointLight.h b/include/obj/NiPointLight.h index fd53384e..2f053410 100644 --- a/include/obj/NiPointLight.h +++ b/include/obj/NiPointLight.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPOINTLIGHT_H_ #define _NIPOINTLIGHT_H_ diff --git a/include/obj/NiPosData.h b/include/obj/NiPosData.h index f44a48c7..2e48433e 100644 --- a/include/obj/NiPosData.h +++ b/include/obj/NiPosData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPOSDATA_H_ #define _NIPOSDATA_H_ diff --git a/include/obj/NiProperty.h b/include/obj/NiProperty.h index 9f443741..4f1df54b 100644 --- a/include/obj/NiProperty.h +++ b/include/obj/NiProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIPROPERTY_H_ #define _NIPROPERTY_H_ diff --git a/include/obj/NiRangeLODData.h b/include/obj/NiRangeLODData.h index ef26bda0..742a3406 100644 --- a/include/obj/NiRangeLODData.h +++ b/include/obj/NiRangeLODData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIRANGELODDATA_H_ #define _NIRANGELODDATA_H_ diff --git a/include/obj/NiRawImageData.h b/include/obj/NiRawImageData.h new file mode 100644 index 00000000..6fc05760 --- /dev/null +++ b/include/obj/NiRawImageData.h @@ -0,0 +1,45 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#ifndef _NIRAWIMAGEDATA_H_ +#define _NIRAWIMAGEDATA_H_ + +#include "NiObject.h" + +// Include structures +#include "../gen/ByteColor3.h" +namespace Niflib { + +class NiRawImageData; +typedef Ref<NiRawImageData> NiRawImageDataRef; + +/*! + * NiRawImageData - Raw image data. + */ + +class NiRawImageData : public NI_RAW_IMAGE_DATA_PARENT { +public: + NIFLIB_API NiRawImageData(); + NIFLIB_API ~NiRawImageData(); + //Run-Time Type Information + NIFLIB_API static const Type TYPE; + NIFLIB_API static NiObject * Create(); + NIFLIB_API virtual const Type & GetType() const; + NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + NIFLIB_API virtual string asString( bool verbose = false ) const; + NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual list<NiObjectRef> GetRefs() const; + +protected: + NI_RAW_IMAGE_DATA_MEMBERS +private: + void InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + string InternalAsString( bool verbose ) const; + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + list<NiObjectRef> InternalGetRefs() const; +}; + +} +#endif diff --git a/include/obj/NiRotatingParticles.h b/include/obj/NiRotatingParticles.h index d16fcd22..9c0f4019 100644 --- a/include/obj/NiRotatingParticles.h +++ b/include/obj/NiRotatingParticles.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIROTATINGPARTICLES_H_ #define _NIROTATINGPARTICLES_H_ diff --git a/include/obj/NiRotatingParticlesData.h b/include/obj/NiRotatingParticlesData.h index 7865d0e0..310dddc3 100644 --- a/include/obj/NiRotatingParticlesData.h +++ b/include/obj/NiRotatingParticlesData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIROTATINGPARTICLESDATA_H_ #define _NIROTATINGPARTICLESDATA_H_ diff --git a/include/obj/NiScreenLODData.h b/include/obj/NiScreenLODData.h index 2d1bfc30..a7a845c6 100644 --- a/include/obj/NiScreenLODData.h +++ b/include/obj/NiScreenLODData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISCREENLODDATA_H_ #define _NISCREENLODDATA_H_ diff --git a/include/obj/NiSequence.h b/include/obj/NiSequence.h new file mode 100644 index 00000000..e63608e9 --- /dev/null +++ b/include/obj/NiSequence.h @@ -0,0 +1,49 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#ifndef _NISEQUENCE_H_ +#define _NISEQUENCE_H_ + +#include "NiObject.h" + +// Include structures +#include "../Ref.h" +#include "../gen/ControllerLink.h" +namespace Niflib { + +// Forward define of referenced NIF objects +class NiTextKeyExtraData; +class NiSequence; +typedef Ref<NiSequence> NiSequenceRef; + +/*! + * NiSequence - Root node used in some Empire Earth II .kf files (version + * 4.2.2.0). + */ + +class NiSequence : public NI_SEQUENCE_PARENT { +public: + NIFLIB_API NiSequence(); + NIFLIB_API ~NiSequence(); + //Run-Time Type Information + NIFLIB_API static const Type TYPE; + NIFLIB_API static NiObject * Create(); + NIFLIB_API virtual const Type & GetType() const; + NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + NIFLIB_API virtual string asString( bool verbose = false ) const; + NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual list<NiObjectRef> GetRefs() const; + +protected: + NI_SEQUENCE_MEMBERS +private: + void InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + string InternalAsString( bool verbose ) const; + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + list<NiObjectRef> InternalGetRefs() const; +}; + +} +#endif diff --git a/include/obj/NiSequenceStreamHelper.h b/include/obj/NiSequenceStreamHelper.h index 64c3be50..03e5c906 100644 --- a/include/obj/NiSequenceStreamHelper.h +++ b/include/obj/NiSequenceStreamHelper.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISEQUENCESTREAMHELPER_H_ #define _NISEQUENCESTREAMHELPER_H_ diff --git a/include/obj/NiShadeProperty.h b/include/obj/NiShadeProperty.h index aef3e932..ae190d3f 100644 --- a/include/obj/NiShadeProperty.h +++ b/include/obj/NiShadeProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISHADEPROPERTY_H_ #define _NISHADEPROPERTY_H_ diff --git a/include/obj/NiSingleInterpolatorController.h b/include/obj/NiSingleInterpolatorController.h index 39671b7c..809abae8 100644 --- a/include/obj/NiSingleInterpolatorController.h +++ b/include/obj/NiSingleInterpolatorController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISINGLEINTERPOLATORCONTROLLER_H_ #define _NISINGLEINTERPOLATORCONTROLLER_H_ diff --git a/include/obj/NiSkinData.h b/include/obj/NiSkinData.h index 163cab4d..3257b030 100644 --- a/include/obj/NiSkinData.h +++ b/include/obj/NiSkinData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISKINDATA_H_ #define _NISKINDATA_H_ diff --git a/include/obj/NiSkinInstance.h b/include/obj/NiSkinInstance.h index 2502e3e3..bcf30896 100644 --- a/include/obj/NiSkinInstance.h +++ b/include/obj/NiSkinInstance.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISKININSTANCE_H_ #define _NISKININSTANCE_H_ diff --git a/include/obj/NiSkinPartition.h b/include/obj/NiSkinPartition.h index 1ea93476..6f91c314 100644 --- a/include/obj/NiSkinPartition.h +++ b/include/obj/NiSkinPartition.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISKINPARTITION_H_ #define _NISKINPARTITION_H_ diff --git a/include/obj/NiSourceTexture.h b/include/obj/NiSourceTexture.h index 30180bc8..411c080e 100644 --- a/include/obj/NiSourceTexture.h +++ b/include/obj/NiSourceTexture.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISOURCETEXTURE_H_ #define _NISOURCETEXTURE_H_ diff --git a/include/obj/NiSpecularProperty.h b/include/obj/NiSpecularProperty.h index c98a0b87..97fdf8e2 100644 --- a/include/obj/NiSpecularProperty.h +++ b/include/obj/NiSpecularProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISPECULARPROPERTY_H_ #define _NISPECULARPROPERTY_H_ diff --git a/include/obj/NiSphericalCollider.h b/include/obj/NiSphericalCollider.h index 195da308..76fe094f 100644 --- a/include/obj/NiSphericalCollider.h +++ b/include/obj/NiSphericalCollider.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISPHERICALCOLLIDER_H_ #define _NISPHERICALCOLLIDER_H_ diff --git a/include/obj/NiSpotLight.h b/include/obj/NiSpotLight.h index 9dff8aab..d0deda11 100644 --- a/include/obj/NiSpotLight.h +++ b/include/obj/NiSpotLight.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISPOTLIGHT_H_ #define _NISPOTLIGHT_H_ diff --git a/include/obj/NiStencilProperty.h b/include/obj/NiStencilProperty.h index 7cf7e12b..d3dfab4c 100644 --- a/include/obj/NiStencilProperty.h +++ b/include/obj/NiStencilProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISTENCILPROPERTY_H_ #define _NISTENCILPROPERTY_H_ diff --git a/include/obj/NiStringExtraData.h b/include/obj/NiStringExtraData.h index a080f1bc..a9d17cb1 100644 --- a/include/obj/NiStringExtraData.h +++ b/include/obj/NiStringExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISTRINGEXTRADATA_H_ #define _NISTRINGEXTRADATA_H_ diff --git a/include/obj/NiStringPalette.h b/include/obj/NiStringPalette.h index 46c1baed..57b96d89 100644 --- a/include/obj/NiStringPalette.h +++ b/include/obj/NiStringPalette.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISTRINGPALETTE_H_ #define _NISTRINGPALETTE_H_ diff --git a/include/obj/NiStringsExtraData.h b/include/obj/NiStringsExtraData.h index 9b48c549..a5a92bef 100644 --- a/include/obj/NiStringsExtraData.h +++ b/include/obj/NiStringsExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NISTRINGSEXTRADATA_H_ #define _NISTRINGSEXTRADATA_H_ diff --git a/include/obj/NiTextKeyExtraData.h b/include/obj/NiTextKeyExtraData.h index dda54a96..6c1f465e 100644 --- a/include/obj/NiTextKeyExtraData.h +++ b/include/obj/NiTextKeyExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITEXTKEYEXTRADATA_H_ #define _NITEXTKEYEXTRADATA_H_ diff --git a/include/obj/NiTextureEffect.h b/include/obj/NiTextureEffect.h index 05729670..13f6d0c9 100644 --- a/include/obj/NiTextureEffect.h +++ b/include/obj/NiTextureEffect.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITEXTUREEFFECT_H_ #define _NITEXTUREEFFECT_H_ diff --git a/include/obj/NiTextureModeProperty.h b/include/obj/NiTextureModeProperty.h index 52c467d2..d404dc0e 100644 --- a/include/obj/NiTextureModeProperty.h +++ b/include/obj/NiTextureModeProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITEXTUREMODEPROPERTY_H_ #define _NITEXTUREMODEPROPERTY_H_ diff --git a/include/obj/NiTextureProperty.h b/include/obj/NiTextureProperty.h index dceb90b4..e17153aa 100644 --- a/include/obj/NiTextureProperty.h +++ b/include/obj/NiTextureProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITEXTUREPROPERTY_H_ #define _NITEXTUREPROPERTY_H_ diff --git a/include/obj/NiTextureTransformController.h b/include/obj/NiTextureTransformController.h index 8c95b230..36564dea 100644 --- a/include/obj/NiTextureTransformController.h +++ b/include/obj/NiTextureTransformController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITEXTURETRANSFORMCONTROLLER_H_ #define _NITEXTURETRANSFORMCONTROLLER_H_ diff --git a/include/obj/NiTexturingProperty.h b/include/obj/NiTexturingProperty.h index d5ae063f..57104b7b 100644 --- a/include/obj/NiTexturingProperty.h +++ b/include/obj/NiTexturingProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NiTexturingProperty_H_ #define _NiTexturingProperty_H_ diff --git a/include/obj/NiTimeController.h b/include/obj/NiTimeController.h index cd0f5a28..1a00e974 100644 --- a/include/obj/NiTimeController.h +++ b/include/obj/NiTimeController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITIMECONTROLLER_H_ #define _NITIMECONTROLLER_H_ diff --git a/include/obj/NiTransformController.h b/include/obj/NiTransformController.h index e264f00c..d6c80901 100644 --- a/include/obj/NiTransformController.h +++ b/include/obj/NiTransformController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRANSFORMCONTROLLER_H_ #define _NITRANSFORMCONTROLLER_H_ diff --git a/include/obj/NiTransformData.h b/include/obj/NiTransformData.h index a6a0cf13..4eb9a793 100644 --- a/include/obj/NiTransformData.h +++ b/include/obj/NiTransformData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRANSFORMDATA_H_ #define _NITRANSFORMDATA_H_ diff --git a/include/obj/NiTransformInterpolator.h b/include/obj/NiTransformInterpolator.h index 4b3af546..5933b5c9 100644 --- a/include/obj/NiTransformInterpolator.h +++ b/include/obj/NiTransformInterpolator.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRANSFORMINTERPOLATOR_H_ #define _NITRANSFORMINTERPOLATOR_H_ diff --git a/include/obj/NiTriBasedGeom.h b/include/obj/NiTriBasedGeom.h index 7ddab476..bac0158f 100644 --- a/include/obj/NiTriBasedGeom.h +++ b/include/obj/NiTriBasedGeom.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRIBASEDGEOM_H_ #define _NITRIBASEDGEOM_H_ diff --git a/include/obj/NiTriBasedGeomData.h b/include/obj/NiTriBasedGeomData.h index d8f0a842..fc7a476c 100644 --- a/include/obj/NiTriBasedGeomData.h +++ b/include/obj/NiTriBasedGeomData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRIBASEDGEOMDATA_H_ #define _NITRIBASEDGEOMDATA_H_ diff --git a/include/obj/NiTriShape.h b/include/obj/NiTriShape.h index 8aadbfb8..c3dbf470 100644 --- a/include/obj/NiTriShape.h +++ b/include/obj/NiTriShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRISHAPE_H_ #define _NITRISHAPE_H_ diff --git a/include/obj/NiTriShapeData.h b/include/obj/NiTriShapeData.h index 27ca73cf..181b4101 100644 --- a/include/obj/NiTriShapeData.h +++ b/include/obj/NiTriShapeData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRISHAPEDATA_H_ #define _NITRISHAPEDATA_H_ diff --git a/include/obj/NiTriStrips.h b/include/obj/NiTriStrips.h index 8ae7b2e9..08af8cc3 100644 --- a/include/obj/NiTriStrips.h +++ b/include/obj/NiTriStrips.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRISTRIPS_H_ #define _NITRISTRIPS_H_ diff --git a/include/obj/NiTriStripsData.h b/include/obj/NiTriStripsData.h index 1e372570..2c5ade36 100644 --- a/include/obj/NiTriStripsData.h +++ b/include/obj/NiTriStripsData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NITRISTRIPSDATA_H_ #define _NITRISTRIPSDATA_H_ diff --git a/include/obj/NiUVController.h b/include/obj/NiUVController.h index 235ca5b8..69b7b527 100644 --- a/include/obj/NiUVController.h +++ b/include/obj/NiUVController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIUVCONTROLLER_H_ #define _NIUVCONTROLLER_H_ diff --git a/include/obj/NiUVData.h b/include/obj/NiUVData.h index 2f16adb4..149a5d9d 100644 --- a/include/obj/NiUVData.h +++ b/include/obj/NiUVData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIUVDATA_H_ #define _NIUVDATA_H_ diff --git a/include/obj/NiVectorExtraData.h b/include/obj/NiVectorExtraData.h index 898e3925..c43fc074 100644 --- a/include/obj/NiVectorExtraData.h +++ b/include/obj/NiVectorExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIVECTOREXTRADATA_H_ #define _NIVECTOREXTRADATA_H_ diff --git a/include/obj/NiVertWeightsExtraData.h b/include/obj/NiVertWeightsExtraData.h index 7fb48405..9c4a376b 100644 --- a/include/obj/NiVertWeightsExtraData.h +++ b/include/obj/NiVertWeightsExtraData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIVERTWEIGHTSEXTRADATA_H_ #define _NIVERTWEIGHTSEXTRADATA_H_ diff --git a/include/obj/NiVertexColorProperty.h b/include/obj/NiVertexColorProperty.h index 44876c4d..40356d60 100644 --- a/include/obj/NiVertexColorProperty.h +++ b/include/obj/NiVertexColorProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIVERTEXCOLORPROPERTY_H_ #define _NIVERTEXCOLORPROPERTY_H_ diff --git a/include/obj/NiVisController.h b/include/obj/NiVisController.h index 4eaf5537..fd63eede 100644 --- a/include/obj/NiVisController.h +++ b/include/obj/NiVisController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIVISCONTROLLER_H_ #define _NIVISCONTROLLER_H_ diff --git a/include/obj/NiVisData.h b/include/obj/NiVisData.h index 95394921..c6cba34e 100644 --- a/include/obj/NiVisData.h +++ b/include/obj/NiVisData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIVISDATA_H_ #define _NIVISDATA_H_ diff --git a/include/obj/NiWireframeProperty.h b/include/obj/NiWireframeProperty.h index 9b01c1b3..4e21f048 100644 --- a/include/obj/NiWireframeProperty.h +++ b/include/obj/NiWireframeProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIWIREFRAMEPROPERTY_H_ #define _NIWIREFRAMEPROPERTY_H_ diff --git a/include/obj/NiZBufferProperty.h b/include/obj/NiZBufferProperty.h index d89a8f82..cc8e816d 100644 --- a/include/obj/NiZBufferProperty.h +++ b/include/obj/NiZBufferProperty.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _NIZBUFFERPROPERTY_H_ #define _NIZBUFFERPROPERTY_H_ diff --git a/include/obj/RootCollisionNode.h b/include/obj/RootCollisionNode.h index 0684cc76..b834147a 100644 --- a/include/obj/RootCollisionNode.h +++ b/include/obj/RootCollisionNode.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _ROOTCOLLISIONNODE_H_ #define _ROOTCOLLISIONNODE_H_ diff --git a/include/obj/bhkBlendCollisionObject.h b/include/obj/bhkBlendCollisionObject.h index e0e11b6b..ae792751 100644 --- a/include/obj/bhkBlendCollisionObject.h +++ b/include/obj/bhkBlendCollisionObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKBLENDCOLLISIONOBJECT_H_ #define _BHKBLENDCOLLISIONOBJECT_H_ diff --git a/include/obj/bhkBlendController.h b/include/obj/bhkBlendController.h index 6572a59b..f1ed7a07 100644 --- a/include/obj/bhkBlendController.h +++ b/include/obj/bhkBlendController.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKBLENDCONTROLLER_H_ #define _BHKBLENDCONTROLLER_H_ diff --git a/include/obj/bhkBoxShape.h b/include/obj/bhkBoxShape.h index 2c8cab68..3d521a07 100644 --- a/include/obj/bhkBoxShape.h +++ b/include/obj/bhkBoxShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKBOXSHAPE_H_ #define _BHKBOXSHAPE_H_ diff --git a/include/obj/bhkCapsuleShape.h b/include/obj/bhkCapsuleShape.h index fbc15ae7..def96268 100644 --- a/include/obj/bhkCapsuleShape.h +++ b/include/obj/bhkCapsuleShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKCAPSULESHAPE_H_ #define _BHKCAPSULESHAPE_H_ diff --git a/include/obj/bhkCollisionObject.h b/include/obj/bhkCollisionObject.h index ebca9670..4f10555f 100644 --- a/include/obj/bhkCollisionObject.h +++ b/include/obj/bhkCollisionObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKCOLLISIONOBJECT_H_ #define _BHKCOLLISIONOBJECT_H_ diff --git a/include/obj/bhkConvexShape.h b/include/obj/bhkConvexShape.h index da88b9ed..87b8dbba 100644 --- a/include/obj/bhkConvexShape.h +++ b/include/obj/bhkConvexShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKCONVEXSHAPE_H_ #define _BHKCONVEXSHAPE_H_ diff --git a/include/obj/bhkConvexTransformShape.h b/include/obj/bhkConvexTransformShape.h index 1e81df15..3fc40101 100644 --- a/include/obj/bhkConvexTransformShape.h +++ b/include/obj/bhkConvexTransformShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKCONVEXTRANSFORMSHAPE_H_ #define _BHKCONVEXTRANSFORMSHAPE_H_ diff --git a/include/obj/bhkConvexVerticesShape.h b/include/obj/bhkConvexVerticesShape.h index d269e333..2be98e74 100644 --- a/include/obj/bhkConvexVerticesShape.h +++ b/include/obj/bhkConvexVerticesShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKCONVEXVERTICESSHAPE_H_ #define _BHKCONVEXVERTICESSHAPE_H_ diff --git a/include/obj/bhkEntity.h b/include/obj/bhkEntity.h index 399a3767..17583356 100644 --- a/include/obj/bhkEntity.h +++ b/include/obj/bhkEntity.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKENTITY_H_ #define _BHKENTITY_H_ diff --git a/include/obj/bhkHingeConstraint.h b/include/obj/bhkHingeConstraint.h index 125b970c..b9507fa2 100644 --- a/include/obj/bhkHingeConstraint.h +++ b/include/obj/bhkHingeConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKHINGECONSTRAINT_H_ #define _BHKHINGECONSTRAINT_H_ diff --git a/include/obj/bhkLimitedHingeConstraint.h b/include/obj/bhkLimitedHingeConstraint.h index 54543383..46b1e92c 100644 --- a/include/obj/bhkLimitedHingeConstraint.h +++ b/include/obj/bhkLimitedHingeConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKLIMITEDHINGECONSTRAINT_H_ #define _BHKLIMITEDHINGECONSTRAINT_H_ diff --git a/include/obj/bhkListShape.h b/include/obj/bhkListShape.h index 5cd4e494..31a32edd 100644 --- a/include/obj/bhkListShape.h +++ b/include/obj/bhkListShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKLISTSHAPE_H_ #define _BHKLISTSHAPE_H_ diff --git a/include/obj/bhkMalleableConstraint.h b/include/obj/bhkMalleableConstraint.h index 0633a856..cde8a19e 100644 --- a/include/obj/bhkMalleableConstraint.h +++ b/include/obj/bhkMalleableConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKMALLEABLECONSTRAINT_H_ #define _BHKMALLEABLECONSTRAINT_H_ diff --git a/include/obj/bhkMeshShape.h b/include/obj/bhkMeshShape.h new file mode 100644 index 00000000..e12041d2 --- /dev/null +++ b/include/obj/bhkMeshShape.h @@ -0,0 +1,47 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#ifndef _BHKMESHSHAPE_H_ +#define _BHKMESHSHAPE_H_ + +#include "bhkSphereRepShape.h" + +// Include structures +#include "../Ref.h" +namespace Niflib { + +// Forward define of referenced NIF objects +class NiTriStripsData; +class bhkMeshShape; +typedef Ref<bhkMeshShape> bhkMeshShapeRef; + +/*! + * bhkMeshShape - + */ + +class bhkMeshShape : public BHK_MESH_SHAPE_PARENT { +public: + NIFLIB_API bhkMeshShape(); + NIFLIB_API ~bhkMeshShape(); + //Run-Time Type Information + NIFLIB_API static const Type TYPE; + NIFLIB_API static NiObject * Create(); + NIFLIB_API virtual const Type & GetType() const; + NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + NIFLIB_API virtual string asString( bool verbose = false ) const; + NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + NIFLIB_HIDDEN virtual list<NiObjectRef> GetRefs() const; + +protected: + BHK_MESH_SHAPE_MEMBERS +private: + void InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); + void InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; + string InternalAsString( bool verbose ) const; + void InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ); + list<NiObjectRef> InternalGetRefs() const; +}; + +} +#endif diff --git a/include/obj/bhkMoppBvTreeShape.h b/include/obj/bhkMoppBvTreeShape.h index af5cb7a1..b78838d0 100644 --- a/include/obj/bhkMoppBvTreeShape.h +++ b/include/obj/bhkMoppBvTreeShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKMOPPBVTREESHAPE_H_ #define _BHKMOPPBVTREESHAPE_H_ diff --git a/include/obj/bhkMultiSphereShape.h b/include/obj/bhkMultiSphereShape.h index 96f7bf53..11e194f0 100644 --- a/include/obj/bhkMultiSphereShape.h +++ b/include/obj/bhkMultiSphereShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKMULTISPHERESHAPE_H_ #define _BHKMULTISPHERESHAPE_H_ diff --git a/include/obj/bhkNiTriStripsShape.h b/include/obj/bhkNiTriStripsShape.h index 3cc4678e..9cda4784 100644 --- a/include/obj/bhkNiTriStripsShape.h +++ b/include/obj/bhkNiTriStripsShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKNITRISTRIPSSHAPE_H_ #define _BHKNITRISTRIPSSHAPE_H_ diff --git a/include/obj/bhkPackedNiTriStripsShape.h b/include/obj/bhkPackedNiTriStripsShape.h index 7ac6d9ca..f9b00d43 100644 --- a/include/obj/bhkPackedNiTriStripsShape.h +++ b/include/obj/bhkPackedNiTriStripsShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKPACKEDNITRISTRIPSSHAPE_H_ #define _BHKPACKEDNITRISTRIPSSHAPE_H_ diff --git a/include/obj/bhkPrismaticConstraint.h b/include/obj/bhkPrismaticConstraint.h index b0bd1255..6724a6a8 100644 --- a/include/obj/bhkPrismaticConstraint.h +++ b/include/obj/bhkPrismaticConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKPRISMATICCONSTRAINT_H_ #define _BHKPRISMATICCONSTRAINT_H_ diff --git a/include/obj/bhkRagdollConstraint.h b/include/obj/bhkRagdollConstraint.h index 8dbddac1..7f5d0876 100644 --- a/include/obj/bhkRagdollConstraint.h +++ b/include/obj/bhkRagdollConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKRAGDOLLCONSTRAINT_H_ #define _BHKRAGDOLLCONSTRAINT_H_ diff --git a/include/obj/bhkRefObject.h b/include/obj/bhkRefObject.h index 2c32d648..a65c95c9 100644 --- a/include/obj/bhkRefObject.h +++ b/include/obj/bhkRefObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKREFOBJECT_H_ #define _BHKREFOBJECT_H_ diff --git a/include/obj/bhkRigidBody.h b/include/obj/bhkRigidBody.h index 32f66e4b..674a0fa4 100644 --- a/include/obj/bhkRigidBody.h +++ b/include/obj/bhkRigidBody.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKRIGIDBODY_H_ #define _BHKRIGIDBODY_H_ diff --git a/include/obj/bhkRigidBodyT.h b/include/obj/bhkRigidBodyT.h index ab9fa631..f4ceb787 100644 --- a/include/obj/bhkRigidBodyT.h +++ b/include/obj/bhkRigidBodyT.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKRIGIDBODYT_H_ #define _BHKRIGIDBODYT_H_ diff --git a/include/obj/bhkSPCollisionObject.h b/include/obj/bhkSPCollisionObject.h index c10f6ac1..00ff94e1 100644 --- a/include/obj/bhkSPCollisionObject.h +++ b/include/obj/bhkSPCollisionObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSPCOLLISIONOBJECT_H_ #define _BHKSPCOLLISIONOBJECT_H_ diff --git a/include/obj/bhkSerializable.h b/include/obj/bhkSerializable.h index 90a68003..40e4cc4e 100644 --- a/include/obj/bhkSerializable.h +++ b/include/obj/bhkSerializable.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSERIALIZABLE_H_ #define _BHKSERIALIZABLE_H_ diff --git a/include/obj/bhkShape.h b/include/obj/bhkShape.h index f5c207a2..0af922c4 100644 --- a/include/obj/bhkShape.h +++ b/include/obj/bhkShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSHAPE_H_ #define _BHKSHAPE_H_ diff --git a/include/obj/bhkSimpleShapePhantom.h b/include/obj/bhkSimpleShapePhantom.h index a1dd86fc..84f95a0c 100644 --- a/include/obj/bhkSimpleShapePhantom.h +++ b/include/obj/bhkSimpleShapePhantom.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSIMPLESHAPEPHANTOM_H_ #define _BHKSIMPLESHAPEPHANTOM_H_ diff --git a/include/obj/bhkSphereRepShape.h b/include/obj/bhkSphereRepShape.h index 36235578..384e4c4d 100644 --- a/include/obj/bhkSphereRepShape.h +++ b/include/obj/bhkSphereRepShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSPHEREREPSHAPE_H_ #define _BHKSPHEREREPSHAPE_H_ diff --git a/include/obj/bhkSphereShape.h b/include/obj/bhkSphereShape.h index 2626286a..aff35eb1 100644 --- a/include/obj/bhkSphereShape.h +++ b/include/obj/bhkSphereShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSPHERESHAPE_H_ #define _BHKSPHERESHAPE_H_ diff --git a/include/obj/bhkStiffSpringConstraint.h b/include/obj/bhkStiffSpringConstraint.h index a72c49a1..6c6b2cdf 100644 --- a/include/obj/bhkStiffSpringConstraint.h +++ b/include/obj/bhkStiffSpringConstraint.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKSTIFFSPRINGCONSTRAINT_H_ #define _BHKSTIFFSPRINGCONSTRAINT_H_ diff --git a/include/obj/bhkTransformShape.h b/include/obj/bhkTransformShape.h index 35d522e5..c0248352 100644 --- a/include/obj/bhkTransformShape.h +++ b/include/obj/bhkTransformShape.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKTRANSFORMSHAPE_H_ #define _BHKTRANSFORMSHAPE_H_ diff --git a/include/obj/bhkWorldObject.h b/include/obj/bhkWorldObject.h index 2c523ee2..706d5b42 100644 --- a/include/obj/bhkWorldObject.h +++ b/include/obj/bhkWorldObject.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _BHKWORLDOBJECT_H_ #define _BHKWORLDOBJECT_H_ diff --git a/include/obj/hkPackedNiTriStripsData.h b/include/obj/hkPackedNiTriStripsData.h index 9c6f3652..ab6c6b8b 100644 --- a/include/obj/hkPackedNiTriStripsData.h +++ b/include/obj/hkPackedNiTriStripsData.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #ifndef _HKPACKEDNITRISTRIPSDATA_H_ #define _HKPACKEDNITRISTRIPSDATA_H_ diff --git a/niflib.vcproj b/niflib.vcproj index a5a2c597..3fd4d91c 100644 --- a/niflib.vcproj +++ b/niflib.vcproj @@ -434,6 +434,10 @@ RelativePath=".\src\obj\bhkMalleableConstraint.cpp" > </File> + <File + RelativePath=".\src\obj\bhkMeshShape.cpp" + > + </File> <File RelativePath=".\src\obj\bhkMoppBvTreeShape.cpp" > @@ -838,6 +842,10 @@ RelativePath=".\src\obj\NiMultiTargetTransformController.cpp" > </File> + <File + RelativePath=".\src\obj\NiMultiTextureProperty.cpp" + > + </File> <File RelativePath=".\src\obj\NiNode.cpp" > @@ -1062,6 +1070,10 @@ RelativePath=".\src\obj\NiRangeLODData.cpp" > </File> + <File + RelativePath=".\src\obj\NiRawImageData.cpp" + > + </File> <File RelativePath=".\src\obj\NiRotatingParticles.cpp" > @@ -1074,6 +1086,10 @@ RelativePath=".\src\obj\NiScreenLODData.cpp" > </File> + <File + RelativePath=".\src\obj\NiSequence.cpp" + > + </File> <File RelativePath=".\src\obj\NiSequenceStreamHelper.cpp" > @@ -1250,6 +1266,10 @@ RelativePath=".\src\gen\ByteArray.cpp" > </File> + <File + RelativePath=".\src\gen\ByteColor3.cpp" + > + </File> <File RelativePath=".\src\gen\ControllerLink.cpp" > @@ -1540,6 +1560,10 @@ RelativePath=".\include\obj\bhkMalleableConstraint.h" > </File> + <File + RelativePath=".\include\obj\bhkMeshShape.h" + > + </File> <File RelativePath=".\include\obj\bhkMoppBvTreeShape.h" > @@ -1944,6 +1968,10 @@ RelativePath=".\include\obj\NiMultiTargetTransformController.h" > </File> + <File + RelativePath=".\include\obj\NiMultiTextureProperty.h" + > + </File> <File RelativePath=".\include\obj\NiNode.h" > @@ -2168,6 +2196,10 @@ RelativePath=".\include\obj\NiRangeLODData.h" > </File> + <File + RelativePath=".\include\obj\NiRawImageData.h" + > + </File> <File RelativePath=".\include\obj\NiRotatingParticles.h" > @@ -2180,6 +2212,10 @@ RelativePath=".\include\obj\NiScreenLODData.h" > </File> + <File + RelativePath=".\include\obj\NiSequence.h" + > + </File> <File RelativePath=".\include\obj\NiSequenceStreamHelper.h" > @@ -2356,6 +2392,10 @@ RelativePath=".\include\gen\ByteArray.h" > </File> + <File + RelativePath=".\include\gen\ByteColor3.h" + > + </File> <File RelativePath=".\include\gen\ControllerLink.h" > diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp index 283c185f..60023f1f 100644 --- a/src/ComplexShape.cpp +++ b/src/ComplexShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../include/ComplexShape.h" #include "../include/obj/NiNode.h" diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp index fb65adf8..58a46354 100644 --- a/src/NIF_IO.cpp +++ b/src/NIF_IO.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../include/NIF_IO.h" #include "../include/niflib.h" diff --git a/src/Type.cpp b/src/Type.cpp index a66d9490..89cc80c7 100644 --- a/src/Type.cpp +++ b/src/Type.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../include/Type.h" using namespace Niflib; diff --git a/src/gen/ByteColor3.cpp b/src/gen/ByteColor3.cpp new file mode 100644 index 00000000..67855700 --- /dev/null +++ b/src/gen/ByteColor3.cpp @@ -0,0 +1,28 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +//---THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT---// + +//To change this file, alter the niftools/docsys/nifxml_niflib.py Python script. + +#include "../../include/gen/ByteColor3.h" +using namespace Niflib; + +//Constructor +ByteColor3::ByteColor3() : r((byte)0), g((byte)0), b((byte)0) {}; + +//Copy Constructor +ByteColor3::ByteColor3( const ByteColor3 & src ) { + *this = src; +}; + +//Copy Operator +ByteColor3 & ByteColor3::operator=( const ByteColor3 & src ) { + this->r = src.r; + this->g = src.g; + this->b = src.b; + return *this; +}; + +//Destructor +ByteColor3::~ByteColor3() {}; diff --git a/src/gen/LODRange.cpp b/src/gen/LODRange.cpp index b889ca0d..7637aa9d 100644 --- a/src/gen/LODRange.cpp +++ b/src/gen/LODRange.cpp @@ -20,6 +20,7 @@ LODRange::LODRange( const LODRange & src ) { LODRange & LODRange::operator=( const LODRange & src ) { this->nearExtent = src.nearExtent; this->farExtent = src.farExtent; + this->unknownInts = src.unknownInts; return *this; }; diff --git a/src/gen/RagDollDescriptor.cpp b/src/gen/RagDollDescriptor.cpp index 597ba067..de7a9563 100644 --- a/src/gen/RagDollDescriptor.cpp +++ b/src/gen/RagDollDescriptor.cpp @@ -5,19 +5,19 @@ All rights reserved. Please see niflib.h for license. */ //To change this file, alter the niftools/docsys/nifxml_niflib.py Python script. -#include "../../include/gen/RagDollDescriptor.h" +#include "../../include/gen/RagdollDescriptor.h" using namespace Niflib; //Constructor -RagDollDescriptor::RagDollDescriptor() : coneMinAngle(0.0f), planeMinAngle(0.0f), planeMaxAngle(0.0f), twistMinAngle(0.0f), twistMaxAngle(0.0f), maxFriction(0.0f) {}; +RagdollDescriptor::RagdollDescriptor() : coneMinAngle(0.0f), planeMinAngle(0.0f), planeMaxAngle(0.0f), twistMinAngle(0.0f), twistMaxAngle(0.0f), maxFriction(0.0f) {}; //Copy Constructor -RagDollDescriptor::RagDollDescriptor( const RagDollDescriptor & src ) { +RagdollDescriptor::RagdollDescriptor( const RagdollDescriptor & src ) { *this = src; }; //Copy Operator -RagDollDescriptor & RagDollDescriptor::operator=( const RagDollDescriptor & src ) { +RagdollDescriptor & RagdollDescriptor::operator=( const RagdollDescriptor & src ) { this->pivotA = src.pivotA; this->planeA = src.planeA; this->twistA = src.twistA; @@ -34,4 +34,4 @@ RagDollDescriptor & RagDollDescriptor::operator=( const RagDollDescriptor & src }; //Destructor -RagDollDescriptor::~RagDollDescriptor() {}; +RagdollDescriptor::~RagdollDescriptor() {}; diff --git a/src/gen/obj_impl.cpp b/src/gen/obj_impl.cpp index 6fd4d788..5dc6357f 100644 --- a/src/gen/obj_impl.cpp +++ b/src/gen/obj_impl.cpp @@ -22,6 +22,7 @@ using namespace std; #include "../../include/obj/bhkMoppBvTreeShape.h" #include "../../include/obj/bhkMultiSphereShape.h" #include "../../include/obj/bhkNiTriStripsShape.h" +#include "../../include/obj/bhkMeshShape.h" #include "../../include/obj/bhkPackedNiTriStripsShape.h" #include "../../include/obj/bhkPrismaticConstraint.h" #include "../../include/obj/bhkRagdollConstraint.h" @@ -64,6 +65,7 @@ using namespace std; #include "../../include/obj/NiColorData.h" #include "../../include/obj/NiColorExtraData.h" #include "../../include/obj/NiControllerManager.h" +#include "../../include/obj/NiSequence.h" #include "../../include/obj/NiControllerSequence.h" #include "../../include/obj/NiDefaultAVObjectPalette.h" #include "../../include/obj/NiDirectionalLight.h" @@ -175,6 +177,7 @@ using namespace std; #include "../../include/obj/NiTextureModeProperty.h" #include "../../include/obj/NiImage.h" #include "../../include/obj/NiTextureProperty.h" +#include "../../include/obj/NiMultiTextureProperty.h" #include "../../include/obj/NiTexturingProperty.h" #include "../../include/obj/NiTransformController.h" #include "../../include/obj/NiTransformData.h" @@ -195,6 +198,7 @@ using namespace std; #include "../../include/obj/NiWireframeProperty.h" #include "../../include/obj/NiZBufferProperty.h" #include "../../include/obj/RootCollisionNode.h" +#include "../../include/obj/NiRawImageData.h" const char FIX_LINK_POP_ERROR[] = "Trying to pop a link from empty stack. This is probably a bug."; const char FIX_LINK_INDEX_ERROR[] = "Object index was not found in object map. This NIF file may be invalid or imporperly supported."; @@ -276,8 +280,10 @@ void AParticleModifier::InternalRead( istream& in, list<unsigned int> & link_sta NiObject::Read( in, link_stack, info ); NifStream( block_num, in, info ); link_stack.push_back( block_num ); - NifStream( block_num, in, info ); - link_stack.push_back( block_num ); + if ( info.version >= 0x04000002 ) { + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + }; } void AParticleModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { @@ -286,10 +292,12 @@ void AParticleModifier::InternalWrite( ostream& out, const map<NiObjectRef,unsig NifStream( link_map.find( StaticCast<NiObject>(nextModifier) )->second, out, info ); else NifStream( 0xffffffff, out, info ); - if ( controller != NULL ) - NifStream( link_map.find( StaticCast<NiObject>(controller) )->second, out, info ); - else - NifStream( 0xffffffff, out, info ); + if ( info.version >= 0x04000002 ) { + if ( controller != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(controller) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + }; } std::string AParticleModifier::InternalAsString( bool verbose ) const { @@ -304,7 +312,9 @@ std::string AParticleModifier::InternalAsString( bool verbose ) const { void AParticleModifier::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { NiObject::FixLinks( objects, link_stack, info ); nextModifier = FixLink<AParticleModifier>( objects, link_stack, info ); - controller = FixLink<NiParticleSystemController>( objects, link_stack, info ); + if ( info.version >= 0x04000002 ) { + controller = FixLink<NiParticleSystemController>( objects, link_stack, info ); + }; } std::list<NiObjectRef> AParticleModifier::InternalGetRefs() const { @@ -429,52 +439,52 @@ std::list<NiObjectRef> AbhkConstraint::InternalGetRefs() const { void AbhkRagdollConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { AbhkConstraint::Read( in, link_stack, info ); - NifStream( pivotA, in, info ); - NifStream( planeA, in, info ); - NifStream( twistA, in, info ); - NifStream( pivotB, in, info ); - NifStream( planeB, in, info ); - NifStream( twistB, in, info ); - NifStream( coneMinAngle, in, info ); - NifStream( planeMinAngle, in, info ); - NifStream( planeMaxAngle, in, info ); - NifStream( twistMinAngle, in, info ); - NifStream( twistMaxAngle, in, info ); - NifStream( maxFriction, in, info ); + NifStream( ragdoll.pivotA, in, info ); + NifStream( ragdoll.planeA, in, info ); + NifStream( ragdoll.twistA, in, info ); + NifStream( ragdoll.pivotB, in, info ); + NifStream( ragdoll.planeB, in, info ); + NifStream( ragdoll.twistB, in, info ); + NifStream( ragdoll.coneMinAngle, in, info ); + NifStream( ragdoll.planeMinAngle, in, info ); + NifStream( ragdoll.planeMaxAngle, in, info ); + NifStream( ragdoll.twistMinAngle, in, info ); + NifStream( ragdoll.twistMaxAngle, in, info ); + NifStream( ragdoll.maxFriction, in, info ); } void AbhkRagdollConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { AbhkConstraint::Write( out, link_map, info ); - NifStream( pivotA, out, info ); - NifStream( planeA, out, info ); - NifStream( twistA, out, info ); - NifStream( pivotB, out, info ); - NifStream( planeB, out, info ); - NifStream( twistB, out, info ); - NifStream( coneMinAngle, out, info ); - NifStream( planeMinAngle, out, info ); - NifStream( planeMaxAngle, out, info ); - NifStream( twistMinAngle, out, info ); - NifStream( twistMaxAngle, out, info ); - NifStream( maxFriction, out, info ); + NifStream( ragdoll.pivotA, out, info ); + NifStream( ragdoll.planeA, out, info ); + NifStream( ragdoll.twistA, out, info ); + NifStream( ragdoll.pivotB, out, info ); + NifStream( ragdoll.planeB, out, info ); + NifStream( ragdoll.twistB, out, info ); + NifStream( ragdoll.coneMinAngle, out, info ); + NifStream( ragdoll.planeMinAngle, out, info ); + NifStream( ragdoll.planeMaxAngle, out, info ); + NifStream( ragdoll.twistMinAngle, out, info ); + NifStream( ragdoll.twistMaxAngle, out, info ); + NifStream( ragdoll.maxFriction, out, info ); } std::string AbhkRagdollConstraint::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AbhkConstraint::asString(); - out << " Pivot A: " << pivotA << endl; - out << " Plane A: " << planeA << endl; - out << " Twist A: " << twistA << endl; - out << " Pivot B: " << pivotB << endl; - out << " Plane B: " << planeB << endl; - out << " Twist B: " << twistB << endl; - out << " Cone Min Angle: " << coneMinAngle << endl; - out << " Plane Min Angle: " << planeMinAngle << endl; - out << " Plane Max Angle: " << planeMaxAngle << endl; - out << " Twist Min Angle: " << twistMinAngle << endl; - out << " Twist Max Angle: " << twistMaxAngle << endl; - out << " Max Friction: " << maxFriction << endl; + out << " Pivot A: " << ragdoll.pivotA << endl; + out << " Plane A: " << ragdoll.planeA << endl; + out << " Twist A: " << ragdoll.twistA << endl; + out << " Pivot B: " << ragdoll.pivotB << endl; + out << " Plane B: " << ragdoll.planeB << endl; + out << " Twist B: " << ragdoll.twistB << endl; + out << " Cone Min Angle: " << ragdoll.coneMinAngle << endl; + out << " Plane Min Angle: " << ragdoll.planeMinAngle << endl; + out << " Plane Max Angle: " << ragdoll.planeMaxAngle << endl; + out << " Twist Min Angle: " << ragdoll.twistMinAngle << endl; + out << " Twist Max Angle: " << ragdoll.twistMaxAngle << endl; + out << " Max Friction: " << ragdoll.maxFriction << endl; return out.str(); } @@ -1104,15 +1114,14 @@ void NiDynamicEffect::InternalRead( istream& in, list<unsigned int> & link_stack if ( info.version >= 0x0A020000 ) { NifStream( switchState, in, info ); }; + NifStream( numAffectedNodes, in, info ); if ( info.version <= 0x04000002 ) { - NifStream( numAffectedNodes, in, info ); affectedNodeListPointers.resize(numAffectedNodes); for (unsigned int i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { NifStream( affectedNodeListPointers[i2], in, info ); }; }; if ( info.version >= 0x0A010000 ) { - NifStream( numAffectedNodes, in, info ); affectedNodes.resize(numAffectedNodes); for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) { NifStream( block_num, in, info ); @@ -1127,14 +1136,13 @@ void NiDynamicEffect::InternalWrite( ostream& out, const map<NiObjectRef,unsigne if ( info.version >= 0x0A020000 ) { NifStream( switchState, out, info ); }; + NifStream( numAffectedNodes, out, info ); if ( info.version <= 0x04000002 ) { - NifStream( numAffectedNodes, out, info ); for (unsigned int i2 = 0; i2 < affectedNodeListPointers.size(); i2++) { NifStream( affectedNodeListPointers[i2], out, info ); }; }; if ( info.version >= 0x0A010000 ) { - NifStream( numAffectedNodes, out, info ); for (unsigned int i2 = 0; i2 < affectedNodes.size(); i2++) { if ( affectedNodes[i2] != NULL ) NifStream( link_map.find( StaticCast<NiObject>(affectedNodes[i2]) )->second, out, info ); @@ -2423,40 +2431,31 @@ std::list<NiObjectRef> bhkConvexVerticesShape::InternalGetRefs() const { void bhkHingeConstraint::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { AbhkConstraint::Read( in, link_stack, info ); - for (unsigned int i1 = 0; i1 < 5; i1++) { - for (unsigned int i2 = 0; i2 < 4; i2++) { - NifStream( unknownFloats[i1][i2], in, info ); - }; - }; + NifStream( pivotA, in, info ); + NifStream( perp2axleina1, in, info ); + NifStream( perp2axleina2, in, info ); + NifStream( pivotB, in, info ); + NifStream( axleB, in, info ); } void bhkHingeConstraint::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { AbhkConstraint::Write( out, link_map, info ); - for (unsigned int i1 = 0; i1 < 5; i1++) { - for (unsigned int i2 = 0; i2 < 4; i2++) { - NifStream( unknownFloats[i1][i2], out, info ); - }; - }; + NifStream( pivotA, out, info ); + NifStream( perp2axleina1, out, info ); + NifStream( perp2axleina2, out, info ); + NifStream( pivotB, out, info ); + NifStream( axleB, out, info ); } std::string bhkHingeConstraint::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << AbhkConstraint::asString(); - array_output_count = 0; - for (unsigned int i1 = 0; i1 < 5; i1++) { - if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { - out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; - break; - }; - for (unsigned int i2 = 0; i2 < 4; i2++) { - if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { - break; - }; - out << " Unknown Floats[" << i2 << "]: " << unknownFloats[i1][i2] << endl; - array_output_count++; - }; - }; + out << " Pivot A: " << pivotA << endl; + out << " Perp2AxleInA1: " << perp2axleina1 << endl; + out << " Perp2AxleInA2: " << perp2axleina2 << endl; + out << " Pivot B: " << pivotB << endl; + out << " Axle B: " << axleB << endl; return out.str(); } @@ -2781,8 +2780,10 @@ void bhkMoppBvTreeShape::InternalRead( istream& in, list<unsigned int> & link_st }; NifStream( unknownFloat, in, info ); NifStream( moppDataSize, in, info ); - NifStream( objectCorner, in, info ); - NifStream( scalingFactor, in, info ); + if ( info.version >= 0x14000005 ) { + NifStream( objectCorner, in, info ); + NifStream( scalingFactor, in, info ); + }; moppData.resize(moppDataSize); for (unsigned int i1 = 0; i1 < moppData.size(); i1++) { NifStream( moppData[i1], in, info ); @@ -2802,8 +2803,10 @@ void bhkMoppBvTreeShape::InternalWrite( ostream& out, const map<NiObjectRef,unsi }; NifStream( unknownFloat, out, info ); NifStream( moppDataSize, out, info ); - NifStream( objectCorner, out, info ); - NifStream( scalingFactor, out, info ); + if ( info.version >= 0x14000005 ) { + NifStream( objectCorner, out, info ); + NifStream( scalingFactor, out, info ); + }; for (unsigned int i1 = 0; i1 < moppData.size(); i1++) { NifStream( moppData[i1], out, info ); }; @@ -3037,6 +3040,121 @@ std::list<NiObjectRef> bhkNiTriStripsShape::InternalGetRefs() const { return refs; } +void bhkMeshShape::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + unsigned int block_num; + bhkSphereRepShape::Read( in, link_stack, info ); + for (unsigned int i1 = 0; i1 < 8; i1++) { + NifStream( unknown[i1], in, info ); + }; + NifStream( unknownCount, in, info ); + unknownFloats.resize(unknownCount); + for (unsigned int i1 = 0; i1 < unknownFloats.size(); i1++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { + NifStream( unknownFloats[i1][i2], in, info ); + }; + }; + for (unsigned int i1 = 0; i1 < 3; i1++) { + NifStream( unknown[i1], in, info ); + }; + NifStream( numStripsData, in, info ); + stripsData.resize(numStripsData); + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + }; +} + +void bhkMeshShape::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + bhkSphereRepShape::Write( out, link_map, info ); + numStripsData = (unsigned int)(stripsData.size()); + unknownCount = (int)(unknownFloats.size()); + for (unsigned int i1 = 0; i1 < 8; i1++) { + NifStream( unknown[i1], out, info ); + }; + NifStream( unknownCount, out, info ); + for (unsigned int i1 = 0; i1 < unknownFloats.size(); i1++) { + for (unsigned int i2 = 0; i2 < 3; i2++) { + NifStream( unknownFloats[i1][i2], out, info ); + }; + }; + for (unsigned int i1 = 0; i1 < 3; i1++) { + NifStream( unknown[i1], out, info ); + }; + NifStream( numStripsData, out, info ); + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { + if ( stripsData[i1] != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(stripsData[i1]) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + }; +} + +std::string bhkMeshShape::InternalAsString( bool verbose ) const { + stringstream out; + unsigned int array_output_count = 0; + out << bhkSphereRepShape::asString(); + numStripsData = (unsigned int)(stripsData.size()); + unknownCount = (int)(unknownFloats.size()); + array_output_count = 0; + for (unsigned int i1 = 0; i1 < 8; i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " unknown[" << i1 << "]: " << unknown[i1] << endl; + array_output_count++; + }; + out << " unknown count: " << unknownCount << endl; + array_output_count = 0; + for (unsigned int i1 = 0; i1 < unknownFloats.size(); i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + for (unsigned int i2 = 0; i2 < 3; i2++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " unknown floats[" << i2 << "]: " << unknownFloats[i1][i2] << endl; + array_output_count++; + }; + }; + out << " Num Strips Data: " << numStripsData << endl; + array_output_count = 0; + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Strips Data[" << i1 << "]: " << stripsData[i1] << endl; + array_output_count++; + }; + return out.str(); +} + +void bhkMeshShape::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + bhkSphereRepShape::FixLinks( objects, link_stack, info ); + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { + stripsData[i1] = FixLink<NiTriStripsData>( objects, link_stack, info ); + }; +} + +std::list<NiObjectRef> bhkMeshShape::InternalGetRefs() const { + list<Ref<NiObject> > refs; + refs = bhkSphereRepShape::GetRefs(); + for (unsigned int i1 = 0; i1 < stripsData.size(); i1++) { + if ( stripsData[i1] != NULL ) + refs.push_back(StaticCast<NiObject>(stripsData[i1])); + }; + return refs; +} + void bhkPackedNiTriStripsShape::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { unsigned int block_num; AbhkShapeCollection::Read( in, link_stack, info ); @@ -3236,13 +3354,15 @@ void bhkRigidBody::InternalRead( istream& in, list<unsigned int> & link_stack, c for (unsigned int i1 = 0; i1 < 5; i1++) { NifStream( unknown5Floats[i1], in, info ); }; - for (unsigned int i1 = 0; i1 < 4; i1++) { - NifStream( unknown4Shorts[i1], in, info ); - }; - NifStream( layerCopy, in, info ); - NifStream( colFilterCopy, in, info ); - for (unsigned int i1 = 0; i1 < 7; i1++) { - NifStream( unknown7Shorts[i1], in, info ); + if ( info.version >= 0x14000004 ) { + for (unsigned int i2 = 0; i2 < 4; i2++) { + NifStream( unknown4Shorts[i2], in, info ); + }; + NifStream( layerCopy, in, info ); + NifStream( colFilterCopy, in, info ); + for (unsigned int i2 = 0; i2 < 7; i2++) { + NifStream( unknown7Shorts[i2], in, info ); + }; }; NifStream( translation, in, info ); NifStream( unknownFloat00, in, info ); @@ -3289,13 +3409,15 @@ void bhkRigidBody::InternalWrite( ostream& out, const map<NiObjectRef,unsigned i for (unsigned int i1 = 0; i1 < 5; i1++) { NifStream( unknown5Floats[i1], out, info ); }; - for (unsigned int i1 = 0; i1 < 4; i1++) { - NifStream( unknown4Shorts[i1], out, info ); - }; - NifStream( layerCopy, out, info ); - NifStream( colFilterCopy, out, info ); - for (unsigned int i1 = 0; i1 < 7; i1++) { - NifStream( unknown7Shorts[i1], out, info ); + if ( info.version >= 0x14000004 ) { + for (unsigned int i2 = 0; i2 < 4; i2++) { + NifStream( unknown4Shorts[i2], out, info ); + }; + NifStream( layerCopy, out, info ); + NifStream( colFilterCopy, out, info ); + for (unsigned int i2 = 0; i2 < 7; i2++) { + NifStream( unknown7Shorts[i2], out, info ); + }; }; NifStream( translation, out, info ); NifStream( unknownFloat00, out, info ); @@ -5175,7 +5297,7 @@ std::list<NiObjectRef> NiControllerManager::InternalGetRefs() const { return refs; } -void NiControllerSequence::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { +void NiSequence::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { unsigned int block_num; NiObject::Read( in, link_stack, info ); NifStream( name, in, info ); @@ -5247,38 +5369,9 @@ void NiControllerSequence::InternalRead( istream& in, list<unsigned int> & link_ NifStream( controlledBlocks[i1].variableOffset2, in, info ); }; }; - if ( info.version >= 0x0A01006A ) { - NifStream( weight, in, info ); - NifStream( block_num, in, info ); - link_stack.push_back( block_num ); - NifStream( cycleType, in, info ); - }; - if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { - NifStream( unknownInt0, in, info ); - }; - if ( info.version >= 0x0A01006A ) { - NifStream( frequency, in, info ); - NifStream( startTime, in, info ); - NifStream( stopTime, in, info ); - }; - if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x0A020000 ) ) { - NifStream( unknownFloat2, in, info ); - }; - if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { - NifStream( unknownByte, in, info ); - }; - if ( info.version >= 0x0A01006A ) { - NifStream( block_num, in, info ); - link_stack.push_back( block_num ); - NifStream( targetName, in, info ); - }; - if ( info.version >= 0x0A020000 ) { - NifStream( block_num, in, info ); - link_stack.push_back( block_num ); - }; } -void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { +void NiSequence::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { NiObject::Write( out, link_map, info ); numControlledBlocks = (unsigned int)(controlledBlocks.size()); NifStream( name, out, info ); @@ -5361,44 +5454,9 @@ void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,un NifStream( controlledBlocks[i1].variableOffset2, out, info ); }; }; - if ( info.version >= 0x0A01006A ) { - NifStream( weight, out, info ); - if ( textKeys != NULL ) - NifStream( link_map.find( StaticCast<NiObject>(textKeys) )->second, out, info ); - else - NifStream( 0xffffffff, out, info ); - NifStream( cycleType, out, info ); - }; - if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { - NifStream( unknownInt0, out, info ); - }; - if ( info.version >= 0x0A01006A ) { - NifStream( frequency, out, info ); - NifStream( startTime, out, info ); - NifStream( stopTime, out, info ); - }; - if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x0A020000 ) ) { - NifStream( unknownFloat2, out, info ); - }; - if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { - NifStream( unknownByte, out, info ); - }; - if ( info.version >= 0x0A01006A ) { - if ( manager != NULL ) - NifStream( link_map.find( StaticCast<NiObject>(manager) )->second, out, info ); - else - NifStream( 0xffffffff, out, info ); - NifStream( targetName, out, info ); - }; - if ( info.version >= 0x0A020000 ) { - if ( stringPalette != NULL ) - NifStream( link_map.find( StaticCast<NiObject>(stringPalette) )->second, out, info ); - else - NifStream( 0xffffffff, out, info ); - }; } -std::string NiControllerSequence::InternalAsString( bool verbose ) const { +std::string NiSequence::InternalAsString( bool verbose ) const { stringstream out; unsigned int array_output_count = 0; out << NiObject::asString(); @@ -5432,7 +5490,128 @@ std::string NiControllerSequence::InternalAsString( bool verbose ) const { out << " Variable 2: " << controlledBlocks[i1].variable2 << endl; out << " Variable Offset 2: " << controlledBlocks[i1].variableOffset2 << endl; }; + return out.str(); +} + +void NiSequence::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + NiObject::FixLinks( objects, link_stack, info ); + if ( info.version <= 0x0A010000 ) { + textKeys = FixLink<NiTextKeyExtraData>( objects, link_stack, info ); + }; + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { + if ( info.version <= 0x0A010000 ) { + controlledBlocks[i1].controller = FixLink<NiTimeController>( objects, link_stack, info ); + }; + if ( info.version >= 0x0A01006A ) { + controlledBlocks[i1].interpolator = FixLink<NiInterpolator>( objects, link_stack, info ); + controlledBlocks[i1].controller = FixLink<NiTimeController>( objects, link_stack, info ); + }; + if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { + controlledBlocks[i1].unknownLink2 = FixLink<NiObject>( objects, link_stack, info ); + }; + if ( info.version >= 0x0A020000 ) { + controlledBlocks[i1].stringPalette = FixLink<NiStringPalette>( objects, link_stack, info ); + }; + }; +} + +std::list<NiObjectRef> NiSequence::InternalGetRefs() const { + list<Ref<NiObject> > refs; + refs = NiObject::GetRefs(); + if ( textKeys != NULL ) + refs.push_back(StaticCast<NiObject>(textKeys)); + for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { + if ( controlledBlocks[i1].controller != NULL ) + refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].controller)); + if ( controlledBlocks[i1].interpolator != NULL ) + refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].interpolator)); + if ( controlledBlocks[i1].unknownLink2 != NULL ) + refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].unknownLink2)); + if ( controlledBlocks[i1].stringPalette != NULL ) + refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].stringPalette)); + }; + return refs; +} + +void NiControllerSequence::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + unsigned int block_num; + NiSequence::Read( in, link_stack, info ); + if ( info.version >= 0x0A01006A ) { + NifStream( weight, in, info ); + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + NifStream( cycleType, in, info ); + }; + if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { + NifStream( unknownInt0, in, info ); + }; + if ( info.version >= 0x0A01006A ) { + NifStream( frequency, in, info ); + NifStream( startTime, in, info ); + NifStream( stopTime, in, info ); + }; + if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x0A020000 ) ) { + NifStream( unknownFloat2, in, info ); + }; + if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { + NifStream( unknownByte, in, info ); + }; + if ( info.version >= 0x0A01006A ) { + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + NifStream( targetName, in, info ); + }; + if ( info.version >= 0x0A020000 ) { + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + }; +} + +void NiControllerSequence::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + NiSequence::Write( out, link_map, info ); + if ( info.version >= 0x0A01006A ) { + NifStream( weight, out, info ); + if ( textKeys != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(textKeys) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + NifStream( cycleType, out, info ); + }; + if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { + NifStream( unknownInt0, out, info ); + }; + if ( info.version >= 0x0A01006A ) { + NifStream( frequency, out, info ); + NifStream( startTime, out, info ); + NifStream( stopTime, out, info ); + }; + if ( ( info.version >= 0x0A020000 ) && ( info.version <= 0x0A020000 ) ) { + NifStream( unknownFloat2, out, info ); + }; + if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { + NifStream( unknownByte, out, info ); + }; + if ( info.version >= 0x0A01006A ) { + if ( manager != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(manager) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + NifStream( targetName, out, info ); + }; + if ( info.version >= 0x0A020000 ) { + if ( stringPalette != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(stringPalette) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + }; +} + +std::string NiControllerSequence::InternalAsString( bool verbose ) const { + stringstream out; + unsigned int array_output_count = 0; + out << NiSequence::asString(); out << " Weight: " << weight << endl; + out << " Text Keys: " << textKeys << endl; out << " Cycle Type: " << cycleType << endl; out << " Unknown Int 0: " << unknownInt0 << endl; out << " Frequency: " << frequency << endl; @@ -5447,25 +5626,7 @@ std::string NiControllerSequence::InternalAsString( bool verbose ) const { } void NiControllerSequence::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { - NiObject::FixLinks( objects, link_stack, info ); - if ( info.version <= 0x0A010000 ) { - textKeys = FixLink<NiTextKeyExtraData>( objects, link_stack, info ); - }; - for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { - if ( info.version <= 0x0A010000 ) { - controlledBlocks[i1].controller = FixLink<NiTimeController>( objects, link_stack, info ); - }; - if ( info.version >= 0x0A01006A ) { - controlledBlocks[i1].interpolator = FixLink<NiInterpolator>( objects, link_stack, info ); - controlledBlocks[i1].controller = FixLink<NiTimeController>( objects, link_stack, info ); - }; - if ( ( info.version >= 0x0A01006A ) && ( info.version <= 0x0A01006A ) ) { - controlledBlocks[i1].unknownLink2 = FixLink<NiObject>( objects, link_stack, info ); - }; - if ( info.version >= 0x0A020000 ) { - controlledBlocks[i1].stringPalette = FixLink<NiStringPalette>( objects, link_stack, info ); - }; - }; + NiSequence::FixLinks( objects, link_stack, info ); if ( info.version >= 0x0A01006A ) { textKeys = FixLink<NiTextKeyExtraData>( objects, link_stack, info ); manager = FixLink<NiControllerManager>( objects, link_stack, info ); @@ -5477,19 +5638,9 @@ void NiControllerSequence::InternalFixLinks( const map<unsigned int,NiObjectRef> std::list<NiObjectRef> NiControllerSequence::InternalGetRefs() const { list<Ref<NiObject> > refs; - refs = NiObject::GetRefs(); + refs = NiSequence::GetRefs(); if ( textKeys != NULL ) refs.push_back(StaticCast<NiObject>(textKeys)); - for (unsigned int i1 = 0; i1 < controlledBlocks.size(); i1++) { - if ( controlledBlocks[i1].controller != NULL ) - refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].controller)); - if ( controlledBlocks[i1].interpolator != NULL ) - refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].interpolator)); - if ( controlledBlocks[i1].unknownLink2 != NULL ) - refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].unknownLink2)); - if ( controlledBlocks[i1].stringPalette != NULL ) - refs.push_back(StaticCast<NiObject>(controlledBlocks[i1].stringPalette)); - }; if ( stringPalette != NULL ) refs.push_back(StaticCast<NiObject>(stringPalette)); return refs; @@ -6060,7 +6211,9 @@ std::list<NiObjectRef> NiGeomMorpherController::InternalGetRefs() const { void NiGravity::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { AParticleModifier::Read( in, link_stack, info ); - NifStream( unknownFloat1, in, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownFloat1, in, info ); + }; NifStream( force, in, info ); NifStream( type, in, info ); NifStream( position, in, info ); @@ -6069,7 +6222,9 @@ void NiGravity::InternalRead( istream& in, list<unsigned int> & link_stack, cons void NiGravity::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { AParticleModifier::Write( out, link_map, info ); - NifStream( unknownFloat1, out, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownFloat1, out, info ); + }; NifStream( force, out, info ); NifStream( type, out, info ); NifStream( position, out, info ); @@ -7470,13 +7625,20 @@ void NiLODNode::InternalRead( istream& in, list<unsigned int> & link_stack, cons for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Bytes[i1], in, info ); }; - if ( info.version <= 0x0A000100 ) { + if ( ( info.version >= 0x04000002 ) && ( info.version <= 0x0A000100 ) ) { NifStream( lodCenter, in, info ); + }; + if ( info.version <= 0x0A000100 ) { NifStream( numLodLevels, in, info ); lodLevels.resize(numLodLevels); for (unsigned int i2 = 0; i2 < lodLevels.size(); i2++) { NifStream( lodLevels[i2].nearExtent, in, info ); NifStream( lodLevels[i2].farExtent, in, info ); + if ( info.version <= 0x03010000 ) { + for (unsigned int i4 = 0; i4 < 3; i4++) { + NifStream( lodLevels[i2].unknownInts[i4], in, info ); + }; + }; }; }; if ( info.version >= 0x0A010000 ) { @@ -7492,12 +7654,19 @@ void NiLODNode::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> for (unsigned int i1 = 0; i1 < 4; i1++) { NifStream( unknown4Bytes[i1], out, info ); }; - if ( info.version <= 0x0A000100 ) { + if ( ( info.version >= 0x04000002 ) && ( info.version <= 0x0A000100 ) ) { NifStream( lodCenter, out, info ); + }; + if ( info.version <= 0x0A000100 ) { NifStream( numLodLevels, out, info ); for (unsigned int i2 = 0; i2 < lodLevels.size(); i2++) { NifStream( lodLevels[i2].nearExtent, out, info ); NifStream( lodLevels[i2].farExtent, out, info ); + if ( info.version <= 0x03010000 ) { + for (unsigned int i4 = 0; i4 < 3; i4++) { + NifStream( lodLevels[i2].unknownInts[i4], out, info ); + }; + }; }; }; if ( info.version >= 0x0A010000 ) { @@ -7536,6 +7705,18 @@ std::string NiLODNode::InternalAsString( bool verbose ) const { }; out << " Near Extent: " << lodLevels[i1].nearExtent << endl; out << " Far Extent: " << lodLevels[i1].farExtent << endl; + array_output_count = 0; + for (unsigned int i2 = 0; i2 < 3; i2++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Unknown Ints[" << i2 << "]: " << lodLevels[i1].unknownInts[i2] << endl; + array_output_count++; + }; }; out << " Unknown Short: " << unknownShort << endl; out << " LOD Level Data: " << lodLevelData << endl; @@ -8154,38 +8335,62 @@ void NiParticleSystemController::InternalRead( istream& in, list<unsigned int> & NifStream( size, in, info ); NifStream( emitStartTime, in, info ); NifStream( emitStopTime, in, info ); - NifStream( unknownByte, in, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownByte, in, info ); + }; NifStream( emitRate, in, info ); NifStream( lifetime, in, info ); NifStream( lifetimeRandom, in, info ); - NifStream( emitFlags, in, info ); + if ( info.version >= 0x04000002 ) { + NifStream( emitFlags, in, info ); + }; NifStream( startRandom, in, info ); NifStream( block_num, in, info ); link_stack.push_back( block_num ); - NifStream( unknownShort2_, in, info ); - NifStream( unknownFloat13_, in, info ); - NifStream( unknownInt1_, in, info ); - NifStream( unknownInt2_, in, info ); - NifStream( unknownShort3_, in, info ); - NifStream( numParticles, in, info ); - NifStream( numValid, in, info ); - particles.resize(numParticles); - for (unsigned int i1 = 0; i1 < particles.size(); i1++) { - NifStream( particles[i1].velocity, in, info ); - NifStream( particles[i1].unknownVector, in, info ); - NifStream( particles[i1].lifetime, in, info ); - NifStream( particles[i1].lifespan, in, info ); - NifStream( particles[i1].timestamp, in, info ); - NifStream( particles[i1].unknownShort, in, info ); - NifStream( particles[i1].vertexId, in, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownShort2_, in, info ); + NifStream( unknownFloat13_, in, info ); + NifStream( unknownInt1_, in, info ); + NifStream( unknownInt2_, in, info ); + NifStream( unknownShort3_, in, info ); + }; + if ( info.version <= 0x03010000 ) { + NifStream( particle.velocity, in, info ); + NifStream( particle.unknownVector, in, info ); + NifStream( particle.lifetime, in, info ); + NifStream( particle.lifespan, in, info ); + NifStream( particle.timestamp, in, info ); + NifStream( particle.unknownShort, in, info ); + NifStream( particle.vertexId, in, info ); + }; + if ( info.version >= 0x04000002 ) { + NifStream( numParticles, in, info ); + NifStream( numValid, in, info ); + particles.resize(numParticles); + for (unsigned int i2 = 0; i2 < particles.size(); i2++) { + NifStream( particles[i2].velocity, in, info ); + NifStream( particles[i2].unknownVector, in, info ); + NifStream( particles[i2].lifetime, in, info ); + NifStream( particles[i2].lifespan, in, info ); + NifStream( particles[i2].timestamp, in, info ); + NifStream( particles[i2].unknownShort, in, info ); + NifStream( particles[i2].vertexId, in, info ); + }; + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); }; NifStream( block_num, in, info ); link_stack.push_back( block_num ); NifStream( block_num, in, info ); link_stack.push_back( block_num ); - NifStream( block_num, in, info ); - link_stack.push_back( block_num ); - NifStream( trailer, in, info ); + if ( info.version >= 0x04000002 ) { + NifStream( trailer, in, info ); + }; + if ( info.version <= 0x03010000 ) { + for (unsigned int i2 = 0; i2 < 3; i2++) { + NifStream( unkownFloats[i2], in, info ); + }; + }; } void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { @@ -8207,36 +8412,53 @@ void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObject NifStream( size, out, info ); NifStream( emitStartTime, out, info ); NifStream( emitStopTime, out, info ); - NifStream( unknownByte, out, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownByte, out, info ); + }; NifStream( emitRate, out, info ); NifStream( lifetime, out, info ); NifStream( lifetimeRandom, out, info ); - NifStream( emitFlags, out, info ); + if ( info.version >= 0x04000002 ) { + NifStream( emitFlags, out, info ); + }; NifStream( startRandom, out, info ); if ( emitter != NULL ) NifStream( link_map.find( StaticCast<NiObject>(emitter) )->second, out, info ); else NifStream( 0xffffffff, out, info ); - NifStream( unknownShort2_, out, info ); - NifStream( unknownFloat13_, out, info ); - NifStream( unknownInt1_, out, info ); - NifStream( unknownInt2_, out, info ); - NifStream( unknownShort3_, out, info ); - NifStream( numParticles, out, info ); - NifStream( numValid, out, info ); - for (unsigned int i1 = 0; i1 < particles.size(); i1++) { - NifStream( particles[i1].velocity, out, info ); - NifStream( particles[i1].unknownVector, out, info ); - NifStream( particles[i1].lifetime, out, info ); - NifStream( particles[i1].lifespan, out, info ); - NifStream( particles[i1].timestamp, out, info ); - NifStream( particles[i1].unknownShort, out, info ); - NifStream( particles[i1].vertexId, out, info ); + if ( info.version >= 0x04000002 ) { + NifStream( unknownShort2_, out, info ); + NifStream( unknownFloat13_, out, info ); + NifStream( unknownInt1_, out, info ); + NifStream( unknownInt2_, out, info ); + NifStream( unknownShort3_, out, info ); + }; + if ( info.version <= 0x03010000 ) { + NifStream( particle.velocity, out, info ); + NifStream( particle.unknownVector, out, info ); + NifStream( particle.lifetime, out, info ); + NifStream( particle.lifespan, out, info ); + NifStream( particle.timestamp, out, info ); + NifStream( particle.unknownShort, out, info ); + NifStream( particle.vertexId, out, info ); + }; + if ( info.version >= 0x04000002 ) { + NifStream( numParticles, out, info ); + NifStream( numValid, out, info ); + for (unsigned int i2 = 0; i2 < particles.size(); i2++) { + NifStream( particles[i2].velocity, out, info ); + NifStream( particles[i2].unknownVector, out, info ); + NifStream( particles[i2].lifetime, out, info ); + NifStream( particles[i2].lifespan, out, info ); + NifStream( particles[i2].timestamp, out, info ); + NifStream( particles[i2].unknownShort, out, info ); + NifStream( particles[i2].vertexId, out, info ); + }; + if ( unknownLink != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); }; - if ( unknownLink != NULL ) - NifStream( link_map.find( StaticCast<NiObject>(unknownLink) )->second, out, info ); - else - NifStream( 0xffffffff, out, info ); if ( particleExtra != NULL ) NifStream( link_map.find( StaticCast<NiObject>(particleExtra) )->second, out, info ); else @@ -8245,7 +8467,14 @@ void NiParticleSystemController::InternalWrite( ostream& out, const map<NiObject NifStream( link_map.find( StaticCast<NiObject>(unknownLink2) )->second, out, info ); else NifStream( 0xffffffff, out, info ); - NifStream( trailer, out, info ); + if ( info.version >= 0x04000002 ) { + NifStream( trailer, out, info ); + }; + if ( info.version <= 0x03010000 ) { + for (unsigned int i2 = 0; i2 < 3; i2++) { + NifStream( unkownFloats[i2], out, info ); + }; + }; } std::string NiParticleSystemController::InternalAsString( bool verbose ) const { @@ -8281,6 +8510,13 @@ std::string NiParticleSystemController::InternalAsString( bool verbose ) const { out << " Unknown Int 1?: " << unknownInt1_ << endl; out << " Unknown Int 2?: " << unknownInt2_ << endl; out << " Unknown Short 3?: " << unknownShort3_ << endl; + out << " Velocity: " << particle.velocity << endl; + out << " Unknown Vector: " << particle.unknownVector << endl; + out << " Lifetime: " << particle.lifetime << endl; + out << " Lifespan: " << particle.lifespan << endl; + out << " Timestamp: " << particle.timestamp << endl; + out << " Unknown Short: " << particle.unknownShort << endl; + out << " Vertex ID: " << particle.vertexId << endl; out << " Num Particles: " << numParticles << endl; out << " Num Valid: " << numValid << endl; array_output_count = 0; @@ -8301,13 +8537,27 @@ std::string NiParticleSystemController::InternalAsString( bool verbose ) const { out << " Particle Extra: " << particleExtra << endl; out << " Unknown Link 2: " << unknownLink2 << endl; out << " Trailer: " << trailer << endl; + array_output_count = 0; + for (unsigned int i1 = 0; i1 < 3; i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Unkown Floats[" << i1 << "]: " << unkownFloats[i1] << endl; + array_output_count++; + }; return out.str(); } void NiParticleSystemController::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { NiTimeController::FixLinks( objects, link_stack, info ); emitter = FixLink<NiObject>( objects, link_stack, info ); - unknownLink = FixLink<NiObject>( objects, link_stack, info ); + if ( info.version >= 0x04000002 ) { + unknownLink = FixLink<NiObject>( objects, link_stack, info ); + }; particleExtra = FixLink<AParticleModifier>( objects, link_stack, info ); unknownLink2 = FixLink<NiObject>( objects, link_stack, info ); } @@ -10266,6 +10516,11 @@ void NiRangeLODData::InternalRead( istream& in, list<unsigned int> & link_stack, for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { NifStream( lodLevels[i1].nearExtent, in, info ); NifStream( lodLevels[i1].farExtent, in, info ); + if ( info.version <= 0x03010000 ) { + for (unsigned int i3 = 0; i3 < 3; i3++) { + NifStream( lodLevels[i1].unknownInts[i3], in, info ); + }; + }; }; } @@ -10277,6 +10532,11 @@ void NiRangeLODData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned for (unsigned int i1 = 0; i1 < lodLevels.size(); i1++) { NifStream( lodLevels[i1].nearExtent, out, info ); NifStream( lodLevels[i1].farExtent, out, info ); + if ( info.version <= 0x03010000 ) { + for (unsigned int i3 = 0; i3 < 3; i3++) { + NifStream( lodLevels[i1].unknownInts[i3], out, info ); + }; + }; }; } @@ -10295,6 +10555,18 @@ std::string NiRangeLODData::InternalAsString( bool verbose ) const { }; out << " Near Extent: " << lodLevels[i1].nearExtent << endl; out << " Far Extent: " << lodLevels[i1].farExtent << endl; + array_output_count = 0; + for (unsigned int i2 = 0; i2 < 3; i2++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Unknown Ints[" << i2 << "]: " << lodLevels[i1].unknownInts[i2] << endl; + array_output_count++; + }; }; return out.str(); } @@ -11748,6 +12020,102 @@ std::list<NiObjectRef> NiTextureProperty::InternalGetRefs() const { return refs; } +void NiMultiTextureProperty::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + unsigned int block_num; + NiProperty::Read( in, link_stack, info ); + NifStream( flags, in, info ); + NifStream( unknownInt1, in, info ); + NifStream( unknownInt2, in, info ); + NifStream( block_num, in, info ); + link_stack.push_back( block_num ); + NifStream( unknownInt3, in, info ); + NifStream( unknownInt4, in, info ); + NifStream( unknownInt5, in, info ); + for (unsigned int i1 = 0; i1 < 11; i1++) { + NifStream( unknownShorts[i1], in, info ); + }; + if ( (unknownInt5 == 0) ) { + for (unsigned int i2 = 0; i2 < 11; i2++) { + NifStream( unknownExtraShorts[i2], in, info ); + }; + }; +} + +void NiMultiTextureProperty::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + NiProperty::Write( out, link_map, info ); + NifStream( flags, out, info ); + NifStream( unknownInt1, out, info ); + NifStream( unknownInt2, out, info ); + if ( image != NULL ) + NifStream( link_map.find( StaticCast<NiObject>(image) )->second, out, info ); + else + NifStream( 0xffffffff, out, info ); + NifStream( unknownInt3, out, info ); + NifStream( unknownInt4, out, info ); + NifStream( unknownInt5, out, info ); + for (unsigned int i1 = 0; i1 < 11; i1++) { + NifStream( unknownShorts[i1], out, info ); + }; + if ( (unknownInt5 == 0) ) { + for (unsigned int i2 = 0; i2 < 11; i2++) { + NifStream( unknownExtraShorts[i2], out, info ); + }; + }; +} + +std::string NiMultiTextureProperty::InternalAsString( bool verbose ) const { + stringstream out; + unsigned int array_output_count = 0; + out << NiProperty::asString(); + out << " Flags: " << flags << endl; + out << " Unknown Int 1: " << unknownInt1 << endl; + out << " Unknown Int 2: " << unknownInt2 << endl; + out << " Image: " << image << endl; + out << " Unknown Int 3: " << unknownInt3 << endl; + out << " Unknown Int 4: " << unknownInt4 << endl; + out << " Unknown Int 5: " << unknownInt5 << endl; + array_output_count = 0; + for (unsigned int i1 = 0; i1 < 11; i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Unknown Shorts[" << i1 << "]: " << unknownShorts[i1] << endl; + array_output_count++; + }; + if ( (unknownInt5 == 0) ) { + array_output_count = 0; + for (unsigned int i2 = 0; i2 < 11; i2++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + break; + }; + out << " Unknown Extra Shorts[" << i2 << "]: " << unknownExtraShorts[i2] << endl; + array_output_count++; + }; + }; + return out.str(); +} + +void NiMultiTextureProperty::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + NiProperty::FixLinks( objects, link_stack, info ); + image = FixLink<NiImage>( objects, link_stack, info ); +} + +std::list<NiObjectRef> NiMultiTextureProperty::InternalGetRefs() const { + list<Ref<NiObject> > refs; + refs = NiProperty::GetRefs(); + if ( image != NULL ) + refs.push_back(StaticCast<NiObject>(image)); + return refs; +} + void NiTexturingProperty::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { unsigned int block_num; NiProperty::Read( in, link_stack, info ); @@ -13607,3 +13975,69 @@ std::list<NiObjectRef> RootCollisionNode::InternalGetRefs() const { return refs; } +void NiRawImageData::InternalRead( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + NiObject::Read( in, link_stack, info ); + NifStream( width, in, info ); + NifStream( height, in, info ); + NifStream( unknownInt, in, info ); + imageData.resize(width); + for (unsigned int i1 = 0; i1 < imageData.size(); i1++) { + imageData[i1].resize(height); + for (unsigned int i2 = 0; i2 < imageData[i1].size(); i2++) { + NifStream( imageData[i1][i2].r, in, info ); + NifStream( imageData[i1][i2].g, in, info ); + NifStream( imageData[i1][i2].b, in, info ); + }; + }; +} + +void NiRawImageData::InternalWrite( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + NiObject::Write( out, link_map, info ); + height = (unsigned int)((imageData.size() > 0) ? imageData[0].size() : 0); + width = (unsigned int)(imageData.size()); + NifStream( width, out, info ); + NifStream( height, out, info ); + NifStream( unknownInt, out, info ); + for (unsigned int i1 = 0; i1 < imageData.size(); i1++) { + for (unsigned int i2 = 0; i2 < imageData[i1].size(); i2++) { + NifStream( imageData[i1][i2].r, out, info ); + NifStream( imageData[i1][i2].g, out, info ); + NifStream( imageData[i1][i2].b, out, info ); + }; + }; +} + +std::string NiRawImageData::InternalAsString( bool verbose ) const { + stringstream out; + unsigned int array_output_count = 0; + out << NiObject::asString(); + height = (unsigned int)((imageData.size() > 0) ? imageData[0].size() : 0); + width = (unsigned int)(imageData.size()); + out << " Width: " << width << endl; + out << " Height: " << height << endl; + out << " Unknown Int: " << unknownInt << endl; + array_output_count = 0; + for (unsigned int i1 = 0; i1 < imageData.size(); i1++) { + if ( !verbose && ( array_output_count > MAXARRAYDUMP ) ) { + out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl; + break; + }; + for (unsigned int i2 = 0; i2 < imageData[i1].size(); i2++) { + out << " r: " << imageData[i1][i2].r << endl; + out << " g: " << imageData[i1][i2].g << endl; + out << " b: " << imageData[i1][i2].b << endl; + }; + }; + return out.str(); +} + +void NiRawImageData::InternalFixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + NiObject::FixLinks( objects, link_stack, info ); +} + +std::list<NiObjectRef> NiRawImageData::InternalGetRefs() const { + list<Ref<NiObject> > refs; + refs = NiObject::GetRefs(); + return refs; +} + diff --git a/src/nif_math.cpp b/src/nif_math.cpp index f004899a..7e015ddd 100644 --- a/src/nif_math.cpp +++ b/src/nif_math.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../include/nif_math.h" #include <iomanip> diff --git a/src/niflib.cpp b/src/niflib.cpp index c87f1071..0a96342d 100644 --- a/src/niflib.cpp +++ b/src/niflib.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ //#define DEBUG // this will produce lots of output //#define PRINT_OBJECT_NAMES diff --git a/src/obj/ABoneLODController.cpp b/src/obj/ABoneLODController.cpp index 37f8df7e..6f71fe89 100644 --- a/src/obj/ABoneLODController.cpp +++ b/src/obj/ABoneLODController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/ABoneLODController.h" #include "../../include/gen/NodeGroup.h" diff --git a/src/obj/AKeyedData.cpp b/src/obj/AKeyedData.cpp index 8d5f0ffb..67ce400b 100644 --- a/src/obj/AKeyedData.cpp +++ b/src/obj/AKeyedData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AKeyedData.h" using namespace Niflib; diff --git a/src/obj/APSysCtlr.cpp b/src/obj/APSysCtlr.cpp index 7cf97a15..06e422ad 100644 --- a/src/obj/APSysCtlr.cpp +++ b/src/obj/APSysCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/APSysCtlr.h" using namespace Niflib; diff --git a/src/obj/APSysData.cpp b/src/obj/APSysData.cpp index 099eae45..16901793 100644 --- a/src/obj/APSysData.cpp +++ b/src/obj/APSysData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/APSysData.h" using namespace Niflib; diff --git a/src/obj/AParticleModifier.cpp b/src/obj/AParticleModifier.cpp index c7d0a397..b57fe6d0 100644 --- a/src/obj/AParticleModifier.cpp +++ b/src/obj/AParticleModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AParticleModifier.h" #include "../../include/obj/NiParticleSystemController.h" diff --git a/src/obj/AbhkConstraint.cpp b/src/obj/AbhkConstraint.cpp index 8467375e..ab8e0aa8 100644 --- a/src/obj/AbhkConstraint.cpp +++ b/src/obj/AbhkConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AbhkConstraint.h" #include "../../include/obj/bhkShape.h" diff --git a/src/obj/AbhkRagdollConstraint.cpp b/src/obj/AbhkRagdollConstraint.cpp index 28cbb7fe..1a648c33 100644 --- a/src/obj/AbhkRagdollConstraint.cpp +++ b/src/obj/AbhkRagdollConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AbhkRagdollConstraint.h" using namespace Niflib; diff --git a/src/obj/AbhkShapeCollection.cpp b/src/obj/AbhkShapeCollection.cpp index 8e5e7bb5..ee55a29d 100644 --- a/src/obj/AbhkShapeCollection.cpp +++ b/src/obj/AbhkShapeCollection.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AbhkShapeCollection.h" using namespace Niflib; diff --git a/src/obj/AvoidNode.cpp b/src/obj/AvoidNode.cpp index 5382dcb0..99691024 100644 --- a/src/obj/AvoidNode.cpp +++ b/src/obj/AvoidNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/AvoidNode.h" using namespace Niflib; @@ -33,9 +33,9 @@ list<NiObjectRef> AvoidNode::GetRefs() const { const Type & AvoidNode::GetType() const { return TYPE; -}; +} -namespace Niflib { +namespace Niflib { typedef NiObject*(*obj_factory_func)(); extern map<string, obj_factory_func> global_object_map; @@ -58,3 +58,4 @@ namespace Niflib { NiObject * AvoidNode::Create() { return new AvoidNode; } + diff --git a/src/obj/BSBound.cpp b/src/obj/BSBound.cpp index 1dc05961..87dc60aa 100644 --- a/src/obj/BSBound.cpp +++ b/src/obj/BSBound.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSBound.h" using namespace Niflib; diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp index 53557077..2cecfc88 100644 --- a/src/obj/BSFurnitureMarker.cpp +++ b/src/obj/BSFurnitureMarker.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSFurnitureMarker.h" #include "../../include/gen/FurniturePosition.h" diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp index 30095be7..cae5292f 100644 --- a/src/obj/BSKeyframeController.cpp +++ b/src/obj/BSKeyframeController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSKeyframeController.h" #include "../../include/obj/NiKeyframeData.h" diff --git a/src/obj/BSPSysArrayEmitter.cpp b/src/obj/BSPSysArrayEmitter.cpp index 51027d19..92b7a3b9 100644 --- a/src/obj/BSPSysArrayEmitter.cpp +++ b/src/obj/BSPSysArrayEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSPSysArrayEmitter.h" using namespace Niflib; diff --git a/src/obj/BSParentVelocityModifier.cpp b/src/obj/BSParentVelocityModifier.cpp index 8eb47e2f..a4ef40da 100644 --- a/src/obj/BSParentVelocityModifier.cpp +++ b/src/obj/BSParentVelocityModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSParentVelocityModifier.h" using namespace Niflib; diff --git a/src/obj/BSXFlags.cpp b/src/obj/BSXFlags.cpp index 97b139d9..772adfbc 100644 --- a/src/obj/BSXFlags.cpp +++ b/src/obj/BSXFlags.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/BSXFlags.h" using namespace Niflib; diff --git a/src/obj/FxButton.cpp b/src/obj/FxButton.cpp index de0c631b..1972013c 100644 --- a/src/obj/FxButton.cpp +++ b/src/obj/FxButton.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/FxButton.h" using namespace Niflib; diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp index 70265bd4..94bdca07 100644 --- a/src/obj/FxRadioButton.cpp +++ b/src/obj/FxRadioButton.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/FxRadioButton.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/FxWidget.cpp b/src/obj/FxWidget.cpp index e0e4742d..ad17ee77 100644 --- a/src/obj/FxWidget.cpp +++ b/src/obj/FxWidget.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/FxWidget.h" using namespace Niflib; diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp index ba0e6576..44efd770 100644 --- a/src/obj/NiAVObject.cpp +++ b/src/obj/NiAVObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAVObject.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp index 32dc1e4f..15bd537d 100644 --- a/src/obj/NiAlphaController.cpp +++ b/src/obj/NiAlphaController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAlphaController.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiAlphaProperty.cpp b/src/obj/NiAlphaProperty.cpp index 64a91fd4..f5957c31 100644 --- a/src/obj/NiAlphaProperty.cpp +++ b/src/obj/NiAlphaProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAlphaProperty.h" using namespace Niflib; diff --git a/src/obj/NiAmbientLight.cpp b/src/obj/NiAmbientLight.cpp index ff5a83b3..0042775f 100644 --- a/src/obj/NiAmbientLight.cpp +++ b/src/obj/NiAmbientLight.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAmbientLight.h" using namespace Niflib; diff --git a/src/obj/NiAutoNormalParticles.cpp b/src/obj/NiAutoNormalParticles.cpp index a84249ae..c4c64005 100644 --- a/src/obj/NiAutoNormalParticles.cpp +++ b/src/obj/NiAutoNormalParticles.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAutoNormalParticles.h" using namespace Niflib; diff --git a/src/obj/NiAutoNormalParticlesData.cpp b/src/obj/NiAutoNormalParticlesData.cpp index 6eaed993..c1c669e7 100644 --- a/src/obj/NiAutoNormalParticlesData.cpp +++ b/src/obj/NiAutoNormalParticlesData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiAutoNormalParticlesData.h" using namespace Niflib; diff --git a/src/obj/NiBSAnimationNode.cpp b/src/obj/NiBSAnimationNode.cpp index b0d779f1..3e514c9d 100644 --- a/src/obj/NiBSAnimationNode.cpp +++ b/src/obj/NiBSAnimationNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSAnimationNode.h" using namespace Niflib; diff --git a/src/obj/NiBSBoneLODController.cpp b/src/obj/NiBSBoneLODController.cpp index ada2b800..7dda788e 100644 --- a/src/obj/NiBSBoneLODController.cpp +++ b/src/obj/NiBSBoneLODController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSBoneLODController.h" using namespace Niflib; diff --git a/src/obj/NiBSPArrayController.cpp b/src/obj/NiBSPArrayController.cpp index a68bd3c8..3023f32a 100644 --- a/src/obj/NiBSPArrayController.cpp +++ b/src/obj/NiBSPArrayController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSPArrayController.h" using namespace Niflib; diff --git a/src/obj/NiBSParticleNode.cpp b/src/obj/NiBSParticleNode.cpp index 48041f2a..60c4a956 100644 --- a/src/obj/NiBSParticleNode.cpp +++ b/src/obj/NiBSParticleNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSParticleNode.h" using namespace Niflib; diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp index 56bf4229..d77eac05 100644 --- a/src/obj/NiBSplineBasisData.cpp +++ b/src/obj/NiBSplineBasisData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineBasisData.h" using namespace Niflib; diff --git a/src/obj/NiBSplineCompFloatInterpolator.cpp b/src/obj/NiBSplineCompFloatInterpolator.cpp index b40a50ae..1188f653 100644 --- a/src/obj/NiBSplineCompFloatInterpolator.cpp +++ b/src/obj/NiBSplineCompFloatInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineCompFloatInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiBSplineCompPoint3Interpolator.cpp b/src/obj/NiBSplineCompPoint3Interpolator.cpp index 2bffb7f0..4175eb50 100644 --- a/src/obj/NiBSplineCompPoint3Interpolator.cpp +++ b/src/obj/NiBSplineCompPoint3Interpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineCompPoint3Interpolator.h" using namespace Niflib; diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp index 3f78b83b..8b66b2df 100644 --- a/src/obj/NiBSplineCompTransformInterpolator.cpp +++ b/src/obj/NiBSplineCompTransformInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineCompTransformInterpolator.h" #include "../../include/obj/NiBSplineBasisData.h" diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp index 1a032df9..5e0337c2 100644 --- a/src/obj/NiBSplineData.cpp +++ b/src/obj/NiBSplineData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineData.h" using namespace Niflib; diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp index 90076816..0344441a 100644 --- a/src/obj/NiBSplineInterpolator.cpp +++ b/src/obj/NiBSplineInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBSplineInterpolator.h" #include "../../include/obj/NiBSplineData.h" diff --git a/src/obj/NiBillboardNode.cpp b/src/obj/NiBillboardNode.cpp index f8815582..34deb4fe 100644 --- a/src/obj/NiBillboardNode.cpp +++ b/src/obj/NiBillboardNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBillboardNode.h" using namespace Niflib; diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp index 63ddd57a..ada66f20 100644 --- a/src/obj/NiBinaryExtraData.cpp +++ b/src/obj/NiBinaryExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBinaryExtraData.h" #include "../../include/gen/ByteArray.h" diff --git a/src/obj/NiBlendBoolInterpolator.cpp b/src/obj/NiBlendBoolInterpolator.cpp index acf716ae..92f219d5 100644 --- a/src/obj/NiBlendBoolInterpolator.cpp +++ b/src/obj/NiBlendBoolInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBlendBoolInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiBlendFloatInterpolator.cpp b/src/obj/NiBlendFloatInterpolator.cpp index d9bbf7e0..696a0c99 100644 --- a/src/obj/NiBlendFloatInterpolator.cpp +++ b/src/obj/NiBlendFloatInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBlendFloatInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiBlendInterpolator.cpp b/src/obj/NiBlendInterpolator.cpp index 8ffa68a2..9aa9275a 100644 --- a/src/obj/NiBlendInterpolator.cpp +++ b/src/obj/NiBlendInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBlendInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiBlendPoint3Interpolator.cpp b/src/obj/NiBlendPoint3Interpolator.cpp index 9300f832..753de05f 100644 --- a/src/obj/NiBlendPoint3Interpolator.cpp +++ b/src/obj/NiBlendPoint3Interpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBlendPoint3Interpolator.h" using namespace Niflib; diff --git a/src/obj/NiBlendTransformInterpolator.cpp b/src/obj/NiBlendTransformInterpolator.cpp index 331c7624..3ffe7570 100644 --- a/src/obj/NiBlendTransformInterpolator.cpp +++ b/src/obj/NiBlendTransformInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBlendTransformInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp index 2eaf8bdb..8e97d2e6 100644 --- a/src/obj/NiBoneLODController.cpp +++ b/src/obj/NiBoneLODController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBoneLODController.h" #include "../../include/gen/SkinShapeGroup.h" diff --git a/src/obj/NiBoolData.cpp b/src/obj/NiBoolData.cpp index 2dc8c49c..ac9b7cb0 100644 --- a/src/obj/NiBoolData.cpp +++ b/src/obj/NiBoolData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBoolData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp index 93eac38e..eb3aa75d 100644 --- a/src/obj/NiBoolInterpolator.cpp +++ b/src/obj/NiBoolInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBoolInterpolator.h" #include "../../include/obj/NiBoolData.h" diff --git a/src/obj/NiBoolTimelineInterpolator.cpp b/src/obj/NiBoolTimelineInterpolator.cpp index d0934509..f50e2417 100644 --- a/src/obj/NiBoolTimelineInterpolator.cpp +++ b/src/obj/NiBoolTimelineInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBoolTimelineInterpolator.h" #include "../../include/obj/NiBoolData.h" diff --git a/src/obj/NiBooleanExtraData.cpp b/src/obj/NiBooleanExtraData.cpp index eea4e528..ed2794a1 100644 --- a/src/obj/NiBooleanExtraData.cpp +++ b/src/obj/NiBooleanExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiBooleanExtraData.h" using namespace Niflib; diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp index 0167eb6c..203104f1 100644 --- a/src/obj/NiCamera.cpp +++ b/src/obj/NiCamera.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiCamera.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiClod.cpp b/src/obj/NiClod.cpp index 87a956d8..a9141425 100644 --- a/src/obj/NiClod.cpp +++ b/src/obj/NiClod.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiClod.h" using namespace Niflib; diff --git a/src/obj/NiClodData.cpp b/src/obj/NiClodData.cpp index 5672c36f..4233e229 100644 --- a/src/obj/NiClodData.cpp +++ b/src/obj/NiClodData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiClodData.h" using namespace Niflib; diff --git a/src/obj/NiClodSkinInstance.cpp b/src/obj/NiClodSkinInstance.cpp index c3d668a5..a302f1a3 100644 --- a/src/obj/NiClodSkinInstance.cpp +++ b/src/obj/NiClodSkinInstance.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiClodSkinInstance.h" using namespace Niflib; diff --git a/src/obj/NiCollisionData.cpp b/src/obj/NiCollisionData.cpp index 5f6d3455..b6f17ed4 100644 --- a/src/obj/NiCollisionData.cpp +++ b/src/obj/NiCollisionData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiCollisionData.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp index c202968f..1bd5cf63 100644 --- a/src/obj/NiCollisionObject.cpp +++ b/src/obj/NiCollisionObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiCollisionObject.h" #include "../../include/obj/NiAVObject.h" diff --git a/src/obj/NiColorData.cpp b/src/obj/NiColorData.cpp index 5904a0c1..9cecdbd6 100644 --- a/src/obj/NiColorData.cpp +++ b/src/obj/NiColorData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiColorData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiColorExtraData.cpp b/src/obj/NiColorExtraData.cpp index b0d15a16..d6ba72bf 100644 --- a/src/obj/NiColorExtraData.cpp +++ b/src/obj/NiColorExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiColorExtraData.h" using namespace Niflib; diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp index 75334c11..cb14cb34 100644 --- a/src/obj/NiControllerManager.cpp +++ b/src/obj/NiControllerManager.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiControllerManager.h" #include "../../include/obj/NiControllerSequence.h" diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp index 0658d932..29550ae6 100644 --- a/src/obj/NiControllerSequence.cpp +++ b/src/obj/NiControllerSequence.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiControllerSequence.h" #include "../../include/gen/ControllerLink.h" diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp index a9dac865..8a4a07ae 100644 --- a/src/obj/NiDefaultAVObjectPalette.cpp +++ b/src/obj/NiDefaultAVObjectPalette.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiDefaultAVObjectPalette.h" #include "../../include/gen/AVObject.h" diff --git a/src/obj/NiDirectionalLight.cpp b/src/obj/NiDirectionalLight.cpp index f40675b5..048c656d 100644 --- a/src/obj/NiDirectionalLight.cpp +++ b/src/obj/NiDirectionalLight.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiDirectionalLight.h" using namespace Niflib; diff --git a/src/obj/NiDitherProperty.cpp b/src/obj/NiDitherProperty.cpp index d30179aa..8c17976c 100644 --- a/src/obj/NiDitherProperty.cpp +++ b/src/obj/NiDitherProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiDitherProperty.h" using namespace Niflib; diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp index 399332b5..e76f1313 100644 --- a/src/obj/NiDynamicEffect.cpp +++ b/src/obj/NiDynamicEffect.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiDynamicEffect.h" #include "../../include/obj/NiAVObject.h" diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp index d2688eec..fc13aec4 100644 --- a/src/obj/NiExtraData.cpp +++ b/src/obj/NiExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiExtraData.h" using namespace Niflib; diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp index c9cebfca..2ce75188 100644 --- a/src/obj/NiFlipController.cpp +++ b/src/obj/NiFlipController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFlipController.h" #include "../../include/obj/NiSourceTexture.h" diff --git a/src/obj/NiFloatData.cpp b/src/obj/NiFloatData.cpp index 9b52f897..deb6b3bd 100644 --- a/src/obj/NiFloatData.cpp +++ b/src/obj/NiFloatData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFloatData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiFloatExtraData.cpp b/src/obj/NiFloatExtraData.cpp index 06f82bb9..21c18640 100644 --- a/src/obj/NiFloatExtraData.cpp +++ b/src/obj/NiFloatExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFloatExtraData.h" using namespace Niflib; diff --git a/src/obj/NiFloatExtraDataController.cpp b/src/obj/NiFloatExtraDataController.cpp index ab0c9768..d0dcbc41 100644 --- a/src/obj/NiFloatExtraDataController.cpp +++ b/src/obj/NiFloatExtraDataController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFloatExtraDataController.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp index 3a763793..fb2d00c3 100644 --- a/src/obj/NiFloatInterpolator.cpp +++ b/src/obj/NiFloatInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFloatInterpolator.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp index f636c866..e3e1c64c 100644 --- a/src/obj/NiFloatsExtraData.cpp +++ b/src/obj/NiFloatsExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFloatsExtraData.h" using namespace Niflib; diff --git a/src/obj/NiFogProperty.cpp b/src/obj/NiFogProperty.cpp index 788b0fb7..4f7c8e39 100644 --- a/src/obj/NiFogProperty.cpp +++ b/src/obj/NiFogProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiFogProperty.h" using namespace Niflib; diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp index 7c9aac40..d3ae2757 100644 --- a/src/obj/NiGeomMorpherController.cpp +++ b/src/obj/NiGeomMorpherController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiGeomMorpherController.h" #include "../../include/obj/NiMorphData.h" diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp index 87301e4f..51d56a16 100644 --- a/src/obj/NiGeometry.cpp +++ b/src/obj/NiGeometry.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiGeometry.h" #include "../../include/obj/NiGeometryData.h" diff --git a/src/obj/NiGeometryData.cpp b/src/obj/NiGeometryData.cpp index 651e7773..b2bf4c24 100644 --- a/src/obj/NiGeometryData.cpp +++ b/src/obj/NiGeometryData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiGeometryData.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiGravity.cpp b/src/obj/NiGravity.cpp index fc14904e..0d3407e7 100644 --- a/src/obj/NiGravity.cpp +++ b/src/obj/NiGravity.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiGravity.h" using namespace Niflib; diff --git a/src/obj/NiImage.cpp b/src/obj/NiImage.cpp index e2defe0e..4676257f 100644 --- a/src/obj/NiImage.cpp +++ b/src/obj/NiImage.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiImage.h" using namespace Niflib; diff --git a/src/obj/NiIntegerExtraData.cpp b/src/obj/NiIntegerExtraData.cpp index 1c26ccee..a5ed168f 100644 --- a/src/obj/NiIntegerExtraData.cpp +++ b/src/obj/NiIntegerExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiIntegerExtraData.h" using namespace Niflib; diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp index 9c35fddc..1245312b 100644 --- a/src/obj/NiIntegersExtraData.cpp +++ b/src/obj/NiIntegersExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiIntegersExtraData.h" using namespace Niflib; diff --git a/src/obj/NiInterpolator.cpp b/src/obj/NiInterpolator.cpp index a179eb65..b33a9e52 100644 --- a/src/obj/NiInterpolator.cpp +++ b/src/obj/NiInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiInterpolator.h" using namespace Niflib; diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp index 26bd0967..803e8b61 100644 --- a/src/obj/NiKeyframeController.cpp +++ b/src/obj/NiKeyframeController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiKeyframeController.h" #include "../../include/obj/NiKeyframeData.h" diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp index 0918aa91..7d88b426 100644 --- a/src/obj/NiKeyframeData.cpp +++ b/src/obj/NiKeyframeData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiKeyframeData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiLODData.cpp b/src/obj/NiLODData.cpp index 3797f3e5..0285a554 100644 --- a/src/obj/NiLODData.cpp +++ b/src/obj/NiLODData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLODData.h" using namespace Niflib; diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp index 68bc3170..be489cef 100644 --- a/src/obj/NiLODNode.cpp +++ b/src/obj/NiLODNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLODNode.h" #include "../../include/gen/LODRange.h" diff --git a/src/obj/NiLight.cpp b/src/obj/NiLight.cpp index 1eca7090..acc08335 100644 --- a/src/obj/NiLight.cpp +++ b/src/obj/NiLight.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLight.h" using namespace Niflib; diff --git a/src/obj/NiLightColorController.cpp b/src/obj/NiLightColorController.cpp index 582d52c9..d46e8d21 100644 --- a/src/obj/NiLightColorController.cpp +++ b/src/obj/NiLightColorController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLightColorController.h" #include "../../include/obj/NiPosData.h" diff --git a/src/obj/NiLightDimmerController.cpp b/src/obj/NiLightDimmerController.cpp index 4a5f8a00..69d7fdba 100644 --- a/src/obj/NiLightDimmerController.cpp +++ b/src/obj/NiLightDimmerController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLightDimmerController.h" #include "../../include/obj/NiInterpolator.h" diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp index 3609893b..1967b9f1 100644 --- a/src/obj/NiLookAtController.cpp +++ b/src/obj/NiLookAtController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLookAtController.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp index 55cccaef..3f437ae7 100644 --- a/src/obj/NiLookAtInterpolator.cpp +++ b/src/obj/NiLookAtInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiLookAtInterpolator.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiMaterialColorController.cpp b/src/obj/NiMaterialColorController.cpp index 77d2d132..ecbf0ffe 100644 --- a/src/obj/NiMaterialColorController.cpp +++ b/src/obj/NiMaterialColorController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMaterialColorController.h" #include "../../include/obj/NiPosData.h" diff --git a/src/obj/NiMaterialProperty.cpp b/src/obj/NiMaterialProperty.cpp index 2a0802aa..19270fc1 100644 --- a/src/obj/NiMaterialProperty.cpp +++ b/src/obj/NiMaterialProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMaterialProperty.h" using namespace Niflib; diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp index 910606e3..e501234b 100644 --- a/src/obj/NiMeshPSysData.cpp +++ b/src/obj/NiMeshPSysData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMeshPSysData.h" #include "../../include/obj/NiPSysModifier.h" diff --git a/src/obj/NiMeshParticleSystem.cpp b/src/obj/NiMeshParticleSystem.cpp index b579b036..09bb904c 100644 --- a/src/obj/NiMeshParticleSystem.cpp +++ b/src/obj/NiMeshParticleSystem.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMeshParticleSystem.h" using namespace Niflib; diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp index 41922c7d..e19a4ec0 100644 --- a/src/obj/NiMorphData.cpp +++ b/src/obj/NiMorphData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMorphData.h" #include "../../include/gen/Morph.h" diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp index 383ba7e8..41f7e4ce 100644 --- a/src/obj/NiMultiTargetTransformController.cpp +++ b/src/obj/NiMultiTargetTransformController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiMultiTargetTransformController.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiMultiTextureProperty.cpp b/src/obj/NiMultiTextureProperty.cpp new file mode 100644 index 00000000..fe0b02a5 --- /dev/null +++ b/src/obj/NiMultiTextureProperty.cpp @@ -0,0 +1,62 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#include "../../include/obj/NiMultiTextureProperty.h" +#include "../../include/obj/NiImage.h" +using namespace Niflib; + +//Definition of TYPE constant +const Type NiMultiTextureProperty::TYPE("NiMultiTextureProperty", &NI_MULTI_TEXTURE_PROPERTY_PARENT::TYPE ); + +NiMultiTextureProperty::NiMultiTextureProperty() NI_MULTI_TEXTURE_PROPERTY_CONSTRUCT {} + +NiMultiTextureProperty::~NiMultiTextureProperty() {} + +void NiMultiTextureProperty::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalRead( in, link_stack, info ); +} + +void NiMultiTextureProperty::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + InternalWrite( out, link_map, info ); +} + +string NiMultiTextureProperty::asString( bool verbose ) const { + return InternalAsString( verbose ); +} + +void NiMultiTextureProperty::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalFixLinks( objects, link_stack, info ); +} + +list<NiObjectRef> NiMultiTextureProperty::GetRefs() const { + return InternalGetRefs(); +} + +const Type & NiMultiTextureProperty::GetType() const { + return TYPE; +} + +namespace Niflib { + typedef NiObject*(*obj_factory_func)(); + extern map<string, obj_factory_func> global_object_map; + + //Initialization function + static bool Initialization(); + + //A static bool to force the initialization to happen pre-main + static bool obj_initialized = Initialization(); + + static bool Initialization() { + //Add the function to the global object map + global_object_map["NiMultiTextureProperty"] = NiMultiTextureProperty::Create; + + //Do this stuff just to make sure the compiler doesn't optimize this function and the static bool away. + obj_initialized = true; + return obj_initialized; + } +} + +NiObject * NiMultiTextureProperty::Create() { + return new NiMultiTextureProperty; +} + diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp index fb30eb75..93339277 100644 --- a/src/obj/NiNode.cpp +++ b/src/obj/NiNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiNode.h" #include "../../include/obj/NiAVObject.h" diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp index 5819589d..68dede16 100644 --- a/src/obj/NiObject.cpp +++ b/src/obj/NiObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiObject.h" #include "../../include/niflib.h" diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp index 89bfd506..41b8866d 100644 --- a/src/obj/NiObjectNET.cpp +++ b/src/obj/NiObjectNET.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiObjectNET.h" #include "../../include/obj/NiExtraData.h" diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp index 492f5601..afe576dc 100644 --- a/src/obj/NiPSysAgeDeathModifier.cpp +++ b/src/obj/NiPSysAgeDeathModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysAgeDeathModifier.h" #include "../../include/obj/NiPSysSpawnModifier.h" diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp index 0ee4e8d4..9faf6ebe 100644 --- a/src/obj/NiPSysBombModifier.cpp +++ b/src/obj/NiPSysBombModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysBombModifier.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiPSysBoundUpdateModifier.cpp b/src/obj/NiPSysBoundUpdateModifier.cpp index 900cb7fb..552e7a53 100644 --- a/src/obj/NiPSysBoundUpdateModifier.cpp +++ b/src/obj/NiPSysBoundUpdateModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysBoundUpdateModifier.h" using namespace Niflib; diff --git a/src/obj/NiPSysBoxEmitter.cpp b/src/obj/NiPSysBoxEmitter.cpp index 0c8eed96..018e2288 100644 --- a/src/obj/NiPSysBoxEmitter.cpp +++ b/src/obj/NiPSysBoxEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysBoxEmitter.h" using namespace Niflib; diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp index baea4aa1..689dc66a 100644 --- a/src/obj/NiPSysColliderManager.cpp +++ b/src/obj/NiPSysColliderManager.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysColliderManager.h" #include "../../include/obj/NiPSysPlanarCollider.h" diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp index 41770333..dd8a4b6e 100644 --- a/src/obj/NiPSysColorModifier.cpp +++ b/src/obj/NiPSysColorModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysColorModifier.h" #include "../../include/obj/NiColorData.h" diff --git a/src/obj/NiPSysCylinderEmitter.cpp b/src/obj/NiPSysCylinderEmitter.cpp index 0f97a055..c8b05ea5 100644 --- a/src/obj/NiPSysCylinderEmitter.cpp +++ b/src/obj/NiPSysCylinderEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysCylinderEmitter.h" using namespace Niflib; diff --git a/src/obj/NiPSysData.cpp b/src/obj/NiPSysData.cpp index 0b82f19c..50f9feb8 100644 --- a/src/obj/NiPSysData.cpp +++ b/src/obj/NiPSysData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysData.h" using namespace Niflib; diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp index 79a9b67a..2598b86c 100644 --- a/src/obj/NiPSysDragModifier.cpp +++ b/src/obj/NiPSysDragModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysDragModifier.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiPSysEmitter.cpp b/src/obj/NiPSysEmitter.cpp index 4ad0f702..5da2ea40 100644 --- a/src/obj/NiPSysEmitter.cpp +++ b/src/obj/NiPSysEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitter.h" using namespace Niflib; diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp index 80861e3f..14febb2f 100644 --- a/src/obj/NiPSysEmitterCtlr.cpp +++ b/src/obj/NiPSysEmitterCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterCtlr.h" #include "../../include/obj/NiPSysEmitterCtlrData.h" diff --git a/src/obj/NiPSysEmitterCtlrData.cpp b/src/obj/NiPSysEmitterCtlrData.cpp index dbe03d85..e89a50b8 100644 --- a/src/obj/NiPSysEmitterCtlrData.cpp +++ b/src/obj/NiPSysEmitterCtlrData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterCtlrData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiPSysEmitterDeclinationCtlr.cpp b/src/obj/NiPSysEmitterDeclinationCtlr.cpp index eb4c215b..59c0d2b7 100644 --- a/src/obj/NiPSysEmitterDeclinationCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterDeclinationCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp index 3c1d87e1..1db99f8b 100644 --- a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterDeclinationVarCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp index 6a5f0855..5cdd6eca 100644 --- a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp +++ b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterInitialRadiusCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp index 5c66e254..7ffe768e 100644 --- a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp +++ b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterLifeSpanCtlr.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiPSysEmitterSpeedCtlr.cpp b/src/obj/NiPSysEmitterSpeedCtlr.cpp index ca334df2..0e3e2c94 100644 --- a/src/obj/NiPSysEmitterSpeedCtlr.cpp +++ b/src/obj/NiPSysEmitterSpeedCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysEmitterSpeedCtlr.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp index 92b393b2..ec5bc25c 100644 --- a/src/obj/NiPSysGravityModifier.cpp +++ b/src/obj/NiPSysGravityModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysGravityModifier.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiPSysGravityStrengthCtlr.cpp b/src/obj/NiPSysGravityStrengthCtlr.cpp index 8a80bd20..43230518 100644 --- a/src/obj/NiPSysGravityStrengthCtlr.cpp +++ b/src/obj/NiPSysGravityStrengthCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysGravityStrengthCtlr.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiPSysGrowFadeModifier.cpp b/src/obj/NiPSysGrowFadeModifier.cpp index 60e1b1c6..47b709a4 100644 --- a/src/obj/NiPSysGrowFadeModifier.cpp +++ b/src/obj/NiPSysGrowFadeModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysGrowFadeModifier.h" using namespace Niflib; diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp index e8810b7a..ac342948 100644 --- a/src/obj/NiPSysMeshEmitter.cpp +++ b/src/obj/NiPSysMeshEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysMeshEmitter.h" #include "../../include/obj/NiTriBasedGeom.h" diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp index ce595bab..68ac9c35 100644 --- a/src/obj/NiPSysMeshUpdateModifier.cpp +++ b/src/obj/NiPSysMeshUpdateModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysMeshUpdateModifier.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp index 13f5bf1c..508cb8b8 100644 --- a/src/obj/NiPSysModifier.cpp +++ b/src/obj/NiPSysModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysModifier.h" #include "../../include/obj/NiParticleSystem.h" diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp index 591efcfb..40ac0c46 100644 --- a/src/obj/NiPSysModifierActiveCtlr.cpp +++ b/src/obj/NiPSysModifierActiveCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysModifierActiveCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysPlanarCollider.cpp b/src/obj/NiPSysPlanarCollider.cpp index 6c7df074..e266603a 100644 --- a/src/obj/NiPSysPlanarCollider.cpp +++ b/src/obj/NiPSysPlanarCollider.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysPlanarCollider.h" #include "../../include/obj/NiPSysSpawnModifier.h" diff --git a/src/obj/NiPSysPositionModifier.cpp b/src/obj/NiPSysPositionModifier.cpp index 837d5438..35cc93c9 100644 --- a/src/obj/NiPSysPositionModifier.cpp +++ b/src/obj/NiPSysPositionModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysPositionModifier.h" using namespace Niflib; diff --git a/src/obj/NiPSysResetOnLoopCtlr.cpp b/src/obj/NiPSysResetOnLoopCtlr.cpp index be072f55..458156b6 100644 --- a/src/obj/NiPSysResetOnLoopCtlr.cpp +++ b/src/obj/NiPSysResetOnLoopCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysResetOnLoopCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysRotationModifier.cpp b/src/obj/NiPSysRotationModifier.cpp index 28aa6f1f..2bae7f62 100644 --- a/src/obj/NiPSysRotationModifier.cpp +++ b/src/obj/NiPSysRotationModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysRotationModifier.h" using namespace Niflib; diff --git a/src/obj/NiPSysSpawnModifier.cpp b/src/obj/NiPSysSpawnModifier.cpp index 7e440e6e..bb434cf5 100644 --- a/src/obj/NiPSysSpawnModifier.cpp +++ b/src/obj/NiPSysSpawnModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysSpawnModifier.h" using namespace Niflib; diff --git a/src/obj/NiPSysSphereEmitter.cpp b/src/obj/NiPSysSphereEmitter.cpp index dc4f7e0d..8232611f 100644 --- a/src/obj/NiPSysSphereEmitter.cpp +++ b/src/obj/NiPSysSphereEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysSphereEmitter.h" using namespace Niflib; diff --git a/src/obj/NiPSysUpdateCtlr.cpp b/src/obj/NiPSysUpdateCtlr.cpp index b7a42f75..7ead9da9 100644 --- a/src/obj/NiPSysUpdateCtlr.cpp +++ b/src/obj/NiPSysUpdateCtlr.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysUpdateCtlr.h" using namespace Niflib; diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp index 4e1bbb06..b0f3173f 100644 --- a/src/obj/NiPSysVolumeEmitter.cpp +++ b/src/obj/NiPSysVolumeEmitter.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPSysVolumeEmitter.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiPalette.cpp b/src/obj/NiPalette.cpp index c917535e..3f9cce62 100644 --- a/src/obj/NiPalette.cpp +++ b/src/obj/NiPalette.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPalette.h" using namespace Niflib; diff --git a/src/obj/NiParticleBomb.cpp b/src/obj/NiParticleBomb.cpp index 16170997..a68a2f0d 100644 --- a/src/obj/NiParticleBomb.cpp +++ b/src/obj/NiParticleBomb.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleBomb.h" using namespace Niflib; diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp index 72475173..fa8de664 100644 --- a/src/obj/NiParticleColorModifier.cpp +++ b/src/obj/NiParticleColorModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleColorModifier.h" #include "../../include/obj/NiColorData.h" diff --git a/src/obj/NiParticleGrowFade.cpp b/src/obj/NiParticleGrowFade.cpp index d810cdbd..7d576da8 100644 --- a/src/obj/NiParticleGrowFade.cpp +++ b/src/obj/NiParticleGrowFade.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleGrowFade.h" using namespace Niflib; diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp index e1461ae0..5a450f5a 100644 --- a/src/obj/NiParticleMeshModifier.cpp +++ b/src/obj/NiParticleMeshModifier.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleMeshModifier.h" #include "../../include/obj/NiAVObject.h" diff --git a/src/obj/NiParticleMeshes.cpp b/src/obj/NiParticleMeshes.cpp index 6eae566e..98ca29cd 100644 --- a/src/obj/NiParticleMeshes.cpp +++ b/src/obj/NiParticleMeshes.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleMeshes.h" using namespace Niflib; diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp index 48ceb6c0..b2ea0cd4 100644 --- a/src/obj/NiParticleMeshesData.cpp +++ b/src/obj/NiParticleMeshesData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleMeshesData.h" #include "../../include/obj/NiAVObject.h" diff --git a/src/obj/NiParticleRotation.cpp b/src/obj/NiParticleRotation.cpp index 4a64b39d..8c143432 100644 --- a/src/obj/NiParticleRotation.cpp +++ b/src/obj/NiParticleRotation.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleRotation.h" using namespace Niflib; diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp index 2d1c3d42..cea08b14 100644 --- a/src/obj/NiParticleSystem.cpp +++ b/src/obj/NiParticleSystem.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleSystem.h" #include "../../include/obj/NiPSysModifier.h" diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp index 2fe0cb60..bb840613 100644 --- a/src/obj/NiParticleSystemController.cpp +++ b/src/obj/NiParticleSystemController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticleSystemController.h" #include "../../include/gen/Particle.h" diff --git a/src/obj/NiParticles.cpp b/src/obj/NiParticles.cpp index 95304a57..a279ecc6 100644 --- a/src/obj/NiParticles.cpp +++ b/src/obj/NiParticles.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticles.h" using namespace Niflib; diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp index 41fdf33d..70b84a73 100644 --- a/src/obj/NiParticlesData.cpp +++ b/src/obj/NiParticlesData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiParticlesData.h" using namespace Niflib; diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp index 292b4623..32849e8a 100644 --- a/src/obj/NiPathController.cpp +++ b/src/obj/NiPathController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPathController.h" #include "../../include/obj/NiPosData.h" diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp index 0f5e205d..a6986105 100644 --- a/src/obj/NiPathInterpolator.cpp +++ b/src/obj/NiPathInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPathInterpolator.h" #include "../../include/obj/NiPosData.h" diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp index c5196bf1..1ad44751 100644 --- a/src/obj/NiPixelData.cpp +++ b/src/obj/NiPixelData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPixelData.h" #include "../../include/gen/MipMap.h" diff --git a/src/obj/NiPlanarCollider.cpp b/src/obj/NiPlanarCollider.cpp index 8fc0d299..f5f1866b 100644 --- a/src/obj/NiPlanarCollider.cpp +++ b/src/obj/NiPlanarCollider.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPlanarCollider.h" using namespace Niflib; diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp index a7f4e0ae..1dc0d921 100644 --- a/src/obj/NiPoint3Interpolator.cpp +++ b/src/obj/NiPoint3Interpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPoint3Interpolator.h" #include "../../include/obj/NiPosData.h" diff --git a/src/obj/NiPointLight.cpp b/src/obj/NiPointLight.cpp index d8320710..8822b63a 100644 --- a/src/obj/NiPointLight.cpp +++ b/src/obj/NiPointLight.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPointLight.h" using namespace Niflib; diff --git a/src/obj/NiPosData.cpp b/src/obj/NiPosData.cpp index cc804ea5..361a9e23 100644 --- a/src/obj/NiPosData.cpp +++ b/src/obj/NiPosData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiPosData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiProperty.cpp b/src/obj/NiProperty.cpp index ff746cc0..21006574 100644 --- a/src/obj/NiProperty.cpp +++ b/src/obj/NiProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiProperty.h" using namespace Niflib; diff --git a/src/obj/NiRangeLODData.cpp b/src/obj/NiRangeLODData.cpp index ee9b70a3..3e50f360 100644 --- a/src/obj/NiRangeLODData.cpp +++ b/src/obj/NiRangeLODData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiRangeLODData.h" #include "../../include/gen/LODRange.h" diff --git a/src/obj/NiRawImageData.cpp b/src/obj/NiRawImageData.cpp new file mode 100644 index 00000000..1776e08b --- /dev/null +++ b/src/obj/NiRawImageData.cpp @@ -0,0 +1,62 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#include "../../include/obj/NiRawImageData.h" +#include "../../include/gen/ByteColor3.h" +using namespace Niflib; + +//Definition of TYPE constant +const Type NiRawImageData::TYPE("NiRawImageData", &NI_RAW_IMAGE_DATA_PARENT::TYPE ); + +NiRawImageData::NiRawImageData() NI_RAW_IMAGE_DATA_CONSTRUCT {} + +NiRawImageData::~NiRawImageData() {} + +void NiRawImageData::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalRead( in, link_stack, info ); +} + +void NiRawImageData::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + InternalWrite( out, link_map, info ); +} + +string NiRawImageData::asString( bool verbose ) const { + return InternalAsString( verbose ); +} + +void NiRawImageData::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalFixLinks( objects, link_stack, info ); +} + +list<NiObjectRef> NiRawImageData::GetRefs() const { + return InternalGetRefs(); +} + +const Type & NiRawImageData::GetType() const { + return TYPE; +} + +namespace Niflib { + typedef NiObject*(*obj_factory_func)(); + extern map<string, obj_factory_func> global_object_map; + + //Initialization function + static bool Initialization(); + + //A static bool to force the initialization to happen pre-main + static bool obj_initialized = Initialization(); + + static bool Initialization() { + //Add the function to the global object map + global_object_map["NiRawImageData"] = NiRawImageData::Create; + + //Do this stuff just to make sure the compiler doesn't optimize this function and the static bool away. + obj_initialized = true; + return obj_initialized; + } +} + +NiObject * NiRawImageData::Create() { + return new NiRawImageData; +} + diff --git a/src/obj/NiRotatingParticles.cpp b/src/obj/NiRotatingParticles.cpp index b4bc1e8c..604cf568 100644 --- a/src/obj/NiRotatingParticles.cpp +++ b/src/obj/NiRotatingParticles.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiRotatingParticles.h" using namespace Niflib; diff --git a/src/obj/NiRotatingParticlesData.cpp b/src/obj/NiRotatingParticlesData.cpp index 3d38c70a..c8fc5e33 100644 --- a/src/obj/NiRotatingParticlesData.cpp +++ b/src/obj/NiRotatingParticlesData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiRotatingParticlesData.h" using namespace Niflib; diff --git a/src/obj/NiScreenLODData.cpp b/src/obj/NiScreenLODData.cpp index 5332056e..3afbc691 100644 --- a/src/obj/NiScreenLODData.cpp +++ b/src/obj/NiScreenLODData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiScreenLODData.h" using namespace Niflib; diff --git a/src/obj/NiSequence.cpp b/src/obj/NiSequence.cpp new file mode 100644 index 00000000..34f50f19 --- /dev/null +++ b/src/obj/NiSequence.cpp @@ -0,0 +1,67 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#include "../../include/obj/NiSequence.h" +#include "../../include/gen/ControllerLink.h" +#include "../../include/obj/NiTimeController.h" +#include "../../include/obj/NiInterpolator.h" +#include "../../include/obj/NiObject.h" +#include "../../include/obj/NiStringPalette.h" +#include "../../include/obj/NiTextKeyExtraData.h" +using namespace Niflib; + +//Definition of TYPE constant +const Type NiSequence::TYPE("NiSequence", &NI_SEQUENCE_PARENT::TYPE ); + +NiSequence::NiSequence() NI_SEQUENCE_CONSTRUCT {} + +NiSequence::~NiSequence() {} + +void NiSequence::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalRead( in, link_stack, info ); +} + +void NiSequence::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + InternalWrite( out, link_map, info ); +} + +string NiSequence::asString( bool verbose ) const { + return InternalAsString( verbose ); +} + +void NiSequence::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalFixLinks( objects, link_stack, info ); +} + +list<NiObjectRef> NiSequence::GetRefs() const { + return InternalGetRefs(); +} + +const Type & NiSequence::GetType() const { + return TYPE; +} + +namespace Niflib { + typedef NiObject*(*obj_factory_func)(); + extern map<string, obj_factory_func> global_object_map; + + //Initialization function + static bool Initialization(); + + //A static bool to force the initialization to happen pre-main + static bool obj_initialized = Initialization(); + + static bool Initialization() { + //Add the function to the global object map + global_object_map["NiSequence"] = NiSequence::Create; + + //Do this stuff just to make sure the compiler doesn't optimize this function and the static bool away. + obj_initialized = true; + return obj_initialized; + } +} + +NiObject * NiSequence::Create() { + return new NiSequence; +} + diff --git a/src/obj/NiSequenceStreamHelper.cpp b/src/obj/NiSequenceStreamHelper.cpp index 534fa3d9..d419e561 100644 --- a/src/obj/NiSequenceStreamHelper.cpp +++ b/src/obj/NiSequenceStreamHelper.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSequenceStreamHelper.h" using namespace Niflib; diff --git a/src/obj/NiShadeProperty.cpp b/src/obj/NiShadeProperty.cpp index f9c99d9e..021ebe09 100644 --- a/src/obj/NiShadeProperty.cpp +++ b/src/obj/NiShadeProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiShadeProperty.h" using namespace Niflib; diff --git a/src/obj/NiSingleInterpolatorController.cpp b/src/obj/NiSingleInterpolatorController.cpp index b15a9da1..7d85dbf8 100644 --- a/src/obj/NiSingleInterpolatorController.cpp +++ b/src/obj/NiSingleInterpolatorController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSingleInterpolatorController.h" #include "../../include/obj/NiInterpolator.h" diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp index 39874966..abf6875e 100644 --- a/src/obj/NiSkinData.cpp +++ b/src/obj/NiSkinData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSkinData.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp index 11e510aa..5525694b 100644 --- a/src/obj/NiSkinInstance.cpp +++ b/src/obj/NiSkinInstance.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSkinInstance.h" #include "../../include/obj/NiNode.h" diff --git a/src/obj/NiSkinPartition.cpp b/src/obj/NiSkinPartition.cpp index ff6a2e15..fd4cf952 100644 --- a/src/obj/NiSkinPartition.cpp +++ b/src/obj/NiSkinPartition.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSkinPartition.h" #include "../../include/gen/SkinPartition.h" diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp index f3bbfae8..9b8ef12e 100644 --- a/src/obj/NiSourceTexture.cpp +++ b/src/obj/NiSourceTexture.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSourceTexture.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiSpecularProperty.cpp b/src/obj/NiSpecularProperty.cpp index d443d57f..1fb96045 100644 --- a/src/obj/NiSpecularProperty.cpp +++ b/src/obj/NiSpecularProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSpecularProperty.h" using namespace Niflib; diff --git a/src/obj/NiSphericalCollider.cpp b/src/obj/NiSphericalCollider.cpp index 665a818e..0f9dbd6d 100644 --- a/src/obj/NiSphericalCollider.cpp +++ b/src/obj/NiSphericalCollider.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSphericalCollider.h" using namespace Niflib; diff --git a/src/obj/NiSpotLight.cpp b/src/obj/NiSpotLight.cpp index 5aad6080..13b515cb 100644 --- a/src/obj/NiSpotLight.cpp +++ b/src/obj/NiSpotLight.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiSpotLight.h" using namespace Niflib; diff --git a/src/obj/NiStencilProperty.cpp b/src/obj/NiStencilProperty.cpp index 02a56416..371bbde6 100644 --- a/src/obj/NiStencilProperty.cpp +++ b/src/obj/NiStencilProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiStencilProperty.h" using namespace Niflib; diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp index 18c59a16..3d2a1288 100644 --- a/src/obj/NiStringExtraData.cpp +++ b/src/obj/NiStringExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiStringExtraData.h" using namespace Niflib; diff --git a/src/obj/NiStringPalette.cpp b/src/obj/NiStringPalette.cpp index 7851687f..62f4f496 100644 --- a/src/obj/NiStringPalette.cpp +++ b/src/obj/NiStringPalette.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiStringPalette.h" #include "../../include/gen/StringPalette.h" diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp index c12cfc59..2c2efc78 100644 --- a/src/obj/NiStringsExtraData.cpp +++ b/src/obj/NiStringsExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiStringsExtraData.h" using namespace Niflib; diff --git a/src/obj/NiTextKeyExtraData.cpp b/src/obj/NiTextKeyExtraData.cpp index 469cfac3..d309abd1 100644 --- a/src/obj/NiTextKeyExtraData.cpp +++ b/src/obj/NiTextKeyExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTextKeyExtraData.h" using namespace Niflib; diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp index 365fae1b..d8808a3b 100644 --- a/src/obj/NiTextureEffect.cpp +++ b/src/obj/NiTextureEffect.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTextureEffect.h" #include "../../include/obj/NiSourceTexture.h" diff --git a/src/obj/NiTextureModeProperty.cpp b/src/obj/NiTextureModeProperty.cpp index cc31537c..62db0f2e 100644 --- a/src/obj/NiTextureModeProperty.cpp +++ b/src/obj/NiTextureModeProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTextureModeProperty.h" using namespace Niflib; diff --git a/src/obj/NiTextureProperty.cpp b/src/obj/NiTextureProperty.cpp index 3a0dc37e..727d8cf1 100644 --- a/src/obj/NiTextureProperty.cpp +++ b/src/obj/NiTextureProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTextureProperty.h" #include "../../include/obj/NiImage.h" diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp index 96a51fa0..927b1eec 100644 --- a/src/obj/NiTextureTransformController.cpp +++ b/src/obj/NiTextureTransformController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTextureTransformController.h" #include "../../include/obj/NiFloatData.h" diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp index fd8dcb02..992f71d1 100644 --- a/src/obj/NiTexturingProperty.cpp +++ b/src/obj/NiTexturingProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTexturingProperty.h" #include "../../include/gen/TexDesc.h" diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp index 6da5da59..3d04dc1b 100644 --- a/src/obj/NiTimeController.cpp +++ b/src/obj/NiTimeController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTimeController.h" #include "../../include/obj/NiObjectNET.h" diff --git a/src/obj/NiTransformController.cpp b/src/obj/NiTransformController.cpp index dc5190be..4317982e 100644 --- a/src/obj/NiTransformController.cpp +++ b/src/obj/NiTransformController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTransformController.h" using namespace Niflib; diff --git a/src/obj/NiTransformData.cpp b/src/obj/NiTransformData.cpp index 30545502..621c44dd 100644 --- a/src/obj/NiTransformData.cpp +++ b/src/obj/NiTransformData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTransformData.h" using namespace Niflib; diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp index 2882c29d..a6d08a06 100644 --- a/src/obj/NiTransformInterpolator.cpp +++ b/src/obj/NiTransformInterpolator.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTransformInterpolator.h" #include "../../include/obj/NiTransformData.h" diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp index 55ff2f5f..76e20efc 100644 --- a/src/obj/NiTriBasedGeom.cpp +++ b/src/obj/NiTriBasedGeom.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriBasedGeom.h" #include "../../include/obj/NiTriBasedGeomData.h" diff --git a/src/obj/NiTriBasedGeomData.cpp b/src/obj/NiTriBasedGeomData.cpp index 701f1759..c092625c 100644 --- a/src/obj/NiTriBasedGeomData.cpp +++ b/src/obj/NiTriBasedGeomData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriBasedGeomData.h" #include "../../include/obj/NiObject.h" diff --git a/src/obj/NiTriShape.cpp b/src/obj/NiTriShape.cpp index 1a8f1cdf..a9059ee7 100644 --- a/src/obj/NiTriShape.cpp +++ b/src/obj/NiTriShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriShape.h" using namespace Niflib; diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp index c42267b5..8b8d6081 100644 --- a/src/obj/NiTriShapeData.cpp +++ b/src/obj/NiTriShapeData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriShapeData.h" #include "../../include/gen/MatchGroup.h" diff --git a/src/obj/NiTriStrips.cpp b/src/obj/NiTriStrips.cpp index c388c780..ec2b5489 100644 --- a/src/obj/NiTriStrips.cpp +++ b/src/obj/NiTriStrips.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriStrips.h" using namespace Niflib; diff --git a/src/obj/NiTriStripsData.cpp b/src/obj/NiTriStripsData.cpp index cf75cb25..3b3f3f8f 100644 --- a/src/obj/NiTriStripsData.cpp +++ b/src/obj/NiTriStripsData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiTriStripsData.h" #include "../../NvTriStrip/NvTriStrip.h" diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp index ef99f6f2..eeb6a745 100644 --- a/src/obj/NiUVController.cpp +++ b/src/obj/NiUVController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiUVController.h" #include "../../include/obj/NiUVData.h" diff --git a/src/obj/NiUVData.cpp b/src/obj/NiUVData.cpp index ea93ce5a..1935e0f8 100644 --- a/src/obj/NiUVData.cpp +++ b/src/obj/NiUVData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiUVData.h" #include "../../include/gen/KeyGroup.h" diff --git a/src/obj/NiVectorExtraData.cpp b/src/obj/NiVectorExtraData.cpp index 37f821af..d2566dff 100644 --- a/src/obj/NiVectorExtraData.cpp +++ b/src/obj/NiVectorExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiVectorExtraData.h" using namespace Niflib; diff --git a/src/obj/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp index 530e0d89..1fd54712 100644 --- a/src/obj/NiVertWeightsExtraData.cpp +++ b/src/obj/NiVertWeightsExtraData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiVertWeightsExtraData.h" using namespace Niflib; diff --git a/src/obj/NiVertexColorProperty.cpp b/src/obj/NiVertexColorProperty.cpp index 481615b7..d54ab213 100644 --- a/src/obj/NiVertexColorProperty.cpp +++ b/src/obj/NiVertexColorProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiVertexColorProperty.h" using namespace Niflib; diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp index 1ea91880..85b25791 100644 --- a/src/obj/NiVisController.cpp +++ b/src/obj/NiVisController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiVisController.h" #include "../../include/obj/NiVisData.h" diff --git a/src/obj/NiVisData.cpp b/src/obj/NiVisData.cpp index e27acf25..e69b4853 100644 --- a/src/obj/NiVisData.cpp +++ b/src/obj/NiVisData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiVisData.h" using namespace Niflib; diff --git a/src/obj/NiWireframeProperty.cpp b/src/obj/NiWireframeProperty.cpp index 48a54bad..89c86e9f 100644 --- a/src/obj/NiWireframeProperty.cpp +++ b/src/obj/NiWireframeProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiWireframeProperty.h" using namespace Niflib; diff --git a/src/obj/NiZBufferProperty.cpp b/src/obj/NiZBufferProperty.cpp index 02370030..88ba63e9 100644 --- a/src/obj/NiZBufferProperty.cpp +++ b/src/obj/NiZBufferProperty.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/NiZBufferProperty.h" using namespace Niflib; diff --git a/src/obj/RootCollisionNode.cpp b/src/obj/RootCollisionNode.cpp index aca010df..d2122ced 100644 --- a/src/obj/RootCollisionNode.cpp +++ b/src/obj/RootCollisionNode.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/RootCollisionNode.h" using namespace Niflib; diff --git a/src/obj/bhkBlendCollisionObject.cpp b/src/obj/bhkBlendCollisionObject.cpp index 4fa19e41..38c0f129 100644 --- a/src/obj/bhkBlendCollisionObject.cpp +++ b/src/obj/bhkBlendCollisionObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkBlendCollisionObject.h" using namespace Niflib; diff --git a/src/obj/bhkBlendController.cpp b/src/obj/bhkBlendController.cpp index b488eeb5..3487eb15 100644 --- a/src/obj/bhkBlendController.cpp +++ b/src/obj/bhkBlendController.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkBlendController.h" using namespace Niflib; diff --git a/src/obj/bhkBoxShape.cpp b/src/obj/bhkBoxShape.cpp index 9e9e5fa8..bae0c4ce 100644 --- a/src/obj/bhkBoxShape.cpp +++ b/src/obj/bhkBoxShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkBoxShape.h" using namespace Niflib; diff --git a/src/obj/bhkCapsuleShape.cpp b/src/obj/bhkCapsuleShape.cpp index 564725b3..09290729 100644 --- a/src/obj/bhkCapsuleShape.cpp +++ b/src/obj/bhkCapsuleShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkCapsuleShape.h" using namespace Niflib; diff --git a/src/obj/bhkCollisionObject.cpp b/src/obj/bhkCollisionObject.cpp index 16471354..3f9067ca 100644 --- a/src/obj/bhkCollisionObject.cpp +++ b/src/obj/bhkCollisionObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkCollisionObject.h" using namespace Niflib; diff --git a/src/obj/bhkConvexShape.cpp b/src/obj/bhkConvexShape.cpp index af57b5d1..190fa1d3 100644 --- a/src/obj/bhkConvexShape.cpp +++ b/src/obj/bhkConvexShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkConvexShape.h" using namespace Niflib; diff --git a/src/obj/bhkConvexTransformShape.cpp b/src/obj/bhkConvexTransformShape.cpp index ddfd93af..23addf4e 100644 --- a/src/obj/bhkConvexTransformShape.cpp +++ b/src/obj/bhkConvexTransformShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkConvexTransformShape.h" using namespace Niflib; diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp index 3345c47c..a3fbddb2 100644 --- a/src/obj/bhkConvexVerticesShape.cpp +++ b/src/obj/bhkConvexVerticesShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkConvexVerticesShape.h" using namespace Niflib; diff --git a/src/obj/bhkEntity.cpp b/src/obj/bhkEntity.cpp index 17b38857..c024d20b 100644 --- a/src/obj/bhkEntity.cpp +++ b/src/obj/bhkEntity.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkEntity.h" #include "../../include/obj/bhkShape.h" diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp index 70523782..de0b2b91 100644 --- a/src/obj/bhkHingeConstraint.cpp +++ b/src/obj/bhkHingeConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkHingeConstraint.h" using namespace Niflib; diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp index d5bc7b20..a33d7596 100644 --- a/src/obj/bhkLimitedHingeConstraint.cpp +++ b/src/obj/bhkLimitedHingeConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkLimitedHingeConstraint.h" #include "../../include/gen/LimitedHingeDescriptor.h" diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp index fbee386d..cbc01e16 100644 --- a/src/obj/bhkListShape.cpp +++ b/src/obj/bhkListShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkListShape.h" #include "../../include/obj/bhkShape.h" diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp index 207cccaf..74b90c94 100644 --- a/src/obj/bhkMalleableConstraint.cpp +++ b/src/obj/bhkMalleableConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkMalleableConstraint.h" #include "../../include/gen/RagDollDescriptor.h" diff --git a/src/obj/bhkMeshShape.cpp b/src/obj/bhkMeshShape.cpp new file mode 100644 index 00000000..a2ef676e --- /dev/null +++ b/src/obj/bhkMeshShape.cpp @@ -0,0 +1,62 @@ +/* Copyright (c) 2006, NIF File Format Library and Tools +All rights reserved. Please see niflib.h for license. */ + +#include "../../include/obj/bhkMeshShape.h" +#include "../../include/obj/NiTriStripsData.h" +using namespace Niflib; + +//Definition of TYPE constant +const Type bhkMeshShape::TYPE("bhkMeshShape", &BHK_MESH_SHAPE_PARENT::TYPE ); + +bhkMeshShape::bhkMeshShape() BHK_MESH_SHAPE_CONSTRUCT {} + +bhkMeshShape::~bhkMeshShape() {} + +void bhkMeshShape::Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalRead( in, link_stack, info ); +} + +void bhkMeshShape::Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const { + InternalWrite( out, link_map, info ); +} + +string bhkMeshShape::asString( bool verbose ) const { + return InternalAsString( verbose ); +} + +void bhkMeshShape::FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) { + InternalFixLinks( objects, link_stack, info ); +} + +list<NiObjectRef> bhkMeshShape::GetRefs() const { + return InternalGetRefs(); +} + +const Type & bhkMeshShape::GetType() const { + return TYPE; +} + +namespace Niflib { + typedef NiObject*(*obj_factory_func)(); + extern map<string, obj_factory_func> global_object_map; + + //Initialization function + static bool Initialization(); + + //A static bool to force the initialization to happen pre-main + static bool obj_initialized = Initialization(); + + static bool Initialization() { + //Add the function to the global object map + global_object_map["bhkMeshShape"] = bhkMeshShape::Create; + + //Do this stuff just to make sure the compiler doesn't optimize this function and the static bool away. + obj_initialized = true; + return obj_initialized; + } +} + +NiObject * bhkMeshShape::Create() { + return new bhkMeshShape; +} + diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp index 9aa65961..3e5ffae5 100644 --- a/src/obj/bhkMoppBvTreeShape.cpp +++ b/src/obj/bhkMoppBvTreeShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkMoppBvTreeShape.h" #include "../../include/obj/bhkShape.h" diff --git a/src/obj/bhkMultiSphereShape.cpp b/src/obj/bhkMultiSphereShape.cpp index 53e27e15..795695ee 100644 --- a/src/obj/bhkMultiSphereShape.cpp +++ b/src/obj/bhkMultiSphereShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkMultiSphereShape.h" #include "../../include/gen/Sphere.h" diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp index f6d83ac1..a6b60bfe 100644 --- a/src/obj/bhkNiTriStripsShape.cpp +++ b/src/obj/bhkNiTriStripsShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkNiTriStripsShape.h" #include "../../include/obj/NiTriStripsData.h" diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp index 3ade4531..6373008b 100644 --- a/src/obj/bhkPackedNiTriStripsShape.cpp +++ b/src/obj/bhkPackedNiTriStripsShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkPackedNiTriStripsShape.h" #include "../../include/obj/hkPackedNiTriStripsData.h" diff --git a/src/obj/bhkPrismaticConstraint.cpp b/src/obj/bhkPrismaticConstraint.cpp index ad40a712..158fcbbf 100644 --- a/src/obj/bhkPrismaticConstraint.cpp +++ b/src/obj/bhkPrismaticConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkPrismaticConstraint.h" using namespace Niflib; diff --git a/src/obj/bhkRagdollConstraint.cpp b/src/obj/bhkRagdollConstraint.cpp index 257a0df4..49f872a1 100644 --- a/src/obj/bhkRagdollConstraint.cpp +++ b/src/obj/bhkRagdollConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkRagdollConstraint.h" using namespace Niflib; diff --git a/src/obj/bhkRefObject.cpp b/src/obj/bhkRefObject.cpp index 63bf1f98..7d5701d5 100644 --- a/src/obj/bhkRefObject.cpp +++ b/src/obj/bhkRefObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkRefObject.h" using namespace Niflib; diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp index c46a46d8..14de5416 100644 --- a/src/obj/bhkRigidBody.cpp +++ b/src/obj/bhkRigidBody.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkRigidBody.h" #include "../../include/gen/QuaternionXYZW.h" diff --git a/src/obj/bhkRigidBodyT.cpp b/src/obj/bhkRigidBodyT.cpp index 5e7f33df..a7fa5595 100644 --- a/src/obj/bhkRigidBodyT.cpp +++ b/src/obj/bhkRigidBodyT.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkRigidBodyT.h" using namespace Niflib; diff --git a/src/obj/bhkSPCollisionObject.cpp b/src/obj/bhkSPCollisionObject.cpp index ffec309a..872777fe 100644 --- a/src/obj/bhkSPCollisionObject.cpp +++ b/src/obj/bhkSPCollisionObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkSPCollisionObject.h" using namespace Niflib; diff --git a/src/obj/bhkSerializable.cpp b/src/obj/bhkSerializable.cpp index 9aa3f10e..4a963e1a 100644 --- a/src/obj/bhkSerializable.cpp +++ b/src/obj/bhkSerializable.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkSerializable.h" using namespace Niflib; diff --git a/src/obj/bhkShape.cpp b/src/obj/bhkShape.cpp index 2486cf03..76738621 100644 --- a/src/obj/bhkShape.cpp +++ b/src/obj/bhkShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkShape.h" using namespace Niflib; diff --git a/src/obj/bhkSimpleShapePhantom.cpp b/src/obj/bhkSimpleShapePhantom.cpp index 6ad3d166..efe53391 100644 --- a/src/obj/bhkSimpleShapePhantom.cpp +++ b/src/obj/bhkSimpleShapePhantom.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkSimpleShapePhantom.h" using namespace Niflib; diff --git a/src/obj/bhkSphereRepShape.cpp b/src/obj/bhkSphereRepShape.cpp index 6a0afdf8..04c43683 100644 --- a/src/obj/bhkSphereRepShape.cpp +++ b/src/obj/bhkSphereRepShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkSphereRepShape.h" using namespace Niflib; diff --git a/src/obj/bhkSphereShape.cpp b/src/obj/bhkSphereShape.cpp index 0f60e7e1..f8bcf320 100644 --- a/src/obj/bhkSphereShape.cpp +++ b/src/obj/bhkSphereShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkSphereShape.h" using namespace Niflib; diff --git a/src/obj/bhkStiffSpringConstraint.cpp b/src/obj/bhkStiffSpringConstraint.cpp index e2c7befd..6b85e367 100644 --- a/src/obj/bhkStiffSpringConstraint.cpp +++ b/src/obj/bhkStiffSpringConstraint.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkStiffSpringConstraint.h" using namespace Niflib; diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp index ef89dd7c..9d23f9ee 100644 --- a/src/obj/bhkTransformShape.cpp +++ b/src/obj/bhkTransformShape.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkTransformShape.h" using namespace Niflib; diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp index 4bab54a7..e6676665 100644 --- a/src/obj/bhkWorldObject.cpp +++ b/src/obj/bhkWorldObject.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/bhkWorldObject.h" using namespace Niflib; diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp index 64b0a64a..156b4e36 100644 --- a/src/obj/hkPackedNiTriStripsData.cpp +++ b/src/obj/hkPackedNiTriStripsData.cpp @@ -1,5 +1,5 @@ /* Copyright (c) 2006, NIF File Format Library and Tools -All rights reserved. Please see niflib.h for licence. */ +All rights reserved. Please see niflib.h for license. */ #include "../../include/obj/hkPackedNiTriStripsData.h" #include "../../include/gen/hkTriangle.h" -- GitLab