Merge pull request #565 from openmultiplayer/kseny/attach_obj

AmyrAhmady · web-flow · commit de26f64e21b9 · 2023-01-04T02:23:35.000+03:30
Player attached objects.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,10 +47,6 @@ jobs:
         run: |
           echo "build_version=$(git describe --always --tags "refs/remotes/origin/${HEAD_REF}")" >> $GITHUB_OUTPUT
           echo "build_config=RelWithDebInfo" >> $GITHUB_OUTPUT
-          echo "build_ubuntu_version=18.04" >> $GITHUB_OUTPUT
-          echo "build_shared=0" >> $GITHUB_OUTPUT
-          echo "build_server=1" >> $GITHUB_OUTPUT
-          echo "build_tools=0" >> $GITHUB_OUTPUT
 
       - name: Setup Python
         uses: actions/setup-python@v2
@@ -69,7 +65,7 @@ jobs:
           $env:OMP_BUILD_COMMIT=$(git rev-parse HEAD)
           mkdir build
           cd build
-          cmake .. -A Win32 -T "ClangCL"
+          cmake -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} .. -A Win32 -T "ClangCL"
 
       - name: Build
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,10 +27,6 @@ jobs:
         run: |
           echo "build_version=$(git describe --always --tags "refs/remotes/origin/${HEAD_REF}")" >> $GITHUB_OUTPUT
           echo "build_config=RelWithDebInfo" >> $GITHUB_OUTPUT
-          echo "build_ubuntu_version=18.04" >> $GITHUB_OUTPUT
-          echo "build_shared=0" >> $GITHUB_OUTPUT
-          echo "build_server=1" >> $GITHUB_OUTPUT
-          echo "build_tools=0" >> $GITHUB_OUTPUT
 
       - name: Setup Python
         uses: actions/setup-python@v2
@@ -49,7 +45,7 @@ jobs:
           $env:OMP_BUILD_COMMIT=$(git rev-parse HEAD)
           mkdir build
           cd build
-          cmake .. -A Win32 -T "ClangCL"
+          cmake -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} .. -A Win32 -T "ClangCL"
 
       - name: Build
         run: |
diff --git a/SDK/include/Server/Components/Objects/objects.hpp b/SDK/include/Server/Components/Objects/objects.hpp
@@ -216,6 +216,9 @@ struct IObject : public IBaseObject
 struct IPlayerObject : public IBaseObject
 {
 	virtual void attachToObject(IPlayerObject& object, Vector3 offset, Vector3 rotation) = 0;
+
+	/// Attach the object to a player
+	virtual void attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation) = 0;
 };
 
 struct ObjectEventHandler;
diff --git a/Server/Components/Objects/object.cpp b/Server/Components/Objects/object.cpp
@@ -12,6 +12,7 @@
 Object::~Object()
 {
 	eraseFromProcessed(true /* force */);
+	objects_.getAttachedToPlayers().erase(this);
 }
 
 void Object::destream()
@@ -143,6 +144,27 @@ void Object::setRotation(GTAQuat rotation)
 	PacketHelper::broadcast(setObjectRotationRPC, objects_.getPlayers());
 }
 
+void Object::attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation)
+{
+	const int id = player.getID();
+	setAttachmentData(ObjectAttachmentData::Type::Player, id, offset, rotation, true);
+	NetCode::RPC::AttachObjectToPlayer attachObjectToPlayerRPC;
+	attachObjectToPlayerRPC.ObjectID = poolID;
+	attachObjectToPlayerRPC.PlayerID = id;
+	attachObjectToPlayerRPC.Offset = offset;
+	attachObjectToPlayerRPC.Rotation = rotation;
+	PacketHelper::broadcastToStreamed(attachObjectToPlayerRPC, player);
+
+	objects_.getAttachedToPlayers().insert(this);
+}
+
+void Object::resetAttachment()
+{
+	objects_.getAttachedToPlayers().erase(this);
+	this->BaseObject<IObject>::resetAttachment();
+	restream();
+}
+
 void PlayerObject::restream()
 {
 	createObjectForClient(objects_.getPlayer());
@@ -241,7 +263,7 @@ void PlayerObject::createForPlayer()
 {
 	createObjectForClient(objects_.getPlayer());
 
-	if (isMoving() || getAttachmentData().type == ObjectAttachmentData::Type::Player)
+	if (isMoving())
 	{
 		delayedProcessingTime_ = Time::now() + Seconds(1);
 		enableDelayedProcessing();
@@ -278,9 +300,58 @@ void PlayerObject::setRotation(GTAQuat rotation)
 PlayerObject::~PlayerObject()
 {
 	eraseFromProcessed(true /* force*/);
+	this->objects_.getAttachedToPlayerObjects().erase(this);
 }
 
 void PlayerObject::destream()
 {
 	destroyForPlayer();
 }
+
+void PlayerObject::resetAttachment()
+{
+	this->objects_.getAttachedToPlayerObjects().erase(this);
+	this->BaseObject<IPlayerObject>::resetAttachment();
+	restream();
+}
+
+void PlayerObject::attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation)
+{
+	this->objects_.getAttachedToPlayerObjects().insert(this);
+	setAttachmentData(ObjectAttachmentData::Type::Player, player.getID(), offset, rotation, true);
+	restream();
+}
+
+void PlayerObject::createObjectForClient(IPlayer& player)
+{
+	auto& attach = getAttachmentData();
+
+	// Object attached to player.
+	if (attach.type == ObjectAttachmentData::Type::Player)
+	{
+		auto attachTo = objects_.getComponent().getPlayers().get(attach.ID);
+
+		// Invalid player or player is not streamed.
+		// Object won't be created on client.
+		if (!attachTo || !attachTo->isStreamedInForPlayer(player))
+		{
+			destream();
+			return;
+		}
+
+		// Create object.
+		this->BaseObject<IPlayerObject>::createObjectForClient(player);
+
+		// Attach object.
+		NetCode::RPC::AttachObjectToPlayer attachObjectToPlayerRPC;
+		attachObjectToPlayerRPC.ObjectID = poolID;
+		attachObjectToPlayerRPC.PlayerID = attach.ID;
+		attachObjectToPlayerRPC.Offset = attach.offset;
+		attachObjectToPlayerRPC.Rotation = attach.rotation;
+		PacketHelper::send(attachObjectToPlayerRPC, player);
+		return;
+	}
+
+	// Create object.
+	this->BaseObject<IPlayerObject>::createObjectForClient(player);
+}
diff --git a/Server/Components/Objects/object.hpp b/Server/Components/Objects/object.hpp
@@ -367,11 +367,7 @@ class Object final : public BaseObject<IObject>
 
 	void stop() override;
 
-	void resetAttachment() override
-	{
-		this->BaseObject<IObject>::resetAttachment();
-		restream();
-	}
+	void resetAttachment() override;
 
 	void setPosition(Vector3 position) override;
 
@@ -407,17 +403,7 @@ class Object final : public BaseObject<IObject>
 		restream();
 	}
 
-	void attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation) override
-	{
-		const int id = player.getID();
-		setAttachmentData(ObjectAttachmentData::Type::Player, id, offset, rotation, true);
-		NetCode::RPC::AttachObjectToPlayer attachObjectToPlayerRPC;
-		attachObjectToPlayerRPC.ObjectID = poolID;
-		attachObjectToPlayerRPC.PlayerID = id;
-		attachObjectToPlayerRPC.Offset = offset;
-		attachObjectToPlayerRPC.Rotation = rotation;
-		PacketHelper::broadcastToStreamed(attachObjectToPlayerRPC, player);
-	}
+	void attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation) override;
 
 	~Object();
 	void destream();
@@ -451,6 +437,8 @@ class PlayerObject final : public BaseObject<IPlayerObject>
 	{
 	}
 
+	void createObjectForClient(IPlayer& player);
+
 	void setMaterial(uint32_t materialIndex, int model, StringView textureLibrary, StringView textureName, Colour colour) override;
 
 	void setMaterialText(uint32_t materialIndex, StringView text, ObjectMaterialSize materialSize, StringView fontFace, int fontSize, bool bold, Colour fontColour, Colour backgroundColour, ObjectMaterialTextAlign align) override;
@@ -461,11 +449,7 @@ class PlayerObject final : public BaseObject<IPlayerObject>
 
 	bool advance(Microseconds elapsed, TimePoint now);
 
-	void resetAttachment() override
-	{
-		this->BaseObject<IPlayerObject>::resetAttachment();
-		restream();
-	}
+	void resetAttachment() override;
 
 	void setPosition(Vector3 position) override;
 
@@ -501,6 +485,8 @@ class PlayerObject final : public BaseObject<IPlayerObject>
 		restream();
 	}
 
+	void attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation) override;
+
 	~PlayerObject();
 	void destream();
 };
diff --git a/Server/Components/Objects/objects_impl.hpp b/Server/Components/Objects/objects_impl.hpp
@@ -24,6 +24,7 @@ class ObjectComponent final : public IObjectsComponent, public CoreEventHandler,
 	std::list<uint16_t> slotsUsedByPlayerObjects;
 	FlatPtrHashSet<PlayerObject> processedPlayerObjects;
 	FlatPtrHashSet<Object> processedObjects;
+	FlatPtrHashSet<Object> attachedToPlayer;
 	bool defCameraCollision = true;
 
 	ICustomModelsComponent* models = nullptr;
@@ -414,54 +415,9 @@ class ObjectComponent final : public IObjectsComponent, public CoreEventHandler,
 		return storage._entries();
 	}
 
-	void onPoolEntryDestroyed(IPlayer& player) override
-	{
-		const int pid = player.getID();
-		for (IObject* obj : storage)
-		{
-			const ObjectAttachmentData& data = obj->getAttachmentData();
-			if (data.type == ObjectAttachmentData::Type::Player && data.ID == pid)
-			{
-				obj->resetAttachment();
-			}
-		}
-	}
+	void onPoolEntryDestroyed(IPlayer& player) override;
 
-	void onPlayerStreamIn(IPlayer& player, IPlayer& forPlayer) override
-	{
-		const int pid = player.getID();
-		for (IObject* object : storage)
-		{
-			Object* obj = static_cast<Object*>(object);
-			const ObjectAttachmentData& attachment = obj->getAttachmentData();
-			if (attachment.type == ObjectAttachmentData::Type::Player && attachment.ID == pid)
-			{
-				NetCode::RPC::AttachObjectToPlayer attachObjectToPlayerRPC;
-				attachObjectToPlayerRPC.ObjectID = obj->poolID;
-				attachObjectToPlayerRPC.PlayerID = attachment.ID;
-				attachObjectToPlayerRPC.Offset = attachment.offset;
-				attachObjectToPlayerRPC.Rotation = attachment.rotation;
-				PacketHelper::send(attachObjectToPlayerRPC, forPlayer);
-			}
-		}
-
-		IPlayerObjectData* objectData = queryExtension<IPlayerObjectData>(player);
-		if (objectData)
-		{
-			for (int i = 0; i < MAX_ATTACHED_OBJECT_SLOTS; ++i)
-			{
-				if (objectData->hasAttachedObject(i))
-				{
-					NetCode::RPC::SetPlayerAttachedObject setPlayerAttachedObjectRPC;
-					setPlayerAttachedObjectRPC.PlayerID = player.getID();
-					setPlayerAttachedObjectRPC.Index = i;
-					setPlayerAttachedObjectRPC.Create = true;
-					setPlayerAttachedObjectRPC.AttachmentData = objectData->getAttachedObject(i);
-					PacketHelper::send(setPlayerAttachedObjectRPC, forPlayer);
-				}
-			}
-		}
-	}
+	void onPlayerStreamIn(IPlayer& player, IPlayer& forPlayer) override;
 
 	// Pre-spawn so you can safely attach onPlayerSpawn
 	void onPlayerSpawn(IPlayer& player) override
@@ -499,13 +455,17 @@ class ObjectComponent final : public IObjectsComponent, public CoreEventHandler,
 		storage.clear();
 		isPlayerObject.fill(0);
 		defCameraCollision = true;
+		attachedToPlayer.clear();
 	}
 
 	bool is037CompatModeEnabled() const { return compatModeEnabled; }
 	void onPlayerFinishedDownloading(IPlayer& player) override;
 
 	inline const std::list<uint16_t>& getSlotsUsedByPlayerObjects() const { return slotsUsedByPlayerObjects; }
 	bool isGroupPlayerObjects() const { return groupPlayerObjects ? *groupPlayerObjects : false; }
+
+	void onPlayerStreamOut(IPlayer& player, IPlayer& forPlayer) override;
+	inline FlatPtrHashSet<Object>& getAttachedToPlayers() { return attachedToPlayer; }
 };
 
 class PlayerObjectData final : public IPlayerObjectData
@@ -516,6 +476,7 @@ class PlayerObjectData final : public IPlayerObjectData
 	StaticBitset<MAX_ATTACHED_OBJECT_SLOTS> slotsOccupied_;
 	StaticArray<ObjectAttachmentSlotData, MAX_ATTACHED_OBJECT_SLOTS> slots_;
 	MarkedDynamicPoolStorage<PlayerObject, IPlayerObject, 1, OBJECT_POOL_SIZE> storage;
+	FlatPtrHashSet<PlayerObject> attachedToPlayer_;
 	bool inObjectSelection_;
 	bool inObjectEdit_;
 	bool streamedGlobalObjects_;
@@ -635,6 +596,7 @@ class PlayerObjectData final : public IPlayerObjectData
 			component_.decrementPlayerCounter(index);
 			obj->destream();
 			storage.release(index, false);
+			attachedToPlayer_.erase(obj);
 		}
 	}
 
@@ -677,6 +639,7 @@ class PlayerObjectData final : public IPlayerObjectData
 		streamedGlobalObjects_ = false;
 		slotsOccupied_.reset();
 		storage.clear();
+		attachedToPlayer_.clear();
 	}
 
 	void beginSelecting() override
@@ -795,4 +758,14 @@ class PlayerObjectData final : public IPlayerObjectData
 	{
 		streamedGlobalObjects_ = value;
 	}
+
+	ObjectComponent& getComponent()
+	{
+		return component_;
+	}
+
+	inline FlatPtrHashSet<PlayerObject>& getAttachedToPlayerObjects()
+	{
+		return attachedToPlayer_;
+	}
 };
diff --git a/Server/Components/Objects/objects_main.cpp b/Server/Components/Objects/objects_main.cpp
diff --git a/Server/Components/Pawn/Scripting/Object/Natives.cpp b/Server/Components/Pawn/Scripting/Object/Natives.cpp
diff --git a/Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp b/Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,9 @@ struct IObject : public IBaseObject`
`216`	`216`	`struct IPlayerObject : public IBaseObject`
`217`	`217`	`{`
`218`	`218`	`virtual void attachToObject(IPlayerObject& object, Vector3 offset, Vector3 rotation) = 0;`
	`219`	`+`
	`220`	`+ /// Attach the object to a player`
	`221`	`+ virtual void attachToPlayer(IPlayer& player, Vector3 offset, Vector3 rotation) = 0;`
`219`	`222`	`};`
`220`	`223`
`221`	`224`	`struct ObjectEventHandler;`