Added NPCTickAI(), AvatarTickAI() in cCreatureAnimal. Added CreaturePersonality enum.

emd4600 · emd4600 · commit 66c82bd44ad0 · 2023-06-22T17:49:12.000+02:00
diff --git a/Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp b/Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp
@@ -159,6 +159,8 @@ namespace Simulator
 	namespace Addresses(cCreatureAnimal) 
 	{
 		DefineAddress(Create, SelectAddress(0xC092A0, 0xC09B40));
+		DefineAddress(NPCTickAI, SelectAddress(0xC08CD0, 0xC09570));
+		DefineAddress(AvatarTickAI, SelectAddress(0xC03710, 0xC04020));
 	}
 
 	namespace Addresses(cCreatureBase)
diff --git a/Spore ModAPI/SourceCode/Simulator/cCreatureAnimal.cpp b/Spore ModAPI/SourceCode/Simulator/cCreatureAnimal.cpp
@@ -80,5 +80,9 @@ namespace Simulator
 	auto_METHOD(cCreatureBase, int, PlayVoice,
 		Args(const char* pName, int param2, int param3),
 		Args(pName, param2, param3));
+
+
+	auto_METHOD_VOID(cCreatureAnimal, NPCTickAI, Args(float f), Args(f));
+	auto_METHOD_VOID(cCreatureAnimal, AvatarTickAI, Args(float f), Args(f));
 }
 #endif
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj b/Spore ModAPI/Spore ModAPI.vcxproj
@@ -732,7 +732,7 @@
     <ClInclude Include="Spore\Swarm\CollectionResource.h" />
     <ClInclude Include="Spore\Swarm\Components\cCameraDescription.h" />
     <ClInclude Include="Spore\Swarm\Components\cDistributeDescription.h" />
-    <ClInclude Include="Spore\Swarm\Components\cDistributeEffect.h" />
+    <ClInclude Include="Spore\Swarm\cDistributeEffect.h" />
     <ClInclude Include="Spore\Swarm\Components\DistributeEffect.h" />
     <ClInclude Include="Spore\Swarm\Components\SkinpaintDistributeEffect.h" />
     <ClInclude Include="Spore\Swarm\Components\SkinpaintParticleEffect.h" />
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj.filters b/Spore ModAPI/Spore ModAPI.vcxproj.filters
@@ -2121,7 +2121,7 @@
     <ClInclude Include="Spore\Swarm\Components\cDistributeDescription.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Spore\Swarm\Components\cDistributeEffect.h">
+    <ClInclude Include="Spore\Swarm\cDistributeEffect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Spore\Swarm\ParticleStreamers.h">
diff --git a/Spore ModAPI/Spore/App/ICamera.h b/Spore ModAPI/Spore/App/ICamera.h
@@ -41,6 +41,13 @@ namespace App
 		: public Object
 	{
 	public:
+		enum CameraControlMessages
+		{
+			/// The data is a float*, only changes the initial zoom
+			kMsgInitialZoom = 0x101D445,
+			/// The data is a float*, sets the current and initial zoom
+			kMsgZoom = 0x101D4C7,
+		};
 
 		static const uint32_t TYPE = 0x29DA727;
 
diff --git a/Spore ModAPI/Spore/Graphics/ILightingWorld.h b/Spore ModAPI/Spore/Graphics/ILightingWorld.h
@@ -43,7 +43,7 @@ namespace Graphics
 		
 		virtual ~ILightingWorld() {};
 
-		/* 0Ch */	virtual int AddLight(const Vector3& position, const ColorRGB& color, float, float) = 0;
+		/* 0Ch */	virtual int AddLight(const Vector3& position, const ColorRGB& color, float strength, float size) = 0;
 
 		/* 10h */	virtual void UpdateLightPosition(int index, const Vector3&) = 0;
 
diff --git a/Spore ModAPI/Spore/Graphics/IModelWorld.h b/Spore ModAPI/Spore/Graphics/IModelWorld.h
@@ -92,7 +92,7 @@ namespace Graphics
 		: requiredGroupFlags()
 		, excludedGroupFlags()
 		, filterFunction(nullptr)
-		, collisionMode(CollisionMode::Lod0KDTree)
+		, collisionMode(CollisionMode::MeshCluster)
 		, flags(kUseModelCollisionMode)
 	{
 	}
diff --git a/Spore ModAPI/Spore/Graphics/Model.h b/Spore ModAPI/Spore/Graphics/Model.h
@@ -38,14 +38,16 @@
 namespace Graphics
 {
 	enum class CollisionMode : uint8_t {
-		/// Just intersect with the bounding box
-		BoundingBox = 0,
-		TightBoundingBox = 1,
+		/// Only use the bounding radius to intersect
+		BoundingSphere = 0,
+		/// Only use the bounding box to intersect
+		BoundingBox = 1,
 		/// Check intersection with the hull mesh
-		HullKDTree = 2,
-		/// Check intersection with the LOD0 mesh
-		Lod0KDTree = 3,
-		Unk4 = 4
+		HullTriangle = 2,
+		/// Check intersection with the LOD0 mesh, in an optimized but more imprecise way
+		MeshCluster = 3,
+		/// Check intersection with the LOD0 mesh triangle geometry, the slowest but most precise
+		MeshTriangle = 4
 	};
 
 	class IModelWorld;
diff --git a/Spore ModAPI/Spore/Graphics/cMITextureSet.h b/Spore ModAPI/Spore/Graphics/cMITextureSet.h
@@ -5,24 +5,30 @@
 
 namespace Graphics
 {
-	class cMITextureSet
+	class cShaderDataTextureSet
 	{
-	public:
 		struct Entry
 		{
 			Texture* mpTexture;
 			char field_4[12];  // related with sampler states
 		};
+		ASSERT_SIZE(Entry, 0x10);
+
+		/* 00h */	int mEntryCount;
+		/* 04h */	Entry mEntries[6];
+	};
+
+	class cMITextureSet
+	{
+	public:
 
 		virtual ~cMITextureSet();
 
-		/* 04h */	uint16_t field_4;  // 0x20D, maybe shader data index
-		/* 06h */	uint16_t field_6;  // 0x64
-		/* 08h */	void* field_8;  // &mEntryCount
-		/* 0Ch */	int mEntryCount;
-		/* 10h */	Entry mEntries[6];
+		/* 04h */	uint16_t mShaderDataIndex;  // 0x20D, maybe shader data index
+		/* 06h */	uint16_t mShaderDataSize;  // 0x64
+		/* 08h */	cShaderDataTextureSet* mShaderData;  // &mEntryCount
+		/* 0Ch */	cShaderDataTextureSet mData;
 	};
 
-	ASSERT_SIZE(cMITextureSet::Entry, 0x10);
 	ASSERT_SIZE(cMITextureSet, 0x70);
 }
diff --git a/Spore ModAPI/Spore/Pollinator/cAssetMetadata.h b/Spore ModAPI/Spore/Pollinator/cAssetMetadata.h
@@ -35,7 +35,7 @@ namespace Pollinator
 		eastl::string16 GetDescription() const;
 		eastl::string16 GetAuthor() const;
 		int64_t GetAuthorID() const;
-		const eastl::vector<eastl::string16>& GetAuthors() const;
+		const eastl::vector<eastl::string8>& GetAuthors() const;
 		const eastl::vector<eastl::string16>& GetTags() const;
 
 		const eastl::vector<uint32_t>& GetConsequenceTraits() const;
@@ -61,7 +61,7 @@ namespace Pollinator
 		/* 74h */	bool mIsShareable;  // true
 		/* 78h */	eastl::string16 mName;
 		/* 88h */	eastl::string16 mDescription;
-		/* 98h */	eastl::vector<eastl::string16> mAuthors;
+		/* 98h */	eastl::vector<eastl::string8> mAuthors;
 		/* ACh */	eastl::vector<eastl::string16> mTags;
 		/* C0h */	eastl::vector<uint32_t> mConsequenceTraits;
 	};
@@ -89,7 +89,7 @@ namespace Pollinator
 	inline eastl::string16 cAssetMetadata::GetDescription() const { return mDescription; }
 	inline eastl::string16 cAssetMetadata::GetAuthor() const { return mAuthorName; }
 	inline int64_t cAssetMetadata::GetAuthorID() const { return mAuthorID; }
-	inline const eastl::vector<eastl::string16>& cAssetMetadata::GetAuthors() const { return mAuthors; }
+	inline const eastl::vector<eastl::string8>& cAssetMetadata::GetAuthors() const { return mAuthors; }
 	inline const eastl::vector<eastl::string16>& cAssetMetadata::GetTags() const { return mTags; }
 
 	inline const eastl::vector<uint32_t>& cAssetMetadata::GetConsequenceTraits() const { return mConsequenceTraits; }
diff --git a/Spore ModAPI/Spore/Simulator/cCreatureAnimal.h b/Spore ModAPI/Spore/Simulator/cCreatureAnimal.h
@@ -40,6 +40,9 @@ namespace Simulator
 
 		static cCreatureAnimal* Create(const Vector3& pPosition, cSpeciesProfile* pSpecies, int age = 1, cHerd* pHerd = nullptr, bool bIsAvatar = false, bool = false);
 
+		void NPCTickAI(float deltaTime);
+		void AvatarTickAI(float deltaTime);
+
 	public:
 		/* FC0h */	cGonzagoTimer mNoDamageTimer;
 		/* FE0h */	cGonzagoTimer mLastAvatarDamageTimer;
@@ -84,5 +87,7 @@ namespace Simulator
 
 	namespace Addresses(cCreatureAnimal) {
 		DeclareAddress(Create);
+		DeclareAddress(NPCTickAI);  // 0xC08CD0 0xC09570
+		DeclareAddress(AvatarTickAI);  // 0xC03710 0xC04020
 	}
 }
diff --git a/Spore ModAPI/Spore/Simulator/cHerd.h b/Spore ModAPI/Spore/Simulator/cHerd.h
@@ -9,8 +9,7 @@
 
 namespace Simulator
 {
-	//TODO
-	/*enum class CreaturePersonality
+	enum class CreaturePersonality
 	{
 		None = 0,
 		EpicPredator = 1,
@@ -21,8 +20,10 @@ namespace Simulator
 		Guard = 6,
 		Pet = 7,
 		WaterPredator = 8,
-		Carcass = 9
-	};*/
+		Carcass = 9,
+		Unk10 = 10,
+		Scenario = 11
+	};
 
 	class cHerd
 		: public cGameData
@@ -76,7 +77,7 @@ namespace Simulator
 		/* 150h */	float mScaleMultiplier;
 		/* 154h */	float mHitpointOverride;
 		/* 158h */	float mDamageMultiplier;
-		/* 15Ch */	int mCreaturePersonality;  //TODO CreaturePersonality?
+		/* 15Ch */	CreaturePersonality mCreaturePersonality;
 		/* 160h */	cNestPtr mpNest;
 		/* 164h */	cCreatureAnimalPtr mpHerdMom;
 		/* 168h */	int _padding_168[10];  // this is something related with cBehaviorTreeData and "Simulator/list"
diff --git a/Spore ModAPI/Spore/Swarm/Components/cDistributeEffect.h b/Spore ModAPI/Spore/Swarm/Components/cDistributeEffect.h
diff --git a/Spore ModAPI/Spore/Swarm/ICameraManager.h b/Spore ModAPI/Spore/Swarm/ICameraManager.h
@@ -15,7 +15,7 @@ namespace Swarm
 		/* 0Ch */	virtual int SetCamera(struct ResourceID) = 0;
 		/* 10h */	virtual int GrabCamera(struct ResourceID) = 0;
 		/* 14h */	virtual void ReleaseCamera(int index) = 0;
-		/* 18h */	virtual void func18h() = 0;
+		/* 18h */	virtual void CaptureView() = 0;
 		/* 1Ch */	virtual void CaptureViewToCubemap(int16_t, Transform*) = 0;
 		/* 20h */	virtual ~ICameraManager() = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@ namespace Simulator`
`159`	`159`	`namespace Addresses(cCreatureAnimal)`
`160`	`160`	`{`
`161`	`161`	`DefineAddress(Create, SelectAddress(0xC092A0, 0xC09B40));`
	`162`	`+ DefineAddress(NPCTickAI, SelectAddress(0xC08CD0, 0xC09570));`
	`163`	`+ DefineAddress(AvatarTickAI, SelectAddress(0xC03710, 0xC04020));`
`162`	`164`	`}`
`163`	`165`
`164`	`166`	`namespace Addresses(cCreatureBase)`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ namespace Graphics`
`92`	`92`	`: requiredGroupFlags()`
`93`	`93`	`, excludedGroupFlags()`
`94`	`94`	`, filterFunction(nullptr)`
`95`		`- , collisionMode(CollisionMode::Lod0KDTree)`
	`95`	`+ , collisionMode(CollisionMode::MeshCluster)`
`96`	`96`	`, flags(kUseModelCollisionMode)`
`97`	`97`	`{`
`98`	`98`	`}`