- Improve flags in App::Property.

- Add basic support for ObstacleManager and cObstacle.
- Fix cJob functions.

Author: emd4600

Spore ModAPI/SourceCode/App/App.cpp

@@ -9,6 +9,8 @@
 #include <Spore\App\ConfigManager.h>
 #include <Spore\App\IStateManager.h>
 #include <Spore\App\cAppSystem.h>
+#include <Spore\App\cJob.h>
+#include <Spore\App\JobManager.h>
 #endif
 #include <Spore\App\CommandLine.h>
 
@@ -105,6 +107,33 @@ namespace App
 
 	auto_METHOD_VOID(cCreatureModeStrategy, ExecuteAction, Args(uint32_t actionID, void* actionData), Args(actionID, actionData));
 
+	/// cJob ///
+
+	auto_STATIC_METHOD_(IJobManager, IJobManager*, Get);
+
+	auto_METHOD_(cJob, int, AddRef);
+	auto_METHOD_(cJob, int, Release);
+
+	void cJob::SetMethodCallback(cJobCallback callback, void* object) {
+		this->mCallback = callback;
+		this->mpCallbackObject = object;
+	}
+
+	auto_METHOD_VOID(cJob, AddDependency, Args(cJob* other), Args(other));
+	auto_METHOD_VOID(cJob, AddWeakDependency, Args(cJob* other), Args(other));
+
+	auto_METHOD_VOID_(cJob, Wait);
+	auto_METHOD_VOID(cJob, Cancel, Args(bool wait), Args(wait));
+	auto_METHOD_VOID_(cJob, Resume);
+
+	auto_METHOD_VOID(cJob, Continuation, Args(cJobVoidCallback callback, void* object), Args(callback, object));
+
+	auto_METHOD_(cJob, int, GetStatus);
+
+	void cJob::SetThreadAffinity(uint32_t affinity) {
+		this->mThreadAffinity = affinity;
+	}
+
 #endif
 
 

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -110,6 +110,7 @@
 #include <Spore\Simulator\SubSystem\BundleManager.h>
 #include <Spore\Simulator\SubSystem\GamePlantManager.h>
 #include <Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h>
+#include <Spore\Simulator\SubSystem\ObstacleManager.h>
 #include <Spore\Simulator\NounClassFactories.h>
 
 namespace Addresses(Simulator)
@@ -1176,6 +1177,10 @@ namespace Simulator
 	namespace Addresses(cUIAssetDiscoveryManager) {
 		DefineAddress(Get, SelectAddress(0xB3D450, 0xB3D5F0));
 	}
+
+	namespace Addresses(cObstacleManager) {
+		DefineAddress(Get, SelectAddress(0xB3D320, 0xB3D4C0));
+	}
 }
 
 #ifdef SDK_TO_GHIDRA

Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp

@@ -11,6 +11,7 @@
 #include <Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h>
 #include <Spore\Simulator\SubSystem\CinematicManager.h>
 #include <Spore\Simulator\SubSystem\GamePlantManager.h>
+#include <Spore\Simulator\SubSystem\ObstacleManager.h>
 #include <Spore\Simulator\cDefaultToolProjectile.h>
 #include <Spore\Simulator\cArtilleryProjectile.h>
 #include <Spore\Simulator\cCulturalProjectile.h>
@@ -229,6 +230,10 @@ namespace Simulator
 	/// UIAssetDiscoveryManager ///
 
 	auto_STATIC_METHOD_(cUIAssetDiscoveryManager, cUIAssetDiscoveryManager*, Get);
+
+	/// ObstacleManager ///
+
+	auto_STATIC_METHOD_(cObstacleManager, cObstacleManager*, Get);
 }
 
 #endif

Spore ModAPI/Spore ModAPI.vcxproj

@@ -329,11 +329,13 @@
     <ClInclude Include="Spore\App\Thumbnail_cImportExport.h" />
     <ClInclude Include="Spore\Resource\FakeRecord.h" />
     <ClInclude Include="Spore\Simulator\cBaseSimulatorInputStrategy.h" />
+    <ClInclude Include="Spore\Simulator\cObstacle.h" />
     <ClInclude Include="Spore\Simulator\cTribeInputStrategy.h" />
     <ClInclude Include="Spore\Simulator\cTribeToolData.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\BundleManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\CinematicManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\GamePlantManager.h" />
+    <ClInclude Include="Spore\Simulator\SubSystem\ObstacleManager.h" />
     <ClInclude Include="Spore\Simulator\SubSystem\UIAssetDiscoveryManager.h" />
     <ClInclude Include="Spore\Simulator\UIStateMachine.h" />
     <ClInclude Include="Spore\BasicIncludes.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -2229,6 +2229,12 @@
     <ClInclude Include="Spore\UI\AssetBrowserAssetGridUI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\Simulator\cObstacle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Spore\Simulator\SubSystem\ObstacleManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/App/Property.h

@@ -105,8 +105,17 @@ namespace App
 	public:
 		enum PropertyFlags
 		{
-			kPropertyFlagNotDirect = 0x10,
-			kPropertyFlagArray = 0x30
+			/// If set, when the property object is destroyed, it will try to cleanup memory
+			kPropertyFlagCleanup = 4,
+			/// If set, the data is stored in a separate buffer, pointed at by the fields in PropertyArray
+			kPropertyFlagPointer = 0x10,
+			/// If set, the property will not deallocate memory pointed by it; if not set, the pointer memory will be deleted when the property is destroyed
+			kPropertyFlagSkipDealloc = 0x20,
+
+			/// Combination of flags for array properties that must copy their origin data, and must clean it up on delete
+			kPropertyFlagArrayByCopy = kPropertyFlagPointer | kPropertyFlagCleanup,
+			/// Combination of flags for array properties whose data is a reference to memory managed by other code, and must not copy nor delete that memory
+			kPropertyFlagArrayByReference = kPropertyFlagPointer | kPropertyFlagSkipDealloc,
 		};
 
 	public:
@@ -392,120 +401,135 @@ namespace App
 		/// This will be an array bool property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayBool(const bool* pValues, size_t nValueCount);
+		Property& SetArrayBool(const bool* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of int32_t values.
 		/// This will be an array int32 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayInt32(const int32_t* pValues, size_t nValueCount);
+		Property& SetArrayInt32(const int32_t* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of uint32_t values.
 		/// This will be an array uint32 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayUInt32(const uint32_t* pValues, size_t nValueCount);
+		Property& SetArrayUInt32(const uint32_t* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of float values.
 		/// This will be an array float property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayFloat(const float* pValues, size_t nValueCount);
+		Property& SetArrayFloat(const float* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of ResourceKey values.
 		/// This will be an array key property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayKey(const ResourceKey* pValues, size_t nValueCount);
+		Property& SetArrayKey(const ResourceKey* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to the an array of eastl::string8 values.
 		/// This will be an array eastl::string8 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayString8(const eastl::string8* pValues, size_t nValueCount);
+		Property& SetArrayString8(const eastl::string8* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of eastl::string16 values.
 		/// This will be an array eastl::string16 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayString16(const eastl::string16* pValues, size_t nValueCount);
+		Property& SetArrayString16(const eastl::string16* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of BoundingBox values.
 		/// This will be an array bbox property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayBBox(const BoundingBox* pValues, size_t nValueCount);
+		Property& SetArrayBBox(const BoundingBox* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Transform values.
 		/// This will be an array transform property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayTransform(const Transform* pValues, size_t nValueCount);
+		Property& SetArrayTransform(const Transform* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of LocalizedString values.
 		/// This will be an array text property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayText(const LocalizedString* pValues, size_t nValueCount);
+		Property& SetArrayText(const LocalizedString* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Math::Vector2 values.
 		/// This will be an array vector2 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayVector2(const Vector2* pValues, size_t nValueCount);
+		Property& SetArrayVector2(const Vector2* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Math::Vector3 values.
 		/// This will be an array vector3 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayVector3(const Vector3* pValues, size_t nValueCount);
+		Property& SetArrayVector3(const Vector3* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Math::Vector4 values.
 		/// This will be an array vector4 property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayVector4(const Vector4* pValues, size_t nValueCount);
+		Property& SetArrayVector4(const Vector4* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Math::ColorRGB values.
 		/// This will be an array colorRGB property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayColorRGB(const ColorRGB* pValues, size_t nValueCount);
+		Property& SetArrayColorRGB(const ColorRGB* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///
 		/// Sets the value of this Property to an array of Math::ColorRGBA values.
 		/// This will be an array colorRGBA property of 'nValueCount' values.
 		/// @param pValues The array with the values.
 		/// @param nValueCount How many values the array has.
+		/// @param flags Set of flags for the property; by default, it makes the array a reference to the given memory
 		///
-		Property& SetArrayColorRGBA(const ColorRGBA* pValues, size_t nValueCount);
+		Property& SetArrayColorRGBA(const ColorRGBA* pValues, size_t nValueCount, int flags = kPropertyFlagArrayByReference);
 
 		///@}
 
@@ -1179,64 +1203,64 @@ namespace App
 	//TODO Bounding boxes?
 
 
-	inline Property& Property::SetArrayBool(const bool* pValues, size_t nValueCount) {
-		Set(PropertyType::Bool, kPropertyFlagArray, (void*) pValues, sizeof(bool), nValueCount);
+	inline Property& Property::SetArrayBool(const bool* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Bool, flags, (void*) pValues, sizeof(bool), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayInt32(const int32_t* pValues, size_t nValueCount) {
-		Set(PropertyType::Int32, kPropertyFlagArray, (void*)pValues, sizeof(int32_t), nValueCount);
+	inline Property& Property::SetArrayInt32(const int32_t* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Int32, flags, (void*)pValues, sizeof(int32_t), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayUInt32(const uint32_t* pValues, size_t nValueCount) {
-		Set(PropertyType::UInt32, kPropertyFlagArray, (void*)pValues, sizeof(uint32_t), nValueCount);
+	inline Property& Property::SetArrayUInt32(const uint32_t* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::UInt32, flags, (void*)pValues, sizeof(uint32_t), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayFloat(const float* pValues, size_t nValueCount) {
-		Set(PropertyType::Float, kPropertyFlagArray, (void*)pValues, sizeof(float), nValueCount);
+	inline Property& Property::SetArrayFloat(const float* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Float, flags, (void*)pValues, sizeof(float), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayKey(const ResourceKey* pValues, size_t nValueCount) {
-		Set(PropertyType::Key, kPropertyFlagArray, (void*)pValues, sizeof(ResourceKey), nValueCount);
+	inline Property& Property::SetArrayKey(const ResourceKey* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Key, flags, (void*)pValues, sizeof(ResourceKey), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayString8(const eastl::string8* pValues, size_t nValueCount) {
-		Set(PropertyType::String8, kPropertyFlagArray, (void*)pValues, sizeof(eastl::string8), nValueCount);
+	inline Property& Property::SetArrayString8(const eastl::string8* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::String8, flags, (void*)pValues, sizeof(eastl::string8), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayString16(const eastl::string16* pValues, size_t nValueCount) {
-		Set(PropertyType::String16, kPropertyFlagArray, (void*)pValues, sizeof(eastl::string16), nValueCount);
+	inline Property& Property::SetArrayString16(const eastl::string16* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::String16, flags, (void*)pValues, sizeof(eastl::string16), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayBBox(const BoundingBox* pValues, size_t nValueCount) {
-		Set(PropertyType::BBox, kPropertyFlagArray, (void*)pValues, sizeof(BoundingBox), nValueCount);
+	inline Property& Property::SetArrayBBox(const BoundingBox* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::BBox, flags, (void*)pValues, sizeof(BoundingBox), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayTransform(const Transform* pValues, size_t nValueCount) {
-		Set(PropertyType::Transform, kPropertyFlagArray, (void*)pValues, sizeof(Transform), nValueCount);
+	inline Property& Property::SetArrayTransform(const Transform* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Transform, flags, (void*)pValues, sizeof(Transform), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayText(const LocalizedString* pValues, size_t nValueCount) {
-		Set(PropertyType::Text, kPropertyFlagArray, (void*)pValues, sizeof(LocalizedString), nValueCount);
+	inline Property& Property::SetArrayText(const LocalizedString* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Text, flags, (void*)pValues, sizeof(LocalizedString), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayVector2(const Vector2* pValues, size_t nValueCount) {
-		Set(PropertyType::Vector2, kPropertyFlagArray, (void*)pValues, sizeof(Vector2), nValueCount);
+	inline Property& Property::SetArrayVector2(const Vector2* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Vector2, flags, (void*)pValues, sizeof(Vector2), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayVector3(const Vector3* pValues, size_t nValueCount) {
-		Set(PropertyType::Vector3, kPropertyFlagArray, (void*)pValues, sizeof(Vector3), nValueCount);
+	inline Property& Property::SetArrayVector3(const Vector3* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Vector3, flags, (void*)pValues, sizeof(Vector3), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayVector4(const Vector4* pValues, size_t nValueCount) {
-		Set(PropertyType::Vector4, kPropertyFlagArray, (void*)pValues, sizeof(Vector4), nValueCount);
+	inline Property& Property::SetArrayVector4(const Vector4* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::Vector4, flags, (void*)pValues, sizeof(Vector4), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayColorRGB(const ColorRGB* pValues, size_t nValueCount) {
-		Set(PropertyType::ColorRGB, kPropertyFlagArray, (void*)pValues, sizeof(ColorRGB), nValueCount);
+	inline Property& Property::SetArrayColorRGB(const ColorRGB* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::ColorRGB, flags, (void*)pValues, sizeof(ColorRGB), nValueCount);
 		return *this;
 	}
-	inline Property& Property::SetArrayColorRGBA(const ColorRGBA* pValues, size_t nValueCount) {
-		Set(PropertyType::ColorRGBA, kPropertyFlagArray, (void*)pValues, sizeof(ColorRGBA), nValueCount);
+	inline Property& Property::SetArrayColorRGBA(const ColorRGBA* pValues, size_t nValueCount, int flags) {
+		Set(PropertyType::ColorRGBA, flags, (void*)pValues, sizeof(ColorRGBA), nValueCount);
 		return *this;
 	}
 

Spore ModAPI/Spore/App/ScenarioMode.h

@@ -70,7 +70,7 @@ namespace App
 		/* 1Ch */	int mpScenarioUI;  // Simulator::ScenarioModeUI ?
 		/* 20h */	GameInput mInput;
 		/* 68h */	int field_68;
-		/* 6Ch */	int field_6C;  // another UI?
+		/* 6Ch */	int mpScenarioDisplayStrategy;  // another UI?
 		/* 70h */	int field_70;
 		/* 74h */	cScenarioDataPtr mpData;
 		/* 78h */	cScenarioPlayModePtr mpPlayMode;