Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 1 addition & 4 deletions Assets/FishNet/CodeGenerating/Unity.FishNet.CodeGen.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"references": [
"FishNet.Runtime",
"FishNet.Codegen.Cecil",
"GameKit.Dependencies",
"Unity.Burst",
"Unity.Mathematics",
"Unity.Collections"
"GameKit.Dependencies"
],
"includePlatforms": [
"Editor"
Expand Down
4 changes: 1 addition & 3 deletions Assets/FishNet/Runtime/FishNet.Runtime.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"references": [
"GUID:894a6cc6ed5cd2645bb542978cbed6a9",
"GUID:1d82bdf40e2465b44b34adf79595e74c",
"GUID:d8b63aba1907145bea998dd612889d6b",
"GUID:2665a8d13d1b3f18800f46e256720795",
"GUID:e0cd26848372d4e5c891c569017e11f1"
"GUID:d8b63aba1907145bea998dd612889d6b"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

namespace FishNet.Component.Transforming.Beta.Editing
{
#if !THREADED_TICKSMOOTHERS
[CustomPropertyDrawer(typeof(MovementSettings))]
public class MovementSettingsDrawer : PropertyDrawer
{
Expand All @@ -27,7 +26,6 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
SerializedProperty adaptiveInterpolationValue = property.FindPropertyRelative("AdaptiveInterpolationValue");
SerializedProperty interpolationValue = property.FindPropertyRelative("InterpolationValue");
SerializedProperty smoothedProperties = property.FindPropertyRelative("SmoothedProperties");
SerializedProperty useLocalSpace = property.FindPropertyRelative("UseLocalSpace");
SerializedProperty snapNonSmoothedProperties = property.FindPropertyRelative("SnapNonSmoothedProperties");

_propertyDrawer.DrawProperty(enableTeleport, "Enable Teleport");
Expand All @@ -39,7 +37,6 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
_propertyDrawer.DrawProperty(interpolationValue, "Interpolation Value", indent: 1);

_propertyDrawer.DrawProperty(smoothedProperties, "Smoothed Properties");
_propertyDrawer.DrawProperty(useLocalSpace, "Use Local Space");
if ((uint)smoothedProperties.intValue != (uint)TransformPropertiesFlag.Everything)
_propertyDrawer.DrawProperty(snapNonSmoothedProperties, "Snap Non-Smoothed Properties", indent: 1);

Expand All @@ -50,6 +47,5 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten

public override float GetPropertyHeight(SerializedProperty property, GUIContent label) => _propertyDrawer.GetPropertyHeight();
}
#endif
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public override void OnInspectorGUI()
EditorGUILayout.ObjectField("Script:", MonoScript.FromMonoBehaviour((NetworkTickSmoother)target), typeof(NetworkTickSmoother), false);
GUI.enabled = true;

EditorGUILayout.LabelField("Initialization Settings", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_favorPredictionNetworkTransform);

EditorGUILayout.PropertyField(_initializationSettings);

Expand All @@ -45,6 +45,7 @@ public override void OnInspectorGUI()
EditorGUILayout.PropertyField(_spectatorMovementSettings);
}


// EditorGUI.indentLevel--;

serializedObject.ApplyModifiedProperties();
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace FishNet.Component.Transforming.Beta
{
#if !THREADED_TICKSMOOTHERS
[System.Serializable]
public struct MovementSettings
{
Expand Down Expand Up @@ -50,5 +49,4 @@ public MovementSettings(bool unityReallyNeedsToSupportParameterlessInitializersO
SnapNonSmoothedProperties = false;
}
}
#endif
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using FishNet.Object;
using GameKit.Dependencies.Utilities;
using UnityEngine;
using UnityEngine.Serialization;

namespace FishNet.Component.Transforming.Beta
{
Expand Down Expand Up @@ -52,7 +53,7 @@ private void OnDestroy()
public override void OnStartClient()
{
RetrieveControllers();

_initializationSettings.SetNetworkedRuntimeValues(initializingNetworkBehaviour: this, graphicalTransform: transform, _favorPredictionNetworkTransform);
SmootherController.Initialize(_initializationSettings, _controllerMovementSettings, _spectatorMovementSettings);

Expand Down
Loading