Merge branch 'development' into exposeeffectstrength

Author: Causeless

CHANGELOG.md

@@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Added `HDFirearm` lua bindings `EjectionOffset` (R/W) and `EjectionPos` (R). Work similarly to their Muzzle variants.
 
+- New `MovableObject` Lua functions `GetScreenEffectPath()` and `SetScreenEffectPath(string pathToFile)`, which get and set the file path to the object's screen effect.
+
 - Exposed `MovableObject` INI properties `EffectStartStrength` and `EffectStopStrength` to Lua (R/W). Default range in Lua is a float from 0-1 (0%-100%), but going outside of this range is possible.
 
 - New `MovableObject` Lua function `SetEffectStrength(float strength)`, which sets both `EffectStartStrength` and `EffectStopStrength` to the given value in order to simplify setting glow strength to a specific value.
@@ -2504,4 +2506,4 @@ Note: For a log of changes made prior to the commencement of the open source com
 [Release v5.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre5.2
 [Release v6.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project/releases/tag/v6.0.0
 [Release v6.1.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project/releases/tag/v6.1.0
-[Unreleased]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/compare/master...cortex-command-community:development
+[Unreleased]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/compare/master...cortex-command-community:development

Source/Entities/MovableObject.h

@@ -385,6 +385,18 @@ namespace RTE {
 		/// @param newAngle The new absolute angle in radians.
 		void SetEffectRotAngle(float newAngle) { m_EffectRotAngle = newAngle; }
 
+		/// Gets the file path of this MovableObject's current screen effect.
+		/// @return A string containing the file path of the screen effect.
+		std::string GetScreenEffectPath() const { return m_ScreenEffectFile.GetDataPath(); }
+
+		/// Gets the file path of this MovableObject's current screen effect.
+		/// @param pathToFile A string containing the file path of the new screen effect.
+		void SetScreenEffectPath(std::string pathToFile) {
+			m_ScreenEffectFile.SetDataPath(pathToFile);
+			m_pScreenEffect = m_ScreenEffectFile.GetAsBitmap();
+			m_ScreenEffectHash = m_ScreenEffectFile.GetHash();
+		}
+
 		/// Gets the current absolute angle of rotation of this MovableObject's effect.
 		/// @return The absolute angle in radians.
 		float GetEffectRotAngle() const { return m_EffectRotAngle; }

Source/Lua/LuaBindingsEntities.cpp

@@ -991,7 +991,9 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	    .def("SendMessage", &LuaAdaptersMovableObject::SendMessage1)
 	    .def("SendMessage", &LuaAdaptersMovableObject::SendMessage2)
 	    .def("RequestSyncedUpdate", &MovableObject::RequestSyncedUpdate)
-	    .def("SetEffectStrength", &MovableObject::SetEffectStrength);
+	    .def("SetEffectStrength", &MovableObject::SetEffectStrength)
+	    .def("GetScreenEffectPath", &MovableObject::GetScreenEffectPath)
+	    .def("SetScreenEffectPath", &MovableObject::SetScreenEffectPath);
 }
 
 LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, PEmitter) {