RR/jelito
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Brajanowski
2025-07-17 06:36:55 +02:00
parent d1239ca70b
commit faf4bd1ca9
23 changed files with 86 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/jelycho/Code/ButtonActor.cs
View File

@@ -9,7 +9,6 @@ namespace RebootReality.jelycho {
public class ButtonActor : Actor, IInteractable {
static readonly Logger s_Logger = new Logger(nameof(ButtonActor));
[SerializeField] Outline m_Outline;
[SerializeField] Transform m_Graphics;
[SerializeField] float m_CooldownDuration = 0.5f;
@@ -65,12 +64,6 @@ namespace RebootReality.jelycho {
// @MARK: IInteractable
//
public void SetHighlight(bool highlight) {
if (m_Outline == null) {
Debug.LogError("ButtonActor does not have an Outline component.");
return;
}
m_Outline.enabled = highlight;
}
public void Interact() {

8
Assets/jelycho/Code/Items/ItemActor.cs
View File

@@ -16,8 +16,6 @@ namespace RebootReality.jelycho.Items {
[field: SerializeField] public ItemConfig Config { get; private set; }
[SerializeField] Outline m_Outline;
//
// @MARK: Unity callbacks
//
@@ -38,12 +36,6 @@ namespace RebootReality.jelycho.Items {
// @MARK: IInteractable
//
public void SetHighlight(bool highlight) {
if (m_Outline == null) {
s_Logger.Error("ItemActor does not have an Outline component.");
return;
}
m_Outline.enabled = highlight;
}
public void Interact() { }

8
Assets/jelycho/Code/Items/WorkbenchActor.cs
View File

@@ -27,12 +27,12 @@ namespace RebootReality.jelycho.Items {
[SerializeField] TMP_Text m_TimerText;
public override void ServerTick(float deltaTime) {
base.ServerTick(deltaTime);
public override void OnServerTick(float deltaTime) {
base.OnServerTick(deltaTime);
}
public override void ClientTick(float deltaTime) {
base.ClientTick(deltaTime);
public override void OnClientTick(float deltaTime) {
base.OnClientTick(deltaTime);
m_TimerText.text = DataAs<WorkbenchActorData>().SelectedRecipeIndex.ToString();
}

3
Assets/jelycho/Code/Outlines.meta
View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 16de37dffae64252bb9e33ebe89e9266
timeCreated: 1752151116

25
Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs
View File

@@ -1,25 +0,0 @@
using UnityEngine.Rendering;
using UnityEngine.Rendering.RenderGraphModule;
using UnityEngine.Rendering.Universal;
namespace RebootReality.jelycho.Outlines {
public class OutlinesRendererFeature : ScriptableRendererFeature {
class OutlinesRenderPass : ScriptableRenderPass {
public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) {
base.RecordRenderGraph(renderGraph, frameData);
}
}
OutlinesRenderPass m_RenderPass;
public override void Create() {
m_RenderPass = new OutlinesRenderPass {
renderPassEvent = RenderPassEvent.AfterRenderingPostProcessing
};
}
public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) {
renderer.EnqueuePass(m_RenderPass);
}
}
}

3
Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs.meta
View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 4926ff5ce47e454fad5255be684a85b7
timeCreated: 1752151128

10
Assets/jelycho/Code/Player/PlayerActor.cs
View File

@@ -124,8 +124,8 @@ namespace RebootReality.jelycho.Player {
//
// @MARK: Actor
//
public override void ServerTick(float deltaTime) {
base.ServerTick(deltaTime);
public override void OnServerTick(float deltaTime) {
base.OnServerTick(deltaTime);
// Update actor data
// PlayerActorData data = DataAs<PlayerActorData>();
@@ -135,8 +135,8 @@ namespace RebootReality.jelycho.Player {
SendActorEvent((ushort) PlayerActorEvents.UpdatedRemoteState, remoteStateData);
}
public override void ClientTick(float deltaTime) {
base.ClientTick(deltaTime);
public override void OnClientTick(float deltaTime) {
base.OnClientTick(deltaTime);
if (m_IsSetupAsOwner) {
TickCamera();
@@ -448,6 +448,8 @@ namespace RebootReality.jelycho.Player {
if (!RR.IsServer()) {
return;
}
// @BUG: Sometimes the item will not update it's physics state and will keep floating in the air. It's rare?
UpdateEquippedItem();