Skip to content
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

feat: sdk movePlayerTo() improvements #3328

Draft
wants to merge 10 commits into
base: dev
Choose a base branch
from
Draft

feat: sdk movePlayerTo() improvements #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b923fc9
pointed protocol package to feature one and rebuilt pb classes
pravusjif Feb 10, 2025
06f80ea
updated feature protocol package
pravusjif Feb 11, 2025
ac235e7
updated restricted actions code to support new rotation param
pravusjif Feb 11, 2025
e5907aa
updated protocol and rebuilt
pravusjif Feb 13, 2025
23d2c77
Merge branch 'dev' of github.com:decentraland/unity-explorer into fea…
pravusjif Feb 13, 2025
d7aa85d
renamed new prop
pravusjif Feb 13, 2025
71e0968
Updated RestrictedActions.js with new param logic
pravusjif Feb 14, 2025
3dd1dcb
fixed avatar targer only call
pravusjif Feb 14, 2025
4b9e276
added fix for movePlayerTo() not affecting camera target when using S…
pravusjif Feb 14, 2025
51e123f
Merge branch 'dev' into feat/sdk-move-player-character-param
pravusjif Feb 14, 2025
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
6 changes: 6 additions & 0 deletions Explorer/Assets/DCL/Character/CharacterCamera/Systems/ApplyCinemachineCameraInputSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ private void ForceLookAt(in Entity entity, ref CameraComponent camera, ref ICine
case CameraMode.Free:
cinemachinePreset.ForceFreeCameraLookAt(lookAtIntent);
break;
case CameraMode.SDKCamera:
// Character main cameras have to be updated since we don't know to which one will
// return after the SDK camera is disabled.
cinemachinePreset.ForceThirdPersonCameraLookAt(lookAtIntent);
cinemachinePreset.ForceFirstPersonCameraLookAt(lookAtIntent);
break;
default:
ReportHub.LogError(GetReportData(), $"Camera mode is unknown {camera.Mode}");
break;
Expand Down
120 changes: 84 additions & 36 deletions Explorer/Assets/Protocol/DecentralandProtocol/RestrictedActions.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,47 +26,49 @@ static RestrictedActionsReflection() {
string.Concat(
"CjFkZWNlbnRyYWxhbmQva2VybmVsL2FwaXMvcmVzdHJpY3RlZF9hY3Rpb25z",
"LnByb3RvEhhkZWNlbnRyYWxhbmQua2VybmVsLmFwaXMaIWRlY2VudHJhbGFu",
"ZC9jb21tb24vdmVjdG9ycy5wcm90byKeAQoTTW92ZVBsYXllclRvUmVxdWVz",
"ZC9jb21tb24vdmVjdG9ycy5wcm90byLqAQoTTW92ZVBsYXllclRvUmVxdWVz",
"dBI7ChVuZXdfcmVsYXRpdmVfcG9zaXRpb24YASABKAsyHC5kZWNlbnRyYWxh",
"bmQuY29tbW9uLlZlY3RvcjMSOAoNY2FtZXJhX3RhcmdldBgCIAEoCzIcLmRl",
"Y2VudHJhbGFuZC5jb21tb24uVmVjdG9yM0gAiAEBQhAKDl9jYW1lcmFfdGFy",
"Z2V0IkwKEVRlbGVwb3J0VG9SZXF1ZXN0EjcKEXdvcmxkX2Nvb3JkaW5hdGVz",
"GAEgASgLMhwuZGVjZW50cmFsYW5kLmNvbW1vbi5WZWN0b3IyIi8KE1RyaWdn",
"ZXJFbW90ZVJlcXVlc3QSGAoQcHJlZGVmaW5lZF9lbW90ZRgBIAEoCSJFChJD",
"aGFuZ2VSZWFsbVJlcXVlc3QSDQoFcmVhbG0YASABKAkSFAoHbWVzc2FnZRgC",
"IAEoCUgAiAEBQgoKCF9tZXNzYWdlIiUKFk9wZW5FeHRlcm5hbFVybFJlcXVl",
"c3QSCwoDdXJsGAEgASgJIiMKFE9wZW5OZnREaWFsb2dSZXF1ZXN0EgsKA3Vy",
"bhgBIAEoCSIXChVVbmJsb2NrUG9pbnRlclJlcXVlc3QiMAoTQ29tbXNBZGFw",
"dGVyUmVxdWVzdBIZChFjb25uZWN0aW9uX3N0cmluZxgBIAEoCSJDChhUcmln",
"Z2VyU2NlbmVFbW90ZVJlcXVlc3QSCwoDc3JjGAEgASgJEhEKBGxvb3AYAiAB",
"KAhIAIgBAUIHCgVfbG9vcCIiCg9TdWNjZXNzUmVzcG9uc2USDwoHc3VjY2Vz",
"cxgBIAEoCCIWChRUcmlnZ2VyRW1vdGVSZXNwb25zZSIWChRNb3ZlUGxheWVy",
"VG9SZXNwb25zZSIUChJUZWxlcG9ydFRvUmVzcG9uc2UynwcKGFJlc3RyaWN0",
"ZWRBY3Rpb25zU2VydmljZRJvCgxNb3ZlUGxheWVyVG8SLS5kZWNlbnRyYWxh",
"bmQua2VybmVsLmFwaXMuTW92ZVBsYXllclRvUmVxdWVzdBouLmRlY2VudHJh",
"bGFuZC5rZXJuZWwuYXBpcy5Nb3ZlUGxheWVyVG9SZXNwb25zZSIAEmkKClRl",
"bGVwb3J0VG8SKy5kZWNlbnRyYWxhbmQua2VybmVsLmFwaXMuVGVsZXBvcnRU",
"b1JlcXVlc3QaLC5kZWNlbnRyYWxhbmQua2VybmVsLmFwaXMuVGVsZXBvcnRU",
"b1Jlc3BvbnNlIgASbwoMVHJpZ2dlckVtb3RlEi0uZGVjZW50cmFsYW5kLmtl",
"cm5lbC5hcGlzLlRyaWdnZXJFbW90ZVJlcXVlc3QaLi5kZWNlbnRyYWxhbmQu",
"a2VybmVsLmFwaXMuVHJpZ2dlckVtb3RlUmVzcG9uc2UiABJoCgtDaGFuZ2VS",
"ZWFsbRIsLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5DaGFuZ2VSZWFsbVJl",
"cXVlc3QaKS5kZWNlbnRyYWxhbmQua2VybmVsLmFwaXMuU3VjY2Vzc1Jlc3Bv",
"bnNlIgAScAoPT3BlbkV4dGVybmFsVXJsEjAuZGVjZW50cmFsYW5kLmtlcm5l",
"bC5hcGlzLk9wZW5FeHRlcm5hbFVybFJlcXVlc3QaKS5kZWNlbnRyYWxhbmQu",
"a2VybmVsLmFwaXMuU3VjY2Vzc1Jlc3BvbnNlIgASbAoNT3Blbk5mdERpYWxv",
"ZxIuLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5PcGVuTmZ0RGlhbG9nUmVx",
"dWVzdBopLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5TdWNjZXNzUmVzcG9u",
"c2UiABJ2ChhTZXRDb21tdW5pY2F0aW9uc0FkYXB0ZXISLS5kZWNlbnRyYWxh",
"bmQua2VybmVsLmFwaXMuQ29tbXNBZGFwdGVyUmVxdWVzdBopLmRlY2VudHJh",
"bGFuZC5rZXJuZWwuYXBpcy5TdWNjZXNzUmVzcG9uc2UiABJ0ChFUcmlnZ2Vy",
"U2NlbmVFbW90ZRIyLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5UcmlnZ2Vy",
"U2NlbmVFbW90ZVJlcXVlc3QaKS5kZWNlbnRyYWxhbmQua2VybmVsLmFwaXMu",
"U3VjY2Vzc1Jlc3BvbnNlIgBiBnByb3RvMw=="));
"Y2VudHJhbGFuZC5jb21tb24uVmVjdG9yM0gAiAEBEjgKDWF2YXRhcl90YXJn",
"ZXQYAyABKAsyHC5kZWNlbnRyYWxhbmQuY29tbW9uLlZlY3RvcjNIAYgBAUIQ",
"Cg5fY2FtZXJhX3RhcmdldEIQCg5fYXZhdGFyX3RhcmdldCJMChFUZWxlcG9y",
"dFRvUmVxdWVzdBI3ChF3b3JsZF9jb29yZGluYXRlcxgBIAEoCzIcLmRlY2Vu",
"dHJhbGFuZC5jb21tb24uVmVjdG9yMiIvChNUcmlnZ2VyRW1vdGVSZXF1ZXN0",
"EhgKEHByZWRlZmluZWRfZW1vdGUYASABKAkiRQoSQ2hhbmdlUmVhbG1SZXF1",
"ZXN0Eg0KBXJlYWxtGAEgASgJEhQKB21lc3NhZ2UYAiABKAlIAIgBAUIKCghf",
"bWVzc2FnZSIlChZPcGVuRXh0ZXJuYWxVcmxSZXF1ZXN0EgsKA3VybBgBIAEo",
"CSIjChRPcGVuTmZ0RGlhbG9nUmVxdWVzdBILCgN1cm4YASABKAkiFwoVVW5i",
"bG9ja1BvaW50ZXJSZXF1ZXN0IjAKE0NvbW1zQWRhcHRlclJlcXVlc3QSGQoR",
"Y29ubmVjdGlvbl9zdHJpbmcYASABKAkiQwoYVHJpZ2dlclNjZW5lRW1vdGVS",
"ZXF1ZXN0EgsKA3NyYxgBIAEoCRIRCgRsb29wGAIgASgISACIAQFCBwoFX2xv",
"b3AiIgoPU3VjY2Vzc1Jlc3BvbnNlEg8KB3N1Y2Nlc3MYASABKAgiFgoUVHJp",
"Z2dlckVtb3RlUmVzcG9uc2UiFgoUTW92ZVBsYXllclRvUmVzcG9uc2UiFAoS",
"VGVsZXBvcnRUb1Jlc3BvbnNlMp8HChhSZXN0cmljdGVkQWN0aW9uc1NlcnZp",
"Y2USbwoMTW92ZVBsYXllclRvEi0uZGVjZW50cmFsYW5kLmtlcm5lbC5hcGlz",
"Lk1vdmVQbGF5ZXJUb1JlcXVlc3QaLi5kZWNlbnRyYWxhbmQua2VybmVsLmFw",
"aXMuTW92ZVBsYXllclRvUmVzcG9uc2UiABJpCgpUZWxlcG9ydFRvEisuZGVj",
"ZW50cmFsYW5kLmtlcm5lbC5hcGlzLlRlbGVwb3J0VG9SZXF1ZXN0GiwuZGVj",
"ZW50cmFsYW5kLmtlcm5lbC5hcGlzLlRlbGVwb3J0VG9SZXNwb25zZSIAEm8K",
"DFRyaWdnZXJFbW90ZRItLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5Ucmln",
"Z2VyRW1vdGVSZXF1ZXN0Gi4uZGVjZW50cmFsYW5kLmtlcm5lbC5hcGlzLlRy",
"aWdnZXJFbW90ZVJlc3BvbnNlIgASaAoLQ2hhbmdlUmVhbG0SLC5kZWNlbnRy",
"YWxhbmQua2VybmVsLmFwaXMuQ2hhbmdlUmVhbG1SZXF1ZXN0GikuZGVjZW50",
"cmFsYW5kLmtlcm5lbC5hcGlzLlN1Y2Nlc3NSZXNwb25zZSIAEnAKD09wZW5F",
"eHRlcm5hbFVybBIwLmRlY2VudHJhbGFuZC5rZXJuZWwuYXBpcy5PcGVuRXh0",
"ZXJuYWxVcmxSZXF1ZXN0GikuZGVjZW50cmFsYW5kLmtlcm5lbC5hcGlzLlN1",
"Y2Nlc3NSZXNwb25zZSIAEmwKDU9wZW5OZnREaWFsb2cSLi5kZWNlbnRyYWxh",
"bmQua2VybmVsLmFwaXMuT3Blbk5mdERpYWxvZ1JlcXVlc3QaKS5kZWNlbnRy",
"YWxhbmQua2VybmVsLmFwaXMuU3VjY2Vzc1Jlc3BvbnNlIgASdgoYU2V0Q29t",
"bXVuaWNhdGlvbnNBZGFwdGVyEi0uZGVjZW50cmFsYW5kLmtlcm5lbC5hcGlz",
"LkNvbW1zQWRhcHRlclJlcXVlc3QaKS5kZWNlbnRyYWxhbmQua2VybmVsLmFw",
"aXMuU3VjY2Vzc1Jlc3BvbnNlIgASdAoRVHJpZ2dlclNjZW5lRW1vdGUSMi5k",
"ZWNlbnRyYWxhbmQua2VybmVsLmFwaXMuVHJpZ2dlclNjZW5lRW1vdGVSZXF1",
"ZXN0GikuZGVjZW50cmFsYW5kLmtlcm5lbC5hcGlzLlN1Y2Nlc3NSZXNwb25z",
"ZSIAYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Decentraland.Common.VectorsReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Kernel.Apis.MovePlayerToRequest), global::Decentraland.Kernel.Apis.MovePlayerToRequest.Parser, new[]{ "NewRelativePosition", "CameraTarget" }, new[]{ "CameraTarget" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Kernel.Apis.MovePlayerToRequest), global::Decentraland.Kernel.Apis.MovePlayerToRequest.Parser, new[]{ "NewRelativePosition", "CameraTarget", "AvatarTarget" }, new[]{ "CameraTarget", "AvatarTarget" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Kernel.Apis.TeleportToRequest), global::Decentraland.Kernel.Apis.TeleportToRequest.Parser, new[]{ "WorldCoordinates" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Kernel.Apis.TriggerEmoteRequest), global::Decentraland.Kernel.Apis.TriggerEmoteRequest.Parser, new[]{ "PredefinedEmote" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Kernel.Apis.ChangeRealmRequest), global::Decentraland.Kernel.Apis.ChangeRealmRequest.Parser, new[]{ "Realm", "Message" }, new[]{ "Message" }, null, null, null),
Expand Down Expand Up @@ -121,6 +123,7 @@ public MovePlayerToRequest() {
public MovePlayerToRequest(MovePlayerToRequest other) : this() {
newRelativePosition_ = other.newRelativePosition_ != null ? other.newRelativePosition_.Clone() : null;
cameraTarget_ = other.cameraTarget_ != null ? other.cameraTarget_.Clone() : null;
avatarTarget_ = other.avatarTarget_ != null ? other.avatarTarget_.Clone() : null;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
}

Expand Down Expand Up @@ -154,6 +157,18 @@ public MovePlayerToRequest Clone() {
}
}

/// <summary>Field number for the "avatar_target" field.</summary>
public const int AvatarTargetFieldNumber = 3;
private global::Decentraland.Common.Vector3 avatarTarget_;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public global::Decentraland.Common.Vector3 AvatarTarget {
get { return avatarTarget_; }
set {
avatarTarget_ = value;
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) {
Expand All @@ -171,6 +186,7 @@ public bool Equals(MovePlayerToRequest other) {
}
if (!object.Equals(NewRelativePosition, other.NewRelativePosition)) return false;
if (!object.Equals(CameraTarget, other.CameraTarget)) return false;
if (!object.Equals(AvatarTarget, other.AvatarTarget)) return false;
return Equals(_unknownFields, other._unknownFields);
}

Expand All @@ -180,6 +196,7 @@ public override int GetHashCode() {
int hash = 1;
if (newRelativePosition_ != null) hash ^= NewRelativePosition.GetHashCode();
if (cameraTarget_ != null) hash ^= CameraTarget.GetHashCode();
if (avatarTarget_ != null) hash ^= AvatarTarget.GetHashCode();
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
}
Expand All @@ -206,6 +223,10 @@ public void WriteTo(pb::CodedOutputStream output) {
output.WriteRawTag(18);
output.WriteMessage(CameraTarget);
}
if (avatarTarget_ != null) {
output.WriteRawTag(26);
output.WriteMessage(AvatarTarget);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(output);
}
Expand All @@ -224,6 +245,10 @@ public void WriteTo(pb::CodedOutputStream output) {
output.WriteRawTag(18);
output.WriteMessage(CameraTarget);
}
if (avatarTarget_ != null) {
output.WriteRawTag(26);
output.WriteMessage(AvatarTarget);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(ref output);
}
Expand All @@ -240,6 +265,9 @@ public int CalculateSize() {
if (cameraTarget_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(CameraTarget);
}
if (avatarTarget_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(AvatarTarget);
}
if (_unknownFields != null) {
size += _unknownFields.CalculateSize();
}
Expand All @@ -264,6 +292,12 @@ public void MergeFrom(MovePlayerToRequest other) {
}
CameraTarget.MergeFrom(other.CameraTarget);
}
if (other.avatarTarget_ != null) {
if (avatarTarget_ == null) {
AvatarTarget = new global::Decentraland.Common.Vector3();
}
AvatarTarget.MergeFrom(other.AvatarTarget);
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
}

Expand Down Expand Up @@ -293,6 +327,13 @@ public void MergeFrom(pb::CodedInputStream input) {
input.ReadMessage(CameraTarget);
break;
}
case 26: {
if (avatarTarget_ == null) {
AvatarTarget = new global::Decentraland.Common.Vector3();
}
input.ReadMessage(AvatarTarget);
break;
}
}
}
#endif
Expand Down Expand Up @@ -322,6 +363,13 @@ public void MergeFrom(pb::CodedInputStream input) {
input.ReadMessage(CameraTarget);
break;
}
case 26: {
if (avatarTarget_ == null) {
AvatarTarget = new global::Decentraland.Common.Vector3();
}
input.ReadMessage(AvatarTarget);
break;
}
}
}
}
Expand Down
14 changes: 11 additions & 3 deletions Explorer/Assets/Scripts/CrdtEcsBridge/RestrictedActions/GlobalWorldActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,22 @@ public GlobalWorldActions(World world, Entity playerEntity, IEmotesMessageBus me
this.messageBus = messageBus;
}

public void MoveAndRotatePlayer(Vector3 newPlayerPosition, Vector3? newCameraTarget)
public void MoveAndRotatePlayer(Vector3 newPlayerPosition, Vector3? newCameraTarget, Vector3? newAvatarTarget)
{
// Move player to new position (through InterpolateCharacterSystem -> TeleportPlayerQuery)
world.AddOrSet(playerEntity, new PlayerTeleportIntent(newPlayerPosition, Vector2Int.zero, CancellationToken.None));

// Rotate player to look at camera target (through RotateCharacterSystem -> ForceLookAtQuery)
if (newCameraTarget != null)
// Update avatar rotation (through RotateCharacterSystem -> ForceLookAtQuery)
if (newAvatarTarget != null)
{
Vector3 lookAtDirection = newAvatarTarget.Value - newPlayerPosition;
lookAtDirection.y = 0;
world.AddOrSet(playerEntity, new PlayerLookAtIntent(newPlayerPosition + lookAtDirection.normalized));
}
else if (newCameraTarget != null)
{
world.AddOrSet(playerEntity, new PlayerLookAtIntent(newCameraTarget.Value));
}
}

public void RotateCamera(Vector3? newCameraTarget, Vector3 newPlayerPosition)
Expand Down
2 changes: 1 addition & 1 deletion Explorer/Assets/Scripts/CrdtEcsBridge/RestrictedActions/IGlobalWorldActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace CrdtEcsBridge.RestrictedActions
{
public interface IGlobalWorldActions
{
void MoveAndRotatePlayer(Vector3 newPlayerPosition, Vector3? newCameraTarget);
void MoveAndRotatePlayer(Vector3 newPlayerPosition, Vector3? newCameraTarget, Vector3? newAvatarTarget);
void RotateCamera(Vector3? newCameraTarget, Vector3 newPlayerPosition);
UniTask TriggerSceneEmoteAsync(string sceneId, SceneAssetBundleManifest abManifest, string emoteHash, bool loop, CancellationToken ct);
void TriggerEmote(URN urn, bool isLooping = false);
Expand Down
9 changes: 5 additions & 4 deletions ...orer/Assets/Scripts/CrdtEcsBridge/RestrictedActions/RestrictedActionsAPIImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,22 @@ public bool TryOpenExternalUrl(string url)
return true;
}

public void TryMovePlayerTo(Vector3 newRelativePosition, Vector3? cameraTarget)
public void TryMovePlayerTo(Vector3 newRelativePosition, Vector3? cameraTarget, Vector3? avatarTarget)
{
if (!sceneStateProvider.IsCurrent)
return;

Vector3 newAbsolutePosition = sceneData.Geometry.BaseParcelPosition + newRelativePosition;
Vector3? newAbsoluteCameraTarget = cameraTarget != null ? sceneData.Geometry.BaseParcelPosition + cameraTarget.Value : null;
Vector3? newAbsoluteAvatarTarget = avatarTarget != null ? sceneData.Geometry.BaseParcelPosition + avatarTarget.Value : null;

if (!IsPositionValid(newAbsolutePosition))
{
ReportHub.LogError(ReportCategory.RESTRICTED_ACTIONS, "MovePlayerTo: Position is out of scene");
return;
}

MoveAndRotatePlayerAsync(newAbsolutePosition, newAbsoluteCameraTarget).Forget();
MoveAndRotatePlayerAsync(newAbsolutePosition, newAbsoluteCameraTarget, newAbsoluteAvatarTarget).Forget();
}

public void TryTeleportTo(Vector2Int coords)
Expand Down Expand Up @@ -129,11 +130,11 @@ public bool TryOpenNftDialog(string urn)
return true;
}

private async UniTask MoveAndRotatePlayerAsync(Vector3 newAbsolutePosition, Vector3? newAbsoluteCameraTarget)
private async UniTask MoveAndRotatePlayerAsync(Vector3 newAbsolutePosition, Vector3? newAbsoluteCameraTarget, Vector3? newAbsoluteAvatarTarget)
{
await UniTask.SwitchToMainThread();

globalWorldActions.MoveAndRotatePlayer(newAbsolutePosition, newAbsoluteCameraTarget);
globalWorldActions.MoveAndRotatePlayer(newAbsolutePosition, newAbsoluteCameraTarget, newAbsoluteAvatarTarget);
globalWorldActions.RotateCamera(newAbsoluteCameraTarget, newAbsolutePosition);
}

Expand Down
14 changes: 9 additions & 5 deletions ...Scripts/CrdtEcsBridge/RestrictedActions/Tests/RestrictedActionsAPIImplementationShould.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,25 @@ public void OpenExternalUrl()
}

[Test]
[TestCase(true)]
[TestCase(false)]
public void MovePlayerTo(bool withCameraTarget)
[TestCase(true, true)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(false, false)]
public void MovePlayerTo(bool withCameraTarget, bool withRotation)
{
// Arrange
Vector3 testNewRelativePosition = new Vector3(5, 5, 3);
Vector3? testCameraTarget = withCameraTarget ? new Vector3(5, 3, 2) : null;
Vector3? testAvatarTarget = withCameraTarget ? new Vector3(2, 6, -3) : null;

// Act
restrictedActionsAPIImplementation.TryMovePlayerTo(testNewRelativePosition, testCameraTarget);
restrictedActionsAPIImplementation.TryMovePlayerTo(testNewRelativePosition, testCameraTarget, testAvatarTarget);

// Assert
globalWorldActions.Received(1).MoveAndRotatePlayer(
sceneData.Geometry.BaseParcelPosition + testNewRelativePosition,
sceneData.Geometry.BaseParcelPosition + testCameraTarget);
withCameraTarget ? sceneData.Geometry.BaseParcelPosition + testCameraTarget : null,
testAvatarTarget);

globalWorldActions.Received(1).RotateCamera(
withCameraTarget ? sceneData.Geometry.BaseParcelPosition + testCameraTarget : null,
Expand Down
2 changes: 1 addition & 1 deletion ...er/Assets/Scripts/SceneRuntime/Apis/Modules/RestrictedActionsApi/IRestrictedActionsAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public interface IRestrictedActionsAPI
{
bool TryOpenExternalUrl(string url);

void TryMovePlayerTo(Vector3 newRelativePosition, Vector3? cameraTarget);
void TryMovePlayerTo(Vector3 newRelativePosition, Vector3? cameraTarget, Vector3? avatarTarget);

void TryTeleportTo(Vector2Int newCoords);

Expand Down
Loading
Loading