Skip to content

Booster - #70

Merged
ccp-intern merged 30 commits into
mainfrom
booster
Aug 27, 2026
Merged

ccp-intern merged 30 commits into
mainfrom
booster

Conversation

@ccp-intern

Copy link
Copy Markdown
Member

Modular ship booster
https://fenriscreations.atlassian.net/browse/PLAT-11609

Added EveChildBoosterSet based on BoosterSet2. Refactored common functionality into EveBoosterUtilities.
Unlike BoosterSet2, EveChildBoosterSet uses SV_InstanceID instead of putting instance data into the vertices.
To make it gdpr compatible, it repurposes Tr2RingBuffer and auto-registers it, akin to how morph targets were made gdpr compatible.

Upon request:

  • EveChildBoosterSet have individual intensity controls.
  • The ability to use different shaders for different booster sets has been added to EveChildBoosterSet.
  • Trails have been cut from EveChildBoosterSet.
  • Multiple EveChildBoosterSet can be addressed by the same event through SetControllerVariable.
  • Instancing support

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
index 64438ad..f62873c 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
+++ b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
@@ -96 +96 @@ bool EveChildBoosterSet::OnModified( Be::Var* value )
-//   
+//
@@ -98 +98 @@ bool EveChildBoosterSet::OnModified( Be::Var* value )
-//   updateContext - 
+//   updateContext -
@@ -365 +365 @@ void EveChildBoosterSet::RenderDebugInfo( ITr2DebugRenderer2& renderer )
-	}	
+	}
@@ -445 +445 @@ void EveChildBoosterSet::GetLights( Tr2LightManager& lightManager ) const
-	EveBoosterLightParams params { m_lightWarpRadius, m_lightWarpColor, m_lightRadius, m_lightColor, m_lightFlickerAmplitude, m_lightFlickerFrequency };
+	EveBoosterLightParams params{ m_lightWarpRadius, m_lightWarpColor, m_lightRadius, m_lightColor, m_lightFlickerAmplitude, m_lightFlickerFrequency };
diff --git a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
index 3ab9ad7..4c45b32 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
+++ b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
@@ -181 +181 @@ private:
-	
+
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
index b7e6ab7..b9d35a9 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
@@ -3022 +3022 @@ void EveSOF::SetupChildBoosters( EveChildContainerPtr child, const EveSOFDNAPtr 
-	
+

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 24, 2026 13:14

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
index 22de0ad..d545031 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
+++ b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.cpp
@@ -96 +96 @@ bool EveChildBoosterSet::OnModified( Be::Var* value )
-//   
+//
@@ -98 +98 @@ bool EveChildBoosterSet::OnModified( Be::Var* value )
-//   updateContext - 
+//   updateContext -
@@ -364 +364 @@ void EveChildBoosterSet::RenderDebugInfo( ITr2DebugRenderer2& renderer )
-	}	
+	}
@@ -444 +444 @@ void EveChildBoosterSet::GetLights( Tr2LightManager& lightManager ) const
-	EveBoosterLightParams params { m_lightWarpRadius, m_lightWarpColor, m_lightRadius, m_lightColor, m_lightFlickerAmplitude, m_lightFlickerFrequency };
+	EveBoosterLightParams params{ m_lightWarpRadius, m_lightWarpColor, m_lightRadius, m_lightColor, m_lightFlickerAmplitude, m_lightFlickerFrequency };
diff --git a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
index 3ab9ad7..4c45b32 100644
--- a/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
+++ b/trinity/Eve/SpaceObject/Children/EveChildBoosterSet.h
@@ -181 +181 @@ private:
-	
+
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
index b7e6ab7..b9d35a9 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp
@@ -3022 +3022 @@ void EveSOF::SetupChildBoosters( EveChildContainerPtr child, const EveSOFDNAPtr 
-	
+

Have any feedback or feature suggestions? Share it here.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions
github-actions Bot dismissed their stale review August 24, 2026 13:17

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 26, 2026 08:29

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 26, 2026 08:46

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 26, 2026 09:18

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 27, 2026 01:47

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 27, 2026 01:54

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

@github-actions
github-actions Bot dismissed their stale review August 27, 2026 02:28

outdated suggestion

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-linter Review

Used clang-format v21.1.8

Click here for the full clang-format patch
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
index b25ddf5..a5db8bd 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.cpp
@@ -85,11 +85,11 @@ EveSOFDataParameter::EveSOFDataParameter( IRoot* lockobj ) :
-#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue )		\
-_className::_className( IRoot* lockobj ) :								\
-	EveSOFDataParameter( lockobj ),										\
-	m_value( _defaultValue )											\
-{																		\
-}																		\
-																		\
-Vector4 _className::GetValue() const								    \
-{																		\
-	return _returnValue;												\
-}
+#define SOF_PARAM_DEFINE( _className, _defaultValue, _returnValue ) \
+	_className::_className( IRoot* lockobj ) :                      \
+		EveSOFDataParameter( lockobj ),                             \
+		m_value( _defaultValue )                                    \
+	{                                                               \
+	}                                                               \
+                                                                    \
+	Vector4 _className::GetValue() const                            \
+	{                                                               \
+		return _returnValue;                                        \
+	}
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData.h b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
index 1e39a29..279a4aa 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData.h
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData.h
@@ -41,12 +41,12 @@ BLUE_DECLARE_VECTOR( EveSOFDataParameter );
-#define SOF_PARAM_DECLARE( _className, _valueType )									  \
-	BLUE_CLASS( _className ) :                                                        \
-		public EveSOFDataParameter							                          \
-	{                                                                                 \
-	public:                                                                           \
-		EXPOSE_TO_BLUE();                                                             \
-		_className( IRoot* lockobj = nullptr );                                       \
-		Vector4 GetValue() const override;		                                      \
-                                                                                      \
-	private:                                                                          \
-		_valueType m_value;                                                           \
-	};                                                                                \
+#define SOF_PARAM_DECLARE( _className, _valueType ) \
+	BLUE_CLASS( _className ) :                      \
+		public EveSOFDataParameter                  \
+	{                                               \
+	public:                                         \
+		EXPOSE_TO_BLUE();                           \
+		_className( IRoot* lockobj = nullptr );     \
+		Vector4 GetValue() const override;          \
+                                                    \
+	private:                                        \
+		_valueType m_value;                         \
+	};                                              \
diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
index 1a829df..cff743b 100644
--- a/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
+++ b/trinity/Eve/SpaceObjectFactory/EveSOFData_Blue2.cpp
@@ -20,11 +20,12 @@ const Be::ClassInfo* EveSOFDataParameter::ExposeToBlue(){
-#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )													\
-BLUE_DEFINE( _className );																							\
-const Be::ClassInfo* _className::ExposeToBlue(){																	\
-	EXPOSURE_BEGIN( _className, "" )																				\
-		MAP_INTERFACE( _className )																					\
-		MAP_INTERFACE( EveSOFDataParameter )																		\
-																													\
-		MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )											\
-		MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST )							\
-	EXPOSURE_END()																									\
-}
+#define SOF_PARAM_EXPOSE_TO_BLUE( _className, _valueDescription )                             \
+	BLUE_DEFINE( _className );                                                                \
+	const Be::ClassInfo* _className::ExposeToBlue()                                           \
+	{                                                                                         \
+		EXPOSURE_BEGIN( _className, "" )                                                      \
+			MAP_INTERFACE( _className )                                                       \
+			MAP_INTERFACE( EveSOFDataParameter )                                              \
+                                                                                              \
+			MAP_ATTRIBUTE( "name", m_name, "", Be::READWRITE | Be::PERSIST )                  \
+			MAP_ATTRIBUTE( "value", m_value, _valueDescription, Be::READWRITE | Be::PERSIST ) \
+		EXPOSURE_END()                                                                        \
+	}

Have any feedback or feature suggestions? Share it here.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions
github-actions Bot dismissed their stale review August 27, 2026 02:37

outdated suggestion

@ccp-intern
ccp-intern merged commit 8db83a7 into main Aug 27, 2026
14 checks passed
Selph added a commit that referenced this pull request Sep 18, 2026
Resolves the overlap between this branch's booster persistence work and
main's "Booster (#70)", which refactored shared booster code out of
EveBoosterSet2 into EveBoosterUtilities.

Both sides rewrote the same functions for different reasons, so the
resolution keeps this branch's persisted EveBoosterItem structure list
and adopts main's extracted helpers:

- CreateFlares() is dropped in favour of CreateBoosterFlares(), called
  with item.transform and GetFlareParams().
- ComputeBoosterLight() uses GenerateBoosterLightPhase() instead of the
  g_lightNoise globals, which main moved into EveBoosterUtilities.cpp.
- GetLights() delegates to AddBoosterLights(). BoosterLight's fields are
  renamed to lightPosition/lightRadius/lightPhase to satisfy that
  template, so m_boosterLights can be passed where m_singleBoosters was.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants