Added cJob and JobManager

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesApp.cpp

@@ -13,6 +13,8 @@
 #include <Spore\App\IMessageManager.h>
 #include <Spore\App\IPropManager.h>
 #include <Spore\App\IClassManager.h>
+#include <Spore\App\JobManager.h>
+#include <Spore\App\cJob.h>
 //#include <Spore\App\IStateManager.h>
 #include <Spore\App\Property.h>
 #include <Spore\App\PropertyList.h>
@@ -386,5 +388,23 @@ namespace App
 	{
 		DefineAddress(Get, SelectAddress(0x67DF80, , 0x67DE20));
 	}
+
+	namespace Addresses(IJobManager)
+	{
+		DefineAddress(Get, SelectAddress(0x68F980, , 0x68F490));
+	}
+
+	namespace Addresses(cJob)
+	{
+		DefineAddress(AddRef, SelectAddress(0x68FE20, , 0x68F910));
+		DefineAddress(Release, SelectAddress(0x690540, , 0x6900E0));
+		DefineAddress(AddDependency, SelectAddress(0x6915D0, , 0x691340));
+		DefineAddress(AddWeakDependency, SelectAddress(0x691610, , 0x691380));
+		DefineAddress(Wait, SelectAddress(0x692900, , 0x692670));
+		DefineAddress(Cancel, SelectAddress(0x692650, , 0x6923C0));
+		DefineAddress(Resume, SelectAddress(0x690DD0, , 0x690970));
+		DefineAddress(Continuation, SelectAddress(0x68FE80, , 0x68F9B0));
+		DefineAddress(GetStatus, SelectAddress(0x68FE40, , 0x68F930));
+	}
 }
 #endif

Spore ModAPI/SourceCode/DLL/TextureOverride.cpp

@@ -51,7 +51,7 @@ class ReplacedModelInstance
 Graphics::cModelInstance* CopyMesh(Graphics::cModelInstance* mesh) {
 	Graphics::cModelInstance* copy = new Graphics::cModelInstance();
 	copy->mMeshes = mesh->mMeshes;
-	copy->field_1C = mesh->field_1C;
+	copy->mBoneRanges = mesh->mBoneRanges;
 	copy->mMaterialInfos = mesh->mMaterialInfos;
 	copy->mRegionMaterialInfos = mesh->mRegionMaterialInfos;
 	copy->field_70 = mesh->field_70;

Spore ModAPI/Spore ModAPI.vcxproj

@@ -313,6 +313,7 @@
     <ClInclude Include="Spore\App\GameSpace.h" />
     <ClInclude Include="Spore\App\ITokenTranslator.h" />
     <ClInclude Include="Spore\App\IDGenerator.h" />
+    <ClInclude Include="Spore\App\JobManager.h" />
     <ClInclude Include="Spore\App\Thumbnail_cImportExport.h" />
     <ClInclude Include="Spore\BasicIncludes.h" />
     <ClInclude Include="Spore\CppRevEng.h" />

Spore ModAPI/Spore ModAPI.vcxproj.filters

@@ -1926,6 +1926,9 @@
     <ClInclude Include="Spore\Skinner\cSkinPainter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Spore\App\JobManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">

Spore ModAPI/Spore/App/JobManager.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <Spore\App\cJob.h>
+#include <Spore\Internal.h>
+
+#define JobManager (*App::IJobManager::Get())
+
+namespace App
+{
+	class cJobThread;  //TODO
+	class LimitStopwatch;  //TODO
+
+	class IJobManager
+	{
+	public:
+		/* 00h */	virtual ~IJobManager() = 0;
+		/* 04h */	virtual bool Initialize() = 0;
+		/* 08h */	virtual void PreShutdown() = 0;
+		/* 0Ch */	virtual void Dispose() = 0;
+		/* 10h */	virtual bool CreateJob(cJob*& pDst) = 0;
+		/* 14h */	virtual cJobThread* CreateJobThread(int, bool, int) = 0;
+		/* 18h */	virtual void DestroyJobThread(cJobThread* thread) = 0;
+		/* 1Ch */	virtual bool Run(cJobThread* thread, LimitStopwatch* stopwatch = nullptr, bool = false) = 0;
+		/* 20h */	virtual void Lock() = 0;
+		/* 24h */	virtual void Unlock() = 0;
+		/* 28h */	virtual void RaiseThreadPriorities(int priority) = 0;
+		/* 2Ch */	virtual void RestoreThreadPriorities() = 0;
+		/* 30h */	virtual bool CircularRef(cJob* job1, cJob* job2) = 0;
+		/* 34h */	virtual bool JobsAreActive(int) = 0;
+		/* 38h */	virtual void DebugDumpStatus() = 0;  // does nothing
+		/* 3Ch */	virtual void DebugDumpDot(int) = 0;  // does nothing
+		/* 40h */	virtual void DebugAddBackgroundScopes() = 0;  // does nothing
+
+		static IJobManager* Get();
+	};
+
+	namespace Addresses(IJobManager)
+	{
+		DeclareAddress(Get);  // 0x68F980 0x68F490
+	}
+}

Spore ModAPI/Spore/App/cJob.h

@@ -2,5 +2,60 @@
 
 namespace App
 {
-	class cJob;  // TODO
+	class cJob;
+
+	typedef bool(*cJobCallback)(cJob*, void*);
+
+	class cJob
+	{
+		// We only care about the methods, not the fields
+
+		int AddRef();
+		int Release();
+
+		/// Sets the method that is called to execute this job.
+		/// @param callback
+		/// @param object Additional parameter that is passed to the callback method.
+		void SetMethodCallback(cJobCallback callback, void* object);
+
+		void AddDependency(cJob* other);
+		void AddWeakDependency(cJob* other);
+
+		/// Blocks the current thread until this job finishes executing.
+		void Wait();
+
+		/// Cancels the execution of the job.
+		/// @param wait
+		void Cancel(bool wait);
+
+		void Resume();
+
+		/// Sets a function that must be executed when the job finishes.
+		/// @param callback Function that will be executed
+		/// @param data Additional data that is passed to the function.
+		void Continuation(void(*callback)(cJob*, void*), void* data);
+
+		int GetStatus();
+
+		void SetThreadAffinity(uint32_t affinity = 0x80000000);
+
+	public:
+		/* 00h */	cJobCallback mCallback;
+		/* 04h */	void* mpCallbackObject;
+		/* 08h */	char padding[0x18 - 0x8];
+		/* 18h */	uint32_t mThreadAffinity;
+	};
+
+	namespace Addresses(cJob)
+	{
+		DeclareAddress(AddRef);  // 0x68FE20 0x68F910
+		DeclareAddress(Release);  // 0x690540 0x6900E0
+		DeclareAddress(AddDependency);  // 0x6915D0 0x691340
+		DeclareAddress(AddWeakDependency);  // 0x691610 0x691380
+		DeclareAddress(Wait);  // 0x692900 0x692670
+		DeclareAddress(Cancel);  // 0x692650 0x6923C0
+		DeclareAddress(Resume);  // 0x690DD0 0x690970
+		DeclareAddress(Continuation);  // 0x68FE80 0x68F9B0
+		DeclareAddress(GetStatus);  // 0x68FE40 0x68F930
+	}
 }

Spore ModAPI/Spore/Object.h

@@ -150,7 +150,7 @@ class MultithreadObject
 class RefCountTemplate
 {
 public:
-	virtual ~RefCountTemplate();
+	virtual ~RefCountTemplate() {};
 
 	int AddRef();
 	int Release();
@@ -162,7 +162,7 @@ class RefCountTemplate
 class RefCountTemplateAtomic
 {
 public:
-	virtual ~RefCountTemplateAtomic();
+	virtual ~RefCountTemplateAtomic() {};
 
 	int AddRef();
 	int Release();