Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ private void FlushPreviousAudioStates()
private void InitializeTerrainAudioStates()
{
int parcelSize = terrain.ParcelSize;
#pragma warning disable CS0612, CS0618 // reads the [Obsolete] World-Terrain ChunkModels array (live audio boundary)
ChunkModel[] terrainChunks = terrain.TerrainModel.ChunkModels;
#pragma warning restore CS0612, CS0618
landscapeAudioStates = new NativeArray<LandscapeAudioState>(terrainChunks.Length, Allocator.Persistent);
landscapeAudioSourcesPositions = new NativeArray<NativeArray<int2>>(terrainChunks.Length, Allocator.Persistent);
int chunkSize = terrain.GetChunkSize();
Expand All @@ -140,7 +142,9 @@ private void InitializeTerrainAudioStates()

for (var i = 0; i < terrainChunks.Length; i++)
{
#pragma warning disable CS0612 // ChunkModel: live World-Terrain audio boundary
ChunkModel chunk = terrainChunks[i];
#pragma warning restore CS0612
int2 center = (chunk.MinParcel * parcelSize) + halfTerrainChunkSize;

landscapeAudioStates[i] = new LandscapeAudioState
Expand Down Expand Up @@ -174,7 +178,9 @@ private void InitializeOceanAudioStates()
oceanListeningDistanceThreshold = math.pow(landscapeAudioSystemSettings.OceanDistanceThreshold, 2);
}

#pragma warning disable CS0612 // ChunkModel param: live World-Terrain audio boundary
private NativeArray<int2> CalculateAudioSourcesPositions(ChunkModel terrain, int2 chunkSize, int parcelSize)
#pragma warning restore CS0612
{
int rowsPerChunk = landscapeAudioSystemSettings.RowsPerChunk;
int retryAttempts = landscapeAudioSystemSettings.AudioSourcePositioningRetryAttempts;
Expand Down
1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Audio/csc.rsp

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class BoneHider : ScriptableWizard
public static void ToggleBones()
{
// Find all instances of BoneRenderer in the scene.
BoneRenderer[] bones = FindObjectsOfType<BoneRenderer>();
BoneRenderer[] bones = FindObjectsByType<BoneRenderer>(UnityEngine.FindObjectsInactive.Exclude);

// Check if there are any bones to toggle. If not, simply return.
if (bones.Length == 0) return;
Expand All @@ -27,7 +27,7 @@ public static void ToggleBones()
public static void ToggleEffectors()
{
// Find all instances of Rig in the scene.
Rig[] rigs = FindObjectsOfType<Rig>();
Rig[] rigs = FindObjectsByType<Rig>(UnityEngine.FindObjectsInactive.Exclude);

// Initialize a flag to indicate if the valueToSet has been determined.
bool valueDetermined = false;
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/AvatarRendering/Emotes/csc.rsp

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/AvatarRendering/Thumbnails/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/AvatarRendering/Thumbnails/csc.rsp.meta

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Character/CharacterCamera/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/Character/CharacterCamera/csc.rsp.meta

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,36 @@ public UniTask UpdateAvatarAsync(CharacterPreviewAvatarModel avatarModel, Cancel
{
ct.ThrowIfCancellationRequested();

ref AvatarShapeComponent avatarShape = ref globalWorld.Get<AvatarShapeComponent>(characterPreviewEntity);

avatarShape.SkinColor = avatarModel.SkinColor;
avatarShape.HairColor = avatarModel.HairColor;
avatarShape.EyesColor = avatarModel.EyesColor;
avatarShape.BodyShape = BodyShape.FromStringSafe(avatarModel.BodyShape);
BodyShape bodyShape = BodyShape.FromStringSafe(avatarModel.BodyShape);

avatarShape.WearablePromise.ForgetLoading(globalWorld);
// structural work first, results into locals: promise creation/destruction and
// entity creation relocate archetype chunks and invalidate any outstanding ref
// to this component - including the structural changes hidden inside
// Promise.Create and ForgetLoading.
globalWorld.Get<AvatarShapeComponent>(characterPreviewEntity).WearablePromise.ForgetLoading(globalWorld);

avatarShape.WearablePromise = AssetPromise<WearablesResolution, GetWearablesByPointersIntention>.Create(
var wearablePromise = AssetPromise<WearablesResolution, GetWearablesByPointersIntention>.Create(
globalWorld,
WearableComponentsUtils.CreateGetWearablesByPointersIntention(avatarShape.BodyShape,
WearableComponentsUtils.CreateGetWearablesByPointersIntention(bodyShape,
avatarModel.Wearables ?? (IReadOnlyCollection<URN>)Array.Empty<URN>(), avatarModel.ForceRenderCategories),
PartitionComponent.TOP_PRIORITY
);

Entity emotePromiseEntity = builderEmotesPreview
? Entity.Null
: globalWorld.Create(EmotePromise.Create(globalWorld,
EmoteComponentsUtils.CreateGetEmotesByPointersIntention(avatarShape.BodyShape,
EmoteComponentsUtils.CreateGetEmotesByPointersIntention(bodyShape,
avatarModel.Emotes ?? (IReadOnlyCollection<URN>)Array.Empty<URN>()),
PartitionComponent.TOP_PRIORITY));

// the ref is taken only after every structural change has completed (DCLA001)
ref AvatarShapeComponent avatarShape = ref globalWorld.Get<AvatarShapeComponent>(characterPreviewEntity);

avatarShape.SkinColor = avatarModel.SkinColor;
avatarShape.HairColor = avatarModel.HairColor;
avatarShape.EyesColor = avatarModel.EyesColor;
avatarShape.BodyShape = bodyShape;
avatarShape.WearablePromise = wearablePromise;
avatarShape.IsDirty = true;

return WaitForAvatarInstantiatedAsync(emotePromiseEntity, ct);
Expand Down
5 changes: 4 additions & 1 deletion Explorer/Assets/DCL/Chat/_Refactor/ChatPanelPresenter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using DCL.Chat.ChatReactions.Networking;
using DCL.Chat.ChatReactions.Presenters;
using DCL.Chat.ChatServices;
using DCL.CharacterCamera;
using DCL.FeatureFlags;
using DCL.Input;
using DCL.Chat.ChatServices.ChatContextService;
Expand Down Expand Up @@ -79,7 +80,8 @@ public ChatPanelPresenter(ChatPanelView view,
ChatMessageReactionService messageReactionService,
IWeb3IdentityCache web3IdentityCache,
IProfileCache profileCache,
IInputBlock inputBlock)
IInputBlock inputBlock,
IExposedCameraData exposedCameraData)
{
this.chatSharedAreaEventBus = chatSharedAreaEventBus;
this.chatMemberListService = chatMemberListService;
Expand Down Expand Up @@ -229,6 +231,7 @@ public ChatPanelPresenter(ChatPanelView view,
reactionSimulation,
reactionsConfig,
reactionDebugState,
exposedCameraData,
reactionDebugController,
view.ChatReactionButton.ReactionButton);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Threading;
using Cysharp.Threading.Tasks;
using DCL.CharacterCamera;
using DCL.Chat.ChatReactions.Configs;
using DCL.Chat.ChatReactions.Core;
using DCL.Chat.ChatReactions.Debug;
Expand All @@ -20,6 +21,7 @@ public sealed class SituationalReactionPresenter : IDisposable
private readonly ChatReactionDebugState debugState;
private readonly SituationalReactionDebugController? debugController;
private readonly RectTransform? debugButtonRect;
private readonly IExposedCameraData exposedCameraData;
private readonly CancellationTokenSource cts = new ();

private Camera? cachedMainCamera;
Expand All @@ -30,12 +32,14 @@ public sealed class SituationalReactionPresenter : IDisposable
internal SituationalReactionPresenter(ISituationalReactionSimulation service,
ChatReactionsConfig config,
ChatReactionDebugState debugState,
IExposedCameraData exposedCameraData,
SituationalReactionDebugController? debugController = null,
Button? debugButton = null)
{
this.service = service;
this.config = config;
this.debugState = debugState;
this.exposedCameraData = exposedCameraData;
this.debugController = debugController;
this.debugButtonRect = debugButton != null ? debugButton.GetComponent<RectTransform>() : null;

Expand All @@ -62,7 +66,7 @@ private async UniTask UpdateLoopAsync(CancellationToken ct)
float dt = UnityEngine.Time.unscaledDeltaTime;

if (cachedMainCamera == null)
cachedMainCamera = Camera.main;
cachedMainCamera = exposedCameraData.CinemachineBrain?.OutputCamera;

Profiler.BeginSample("ChatReactions.Tick");
service.Tick(dt);
Expand Down
1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Chat/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/Chat/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/CommunicationData/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/CommunicationData/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Donations/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/Donations/csc.rsp.meta

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using ECS.Unity.Systems;
using UnityEngine;

// ReSharper disable once CheckNamespace (Code generation issues)
namespace DCL.Systems
{
/// <summary>
Expand Down
1 change: 1 addition & 0 deletions Explorer/Assets/DCL/Editor/csc.rsp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-nullable:enable

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/EmotesWheel/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/EmotesWheel/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/ExplorePanel/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/ExplorePanel/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;

// ReSharper disable once CheckNamespace
namespace DCL.FeatureFlags
{
[Serializable]
Expand Down
1 change: 0 additions & 1 deletion Explorer/Assets/DCL/FeatureFlags/Tests/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/FeatureFlags/Tests/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/FeatureFlags/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/FeatureFlags/csc.rsp.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Friends/csc.rsp

This file was deleted.

7 changes: 0 additions & 7 deletions Explorer/Assets/DCL/Friends/csc.rsp.meta

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ReSharper disable once CheckNamespace
namespace Global.AppArgs
{
public static class AppArgsFlags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ public ChatPlugin CreatePlugin(
bootstrapContainer.Environment,
bootstrapContainer.Analytics.Controller,
StreamReactionsChatCommand,
staticContainer.ExposedGlobalDataContainer.ExposedCameraData,
CurrentChannelService);

public void Dispose()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
using Utility;
using MinimumSpecsScreenView = DCL.ApplicationGuards.MinimumSpecsScreenView;

// ReSharper disable once CheckNamespace
namespace Global.Dynamic
{
public class MainSceneLoader : MonoBehaviour, ICoroutineRunner
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ReSharper disable once CheckNamespace
namespace System.Runtime.CompilerServices
{
internal class IsExternalInit { }
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading