diff --git a/include/nif_versions.h b/include/nif_versions.h index b491ba9cf5ea630e8c432c9522cf304c1904137c..4aee3f8f00b2dedca846212525dacb167074c36d 100644 --- a/include/nif_versions.h +++ b/include/nif_versions.h @@ -26,7 +26,7 @@ const unsigned VER_10_2_0_0 = 0x0A020000; /*!< NIF Version 10.2.0.0 */ const unsigned VER_20_0_0_4 = 0x14000004; /*!< NIF Version 20.0.0.4 */ const unsigned VER_20_0_0_5 = 0x14000005; /*!< NIF Version 20.0.0.4 */ const unsigned VER_20_1_0_3 = 0x14010003; /*!< NIF Version 20.1.0.3 */ -const unsigned VER_20_2_0_7 = 0x14010007; /*!< NIF Version 20.2.0.7 */ +const unsigned VER_20_2_0_7 = 0x14020007; /*!< NIF Version 20.2.0.7 */ const unsigned VER_20_3_0_3 = 0x14030003; /*!< NIF Version 20.3.0.3 */ const unsigned VER_20_3_0_6 = 0x14030006; /*!< NIF Version 20.3.0.6 */ const unsigned VER_UNSUPPORTED = 0xFFFFFFFF; /*!< Unsupported NIF Version */ diff --git a/include/obj/BSShaderNoLightingProperty.h b/include/obj/BSShaderNoLightingProperty.h index 163924d41c3c619ffdf99e4daf34e0ef34144e11..71aa19f82267c3c68c5007b1f2ad4b5e715929e6 100644 --- a/include/obj/BSShaderNoLightingProperty.h +++ b/include/obj/BSShaderNoLightingProperty.h @@ -54,6 +54,13 @@ public: NIFLIB_API virtual const Type & GetType() const; //--BEGIN MISC CUSTOM CODE--// + // The texture glow map. + // \return The current value. + string GetFileName() const; + + // The texture glow map. + // \param[in] value The new value. + void SetFileName( const string & value ); //--END CUSTOM CODE--// protected: diff --git a/include/obj/BSShaderPPLightingProperty.h b/include/obj/BSShaderPPLightingProperty.h index c4a9b89653aa463265609838182454e0ecf6b6ea..0b3b0939b6fd22c19cc937ecfc896a0d9aeb966f 100644 --- a/include/obj/BSShaderPPLightingProperty.h +++ b/include/obj/BSShaderPPLightingProperty.h @@ -60,6 +60,14 @@ public: //--BEGIN MISC CUSTOM CODE--// + // Texture Set + // \return The current value. + Ref<BSShaderTextureSet > GetTextureSet() const; + + // Texture Set + // \param[in] value The new value. + void SetTextureSet( Ref<BSShaderTextureSet > value ); + //--END CUSTOM CODE--// protected: /*! Texture Set */ diff --git a/include/obj/BSShaderProperty.h b/include/obj/BSShaderProperty.h index c22d720b866e9518c86681944a11521003ab1de5..97e43666acf952020e3c42169589fe64ce9f127b 100644 --- a/include/obj/BSShaderProperty.h +++ b/include/obj/BSShaderProperty.h @@ -55,6 +55,22 @@ public: //--BEGIN MISC CUSTOM CODE--// + // Unknown + // \return The current value. + unsigned short GetFlags() const; + + // Unknown + // \param[in] value The new value. + void SetFlags( unsigned short value ); + + // Unknown (Set to 0x21 for NoLighting, 0x11 for Water) + // \return The current value. + BSShaderType GetShaderType() const; + + // Unknown (Set to 0x21 for NoLighting, 0x11 for Water) + // \param[in] value The new value. + void SetShaderType( BSShaderType value ); + //--END CUSTOM CODE--// protected: /*! Unknown */ diff --git a/include/obj/BSShaderTextureSet.h b/include/obj/BSShaderTextureSet.h index c549d5e3aae32b01662e0686063a635415766064..d124f86f379628539ec620bf2ae8273c1fff6949 100644 --- a/include/obj/BSShaderTextureSet.h +++ b/include/obj/BSShaderTextureSet.h @@ -55,6 +55,23 @@ public: //--BEGIN MISC CUSTOM CODE--// + // Textures + // \return The current value. + vector<string > GetTextures() const; + + // Textures + // \param[in] value The new value. + void SetTextures( const vector<string >& value ); + + // Textures + // \return The current value. + string GetTexture( size_t i ) const; + + // Textures + // \param[in] i Index of texture to set + // \param[in] value The new value. + void SetTexture( size_t i, const string& value); + //--END CUSTOM CODE--// protected: /*! Number of Textures */ diff --git a/include/obj/Lighting30ShaderProperty.h b/include/obj/Lighting30ShaderProperty.h index 2a6560e9b3ccaab6c636585aae4c721dfd404eee..0ba0a9823506332283b247772608ae67f84710a2 100644 --- a/include/obj/Lighting30ShaderProperty.h +++ b/include/obj/Lighting30ShaderProperty.h @@ -53,6 +53,8 @@ public: */ NIFLIB_API virtual const Type & GetType() const; + //--This object has no eligable attributes. No example implementation generated--// + //--BEGIN MISC CUSTOM CODE--// //--END CUSTOM CODE--// diff --git a/include/obj/SkyShaderProperty.h b/include/obj/SkyShaderProperty.h index 374d5b1330bf8b70c3eb2cce81e62b3ca31708b4..49bbf5dc7527f49f4b68a5d9338ce5e73f48cd8e 100644 --- a/include/obj/SkyShaderProperty.h +++ b/include/obj/SkyShaderProperty.h @@ -55,6 +55,14 @@ public: //--BEGIN MISC CUSTOM CODE--// + // The texture. + // \return The current value. + string GetFileName() const; + + // The texture. + // \param[in] value The new value. + void SetFileName( const string & value ); + //--END CUSTOM CODE--// protected: /*! Unknown */ diff --git a/include/obj/TallGrassShaderProperty.h b/include/obj/TallGrassShaderProperty.h index a623f58aba815ba8e7c906cfd16fa73d0e44fe0e..64d87f9c904fd5ef8d5ffe8b4c7d22e608afdddf 100644 --- a/include/obj/TallGrassShaderProperty.h +++ b/include/obj/TallGrassShaderProperty.h @@ -55,6 +55,14 @@ public: //--BEGIN MISC CUSTOM CODE--// + // Texture file name + // \return The current value. + string GetFileName() const; + + // Texture file name + // \param[in] value The new value. + void SetFileName( const string & value ); + //--END CUSTOM CODE--// protected: /*! Texture file name */ diff --git a/include/obj/TileShaderProperty.h b/include/obj/TileShaderProperty.h index 55e8a2196f23b592a511993b2a7cadf9fc19baa0..2effcf873d80c0de445bd53b653b191e3f939906 100644 --- a/include/obj/TileShaderProperty.h +++ b/include/obj/TileShaderProperty.h @@ -55,6 +55,14 @@ public: //--BEGIN MISC CUSTOM CODE--// + // Texture file name + // \return The current value. + string GetFileName() const; + + // Texture file name + // \param[in] value The new value. + void SetFileName( const string & value ); + //--END CUSTOM CODE--// protected: /*! Texture file name */ diff --git a/src/obj/BSShaderNoLightingProperty.cpp b/src/obj/BSShaderNoLightingProperty.cpp index 4519ee89c5996875c26888aa2d2f74cfe8a5cf7d..b5a2cea1fd67bb60dd760959fded3549cb105d12 100644 --- a/src/obj/BSShaderNoLightingProperty.cpp +++ b/src/obj/BSShaderNoLightingProperty.cpp @@ -118,4 +118,12 @@ std::list<NiObjectRef> BSShaderNoLightingProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +string BSShaderNoLightingProperty::GetFileName() const { + return fileName; +} + +void BSShaderNoLightingProperty::SetFileName( const string & value ) { + fileName = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/BSShaderPPLightingProperty.cpp b/src/obj/BSShaderPPLightingProperty.cpp index 07f442e07047128e15e62726f9629b8253fe9222..87e8dac71c4b301690e68eb73fe9a3a76d318213 100644 --- a/src/obj/BSShaderPPLightingProperty.cpp +++ b/src/obj/BSShaderPPLightingProperty.cpp @@ -136,4 +136,12 @@ std::list<NiObjectRef> BSShaderPPLightingProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +Ref<BSShaderTextureSet > BSShaderPPLightingProperty::GetTextureSet() const { + return textureSet; +} + +void BSShaderPPLightingProperty::SetTextureSet( Ref<BSShaderTextureSet > value ) { + textureSet = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/BSShaderProperty.cpp b/src/obj/BSShaderProperty.cpp index 4d1054ba82deca8fc656c26af4c7250113877ee1..109426c8c0a6290e40e1ba70919b8fb8d4f908c3 100644 --- a/src/obj/BSShaderProperty.cpp +++ b/src/obj/BSShaderProperty.cpp @@ -114,4 +114,20 @@ std::list<NiObjectRef> BSShaderProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +unsigned short BSShaderProperty::GetFlags() const { + return flags; +} + +void BSShaderProperty::SetFlags( unsigned short value ) { + flags = value; +} + +BSShaderType BSShaderProperty::GetShaderType() const { + return shaderType; +} + +void BSShaderProperty::SetShaderType( BSShaderType value ) { + shaderType = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/BSShaderTextureSet.cpp b/src/obj/BSShaderTextureSet.cpp index a9e0e528c6fe0f4e5e163c05eff728038b71837e..be58b30f935438f950a08e048fa118049fba75fa 100644 --- a/src/obj/BSShaderTextureSet.cpp +++ b/src/obj/BSShaderTextureSet.cpp @@ -123,4 +123,24 @@ std::list<NiObjectRef> BSShaderTextureSet::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +vector<string > BSShaderTextureSet::GetTextures() const { + return textures; +} + +void BSShaderTextureSet::SetTextures( const vector<string >& value ) { + textures = value; +} + +string BSShaderTextureSet::GetTexture(size_t i) const { + if (i >= textures.size()) + throw runtime_error("Invalid Texture Index specified"); + return textures[i]; +} + +void BSShaderTextureSet::SetTexture( size_t i, const string& value) { + if (i >= textures.size()) + textures.resize(i+1); + textures[i] = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/Lighting30ShaderProperty.cpp b/src/obj/Lighting30ShaderProperty.cpp index df47be164a5a59e6f8cb15b1483900408b1fed36..054bc9bf4ed10b13cdecd86410497c037b121ef2 100644 --- a/src/obj/Lighting30ShaderProperty.cpp +++ b/src/obj/Lighting30ShaderProperty.cpp @@ -97,6 +97,8 @@ std::list<NiObjectRef> Lighting30ShaderProperty::GetRefs() const { return refs; } +//--This object has no eligable attributes. No example implementation generated--// + //--BEGIN MISC CUSTOM CODE--// //--END CUSTOM CODE--// diff --git a/src/obj/SkyShaderProperty.cpp b/src/obj/SkyShaderProperty.cpp index 6127a43d28d6f61c730cbdb55191e6807a96493a..407f23a85972dc98bd641fbe9743fcc9a03b483a 100644 --- a/src/obj/SkyShaderProperty.cpp +++ b/src/obj/SkyShaderProperty.cpp @@ -108,4 +108,12 @@ std::list<NiObjectRef> SkyShaderProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +string SkyShaderProperty::GetFileName() const { + return fileName; +} + +void SkyShaderProperty::SetFileName( const string & value ) { + fileName = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/TallGrassShaderProperty.cpp b/src/obj/TallGrassShaderProperty.cpp index 5f957a747e2f9ec8c8fc7585dd569d2fe84ffe25..829f131405a35ac2f1c1726bd6f2908664485434 100644 --- a/src/obj/TallGrassShaderProperty.cpp +++ b/src/obj/TallGrassShaderProperty.cpp @@ -102,4 +102,12 @@ std::list<NiObjectRef> TallGrassShaderProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +string TallGrassShaderProperty::GetFileName() const { + return fileName; +} + +void TallGrassShaderProperty::SetFileName( const string & value ) { + fileName = value; +} + //--END CUSTOM CODE--// diff --git a/src/obj/TileShaderProperty.cpp b/src/obj/TileShaderProperty.cpp index 21e9b61d6e03c0e3cb75d4cc51547d69c812686b..9bb553cf093c694f0d9f09283adbcf80ca6e1448 100644 --- a/src/obj/TileShaderProperty.cpp +++ b/src/obj/TileShaderProperty.cpp @@ -102,4 +102,12 @@ std::list<NiObjectRef> TileShaderProperty::GetRefs() const { //--BEGIN MISC CUSTOM CODE--// +string TileShaderProperty::GetFileName() const { + return fileName; +} + +void TileShaderProperty::SetFileName( const string & value ) { + fileName = value; +} + //--END CUSTOM CODE--//