Skip to content

Object editing types #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xunder-matth wants to merge 5 commits into
base: master
Choose a base branch
from
+26 −11
Open

Object editing types #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d906671
Ability to check if player is editing (attached) object
xunder-matth Jan 15, 2026
537621a
Update SDK submodule
xunder-matth Jan 15, 2026
73bf6f5
Validate object editing RPCs
xunder-matth Jan 15, 2026
24ab697
Update SDK
xunder-matth Jan 15, 2026
6b9932a
ABI fix
xunder-matth Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SDK
Open in desktop
Submodule SDK updated 1 files
+11 −0 include/Server/Components/Objects/objects.hpp
25 changes: 15 additions & 10 deletions Server/Components/Objects/objects_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class ObjectComponent final : public IObjectsComponent, public CoreEventHandler,
}

IPlayerObjectData* data = queryExtension<IPlayerObjectData>(peer);
if (data && data->editingObject())
if (data && data->getEditingType() == ObjectEditingType::ObjectEditingType_Object)
{

if (onPlayerEditObjectRPC.Response == ObjectEditResponse_Cancel || onPlayerEditObjectRPC.Response == ObjectEditResponse_Final)
Expand Down Expand Up @@ -164,7 +164,7 @@ class ObjectComponent final : public IObjectsComponent, public CoreEventHandler,
}

IPlayerObjectData* data = queryExtension<IPlayerObjectData>(peer);
if (data && data->editingObject() && data->hasAttachedObject(onPlayerEditAttachedObjectRPC.Index))
if (data && data->getEditingType() == ObjectEditingType::ObjectEditingType_AttachedObject && data->hasAttachedObject(onPlayerEditAttachedObjectRPC.Index))
{
auto attachedObjectData = data->getAttachedObject(onPlayerEditAttachedObjectRPC.Index);

Expand Down Expand Up @@ -482,7 +482,7 @@ class PlayerObjectData final : public IPlayerObjectData
MarkedDynamicPoolStorage<PlayerObject, IPlayerObject, 1, OBJECT_POOL_SIZE> storage;
FlatPtrHashSet<PlayerObject> attachedToPlayer_;
bool inObjectSelection_;
bool inObjectEdit_;
ObjectEditingType objectEdit_;
bool streamedGlobalObjects_;

public:
Expand Down Expand Up @@ -641,7 +641,7 @@ class PlayerObjectData final : public IPlayerObjectData

void reset() override
{
inObjectEdit_ = false;
objectEdit_ = ObjectEditingType::ObjectEditingType_None;
inObjectSelection_ = false;
streamedGlobalObjects_ = false;
slotsOccupied_.reset();
Expand All @@ -651,7 +651,7 @@ class PlayerObjectData final : public IPlayerObjectData

void beginSelecting() override
{
inObjectEdit_ = false;
objectEdit_ = ObjectEditingType::ObjectEditingType_None;
inObjectSelection_ = true;
NetCode::RPC::PlayerBeginObjectSelect playerBeginObjectSelectRPC;
PacketHelper::send(playerBeginObjectSelectRPC, player_);
Expand All @@ -664,21 +664,21 @@ class PlayerObjectData final : public IPlayerObjectData

bool editingObject() const override
{
return inObjectEdit_;
return objectEdit_ != ObjectEditingType::ObjectEditingType_None;
}

void endEditing() override
{
inObjectSelection_ = false;
inObjectEdit_ = false;
objectEdit_ = ObjectEditingType::ObjectEditingType_None;
NetCode::RPC::PlayerCancelObjectEdit playerCancelObjectEditRPC;
PacketHelper::send(playerCancelObjectEditRPC, player_);
}

void beginEditing(IObject& object) override
{
inObjectSelection_ = false;
inObjectEdit_ = true;
objectEdit_ = ObjectEditingType::ObjectEditingType_Object;

NetCode::RPC::PlayerBeginObjectEdit playerBeginObjectEditRPC;
playerBeginObjectEditRPC.PlayerObject = false;
Expand All @@ -689,7 +689,7 @@ class PlayerObjectData final : public IPlayerObjectData
void beginEditing(IPlayerObject& object) override
{
inObjectSelection_ = false;
inObjectEdit_ = true;
objectEdit_ = ObjectEditingType::ObjectEditingType_Object;

NetCode::RPC::PlayerBeginObjectEdit playerBeginObjectEditRPC;
playerBeginObjectEditRPC.PlayerObject = true;
Expand Down Expand Up @@ -749,13 +749,18 @@ class PlayerObjectData final : public IPlayerObjectData
}

inObjectSelection_ = false;
inObjectEdit_ = true;
objectEdit_ = ObjectEditingType::ObjectEditingType_AttachedObject;

NetCode::RPC::PlayerBeginAttachedObjectEdit playerBeginAttachedObjectEditRPC;
playerBeginAttachedObjectEditRPC.Index = index;
PacketHelper::send(playerBeginAttachedObjectEditRPC, player_);
}

ObjectEditingType getEditingType() const override
{
return objectEdit_;
}

bool getStreamedGlobalObjects() const
{
return streamedGlobalObjects_;
Expand Down
5 changes: 5 additions & 0 deletions Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ SCRIPT_API(BeginPlayerObjectEditing, bool(IPlayerObjectData& data, IPlayerObject
return true;
}

SCRIPT_API(IsPlayerEditingObject, bool(IPlayerObjectData& data))
{
return data.editingObject() == ObjectEditingType::ObjectEditingType_Object;
}

SCRIPT_API(SetPlayerObjectMaterial, bool(IPlayer& player, IPlayerObject& object, int materialIndex, int modelId, const std::string& textureLibrary, const std::string& textureName, uint32_t materialColour))
{
object.setMaterial(materialIndex, modelId, textureLibrary, textureName, Colour::FromARGB(materialColour));
Expand Down
5 changes: 5 additions & 0 deletions Server/Components/Pawn/Scripting/Player/Natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,11 @@ SCRIPT_API(EditAttachedObject, bool(IPlayerObjectData& data, int index))
return true;
}

SCRIPT_API(IsPlayerEditingAttachedObject, bool(IPlayerObjectData& data))
{
return data.getEditingType() == ObjectEditingType::ObjectEditingType_AttachedObject;
}

SCRIPT_API(EnablePlayerCameraTarget, bool(IPlayer& player, bool enable))
{
player.useCameraTargeting(enable);
Expand Down
Loading