Skip to content

Commit 2740dca

Browse files
shasheppardshasheppard
committed
reverted some of the changes that came from the commit of local changes after having not touched the project in ~2 years, which the changes appeared to be testing some idea(s) I had about reducing the bandwidth by having an everchanging narrow range of values...and although it works, it does not translate to smoothness...so it is gone.
1 parent 0711894 commit 2740dca

10 files changed

+115
-69
lines changed

‎.gitignore

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/[Ll]ibrary/
2+
/[Tt]emp/
3+
/[Oo]bj/
4+
/[Bb]uild/
5+
/[Bb]uilds/
6+
/[Ll]ogs/
7+
/[Uu]ser[Ss]ettings/
8+
9+
# MemoryCaptures can get excessive in size.
10+
# They also could contain extremely sensitive data
11+
/[Mm]emoryCaptures/
12+
13+
# Recordings can get excessive in size
14+
/[Rr]ecordings/
15+
16+
# Uncomment this line if you wish to ignore the asset store tools plugin
17+
# /[Aa]ssets/AssetStoreTools*
18+
19+
# Autogenerated Jetbrains Rider plugin
20+
/[Aa]ssets/Plugins/Editor/JetBrains*
21+
22+
# Visual Studio cache directory
23+
.vs/
24+
25+
# Gradle cache directory
26+
.gradle/
27+
28+
# Autogenerated VS/MD/Consulo solution and project files
29+
ExportedObj/
30+
.consulo/
31+
*.csproj
32+
*.unityproj
33+
*.sln
34+
*.suo
35+
*.tmp
36+
*.user
37+
*.userprefs
38+
*.pidb
39+
*.booproj
40+
*.svd
41+
*.pdb
42+
*.mdb
43+
*.opendb
44+
*.VC.db
45+
46+
# Unity3D generated meta files
47+
*.pidb.meta
48+
*.pdb.meta
49+
*.mdb.meta
50+
51+
# Unity3D generated file on crash reports
52+
sysinfo.txt
53+
54+
# Builds
55+
*.apk
56+
*.aab
57+
*.unitypackage
58+
*.app
59+
60+
# Crashlytics generated file
61+
crashlytics-build.properties
62+
63+
# Packed Addressables
64+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
65+
66+
# Temporary auto-generated Android Assets
67+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
68+
/[Aa]ssets/[Ss]treamingAssets/aa/*

‎Assets/GONet/Code/GONet/GONet.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,16 +1345,11 @@ private static void SendBytes_EndOfTheLine_AllSendsAndSavesMUSTComeHere_Separate
13451345

13461346
static Thread endOfLineSendAndSaveThread;
13471347

1348-
static readonly Stopwatch timer = new Stopwatch();
1349-
13501348
/// <summary>
13511349
/// Should only be called from <see cref="GONetGlobal"/> once per Unity <see cref="MonoBehaviour"/> Update cycle.
13521350
/// </summary>
13531351
internal static void Update(GONetBehaviour coroutineManager)
13541352
{
1355-
timer.Reset();
1356-
timer.Start();
1357-
13581353
Time.Update(); // This is the important thing to execute as early in a frame as possible (hence the -32000 setting in Script Execution Order) to get more accurate network timing to match Unity's frame time as it relates to values changing
13591354

13601355
EventBus.PublishQueuedEventsForMainThread();
@@ -1363,9 +1358,6 @@ internal static void Update(GONetBehaviour coroutineManager)
13631358
{
13641359
coroutineManager.StartCoroutine(Update_EndOfFrame());
13651360
}
1366-
1367-
timer.Stop();
1368-
GONetLog.Debug($"Update ticks: {timer.ElapsedTicks}");
13691361
}
13701362

13711363
private static IEnumerator Update_EndOfFrame()
@@ -1379,9 +1371,6 @@ private static IEnumerator Update_EndOfFrame()
13791371

13801372
internal static void Update_DoTheHeavyLifting_IfAppropriate(GONetLocal gonetLocalCaller, bool shouldCheckGONetLocalArgument)
13811373
{
1382-
timer.Reset();
1383-
timer.Start();
1384-
13851374
bool isAppropriate = (!shouldCheckGONetLocalArgument || gonetLocalCaller == myLocal)
13861375
&& lastCalledFrame_Update_DoTheHeavyLifting < UnityEngine.Time.frameCount; // avoid accidentally calling this multiple times a frame since it is called from two possible places
13871376

@@ -1476,9 +1465,6 @@ internal static void Update_DoTheHeavyLifting_IfAppropriate(GONetLocal gonetLoca
14761465

14771466
recentlyDisabledGONetId_to_GONetIdAtInstantiation_Map.Clear();
14781467
}
1479-
1480-
timer.Stop();
1481-
GONetLog.Debug($"Update_DoTheHeavyLifting_IfAppropriate time in ticks: {timer.ElapsedTicks}");
14821468
}
14831469

14841470
private static void SaveEventsInQueueASAP_IfAppropriate(bool shouldForceAppropriateness = false) // TODO put all this in another thread to not disrupt the main thread with saving!!!

‎Assets/GONet/Code/GONet/Generation/GONetParticipant_AutoMagicalSyncCompanion_Generated.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,6 @@ internal void AppendListWithChangesSinceLastCheck(List<GONetMain.AutoMagicalSync
304304
for (int i = 0; i < valuesCount; ++i)
305305
{
306306
GONetMain.AutoMagicalSync_ValueMonitoringSupport_ChangedValue valueChangeSupport = valuesChangesSupport[i];
307-
308-
{ // TODO FIXME remove this test code:
309-
if (IsLastKnownValue_VeryCloseTo_Or_AlreadyOutsideOf_QuantizationRange((byte)i, valueChangeSupport))
310-
{
311-
//GONetLog.Debug("***************************** (almost) out of range of quantization limits for index: " + i);
312-
}
313-
}
314-
315307
if (lastKnownValueChangesSinceLastCheck[i] && DoesMatchUniqueGrouping(valueChangeSupport, onlyMatchIfUniqueGroupingMatches))
316308
{
317309
syncValuesToSend.Add(valueChangeSupport);

‎Assets/GONet/Code/GONet/Generation/Generated/BobWad_Generated.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ static BobWad()
14341434
var item_codeGenerationId1_single1_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
14351435
settings.Add(item_codeGenerationId1_single1_singleMember0);
14361436

1437-
var item_codeGenerationId1_single1_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
1437+
var item_codeGenerationId1_single1_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
14381438
settings.Add(item_codeGenerationId1_single1_singleMember1);
14391439

14401440
var item_codeGenerationId2_single0_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
@@ -1476,7 +1476,7 @@ static BobWad()
14761476
var item_codeGenerationId2_single2_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
14771477
settings.Add(item_codeGenerationId2_single2_singleMember0);
14781478

1479-
var item_codeGenerationId2_single2_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
1479+
var item_codeGenerationId2_single2_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
14801480
settings.Add(item_codeGenerationId2_single2_singleMember1);
14811481

14821482
var item_codeGenerationId3_single0_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
@@ -1497,7 +1497,7 @@ static BobWad()
14971497
var item_codeGenerationId3_single1_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
14981498
settings.Add(item_codeGenerationId3_single1_singleMember0);
14991499

1500-
var item_codeGenerationId3_single1_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
1500+
var item_codeGenerationId3_single1_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
15011501
settings.Add(item_codeGenerationId3_single1_singleMember1);
15021502

15031503
var item_codeGenerationId4_single0_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
@@ -1542,7 +1542,7 @@ static BobWad()
15421542
var item_codeGenerationId4_single2_singleMember0 = new GONet.Utils.QuantizerSettingsGroup(-1.701412E+38f, 1.701412E+38f, 0, true);
15431543
settings.Add(item_codeGenerationId4_single2_singleMember0);
15441544

1545-
var item_codeGenerationId4_single2_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
1545+
var item_codeGenerationId4_single2_singleMember1 = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
15461546
settings.Add(item_codeGenerationId4_single2_singleMember1);
15471547

15481548
return settings;

‎Assets/GONet/Code/GONet/Generation/Generated/GONetParticipant_AutoMagicalSyncCompanion_Generated_1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ internal GONetParticipant_AutoMagicalSyncCompanion_Generated_1(GONetParticipant
197197
support5.syncAttribute_Reliability = AutoMagicalSyncReliability.Unreliable;
198198
support5.syncAttribute_ShouldBlendBetweenValuesReceived = true;
199199
GONet.GONetAutoMagicalSyncAttribute.ShouldSkipSyncByRegistrationIdMap.TryGetValue(2, out support5.syncAttribute_ShouldSkipSync);
200-
support5.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
200+
support5.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
201201

202-
cachedCustomSerializers[5] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(11, -1f, 1f);
202+
cachedCustomSerializers[5] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(18, -125f, 125f);
203203
cachedCustomValueBlendings[5] = GONetAutoMagicalSyncAttribute.GetCustomValueBlending<GONet.PluginAPI.GONetDefaultValueBlending_Vector3>();
204204

205205
int support5_mostRecentChanges_calcdSize = support5.syncAttribute_SyncChangesEverySeconds != 0 ? (int)((GONetMain.valueBlendingBufferLeadSeconds / support5.syncAttribute_SyncChangesEverySeconds) * 2.5f) : 0;

‎Assets/GONet/Code/GONet/Generation/Generated/GONetParticipant_AutoMagicalSyncCompanion_Generated_2.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,9 @@ internal GONetParticipant_AutoMagicalSyncCompanion_Generated_2(GONetParticipant
362362
support13.syncAttribute_Reliability = AutoMagicalSyncReliability.Unreliable;
363363
support13.syncAttribute_ShouldBlendBetweenValuesReceived = true;
364364
GONet.GONetAutoMagicalSyncAttribute.ShouldSkipSyncByRegistrationIdMap.TryGetValue(2, out support13.syncAttribute_ShouldSkipSync);
365-
support13.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
365+
support13.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
366366

367-
cachedCustomSerializers[13] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(11, -1f, 1f);
367+
cachedCustomSerializers[13] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(18, -125f, 125f);
368368
cachedCustomValueBlendings[13] = GONetAutoMagicalSyncAttribute.GetCustomValueBlending<GONet.PluginAPI.GONetDefaultValueBlending_Vector3>();
369369

370370
int support13_mostRecentChanges_calcdSize = support13.syncAttribute_SyncChangesEverySeconds != 0 ? (int)((GONetMain.valueBlendingBufferLeadSeconds / support13.syncAttribute_SyncChangesEverySeconds) * 2.5f) : 0;

‎Assets/GONet/Code/GONet/Generation/Generated/GONetParticipant_AutoMagicalSyncCompanion_Generated_3.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ internal GONetParticipant_AutoMagicalSyncCompanion_Generated_3(GONetParticipant
216216
support6.syncAttribute_Reliability = AutoMagicalSyncReliability.Unreliable;
217217
support6.syncAttribute_ShouldBlendBetweenValuesReceived = true;
218218
GONet.GONetAutoMagicalSyncAttribute.ShouldSkipSyncByRegistrationIdMap.TryGetValue(2, out support6.syncAttribute_ShouldSkipSync);
219-
support6.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
219+
support6.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
220220

221-
cachedCustomSerializers[6] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(11, -1f, 1f);
221+
cachedCustomSerializers[6] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(18, -125f, 125f);
222222
cachedCustomValueBlendings[6] = GONetAutoMagicalSyncAttribute.GetCustomValueBlending<GONet.PluginAPI.GONetDefaultValueBlending_Vector3>();
223223

224224
int support6_mostRecentChanges_calcdSize = support6.syncAttribute_SyncChangesEverySeconds != 0 ? (int)((GONetMain.valueBlendingBufferLeadSeconds / support6.syncAttribute_SyncChangesEverySeconds) * 2.5f) : 0;

‎Assets/GONet/Code/GONet/Generation/Generated/GONetParticipant_AutoMagicalSyncCompanion_Generated_4.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ internal GONetParticipant_AutoMagicalSyncCompanion_Generated_4(GONetParticipant
381381
support14.syncAttribute_Reliability = AutoMagicalSyncReliability.Unreliable;
382382
support14.syncAttribute_ShouldBlendBetweenValuesReceived = true;
383383
GONet.GONetAutoMagicalSyncAttribute.ShouldSkipSyncByRegistrationIdMap.TryGetValue(2, out support14.syncAttribute_ShouldSkipSync);
384-
support14.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-1f, 1f, 11, true);
384+
support14.syncAttribute_QuantizerSettingsGroup = new GONet.Utils.QuantizerSettingsGroup(-125f, 125f, 18, true);
385385

386-
cachedCustomSerializers[14] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(11, -1f, 1f);
386+
cachedCustomSerializers[14] = GONetAutoMagicalSyncAttribute.GetCustomSerializer<GONet.Vector3Serializer>(18, -125f, 125f);
387387
cachedCustomValueBlendings[14] = GONetAutoMagicalSyncAttribute.GetCustomValueBlending<GONet.PluginAPI.GONetDefaultValueBlending_Vector3>();
388388

389389
int support14_mostRecentChanges_calcdSize = support14.syncAttribute_SyncChangesEverySeconds != 0 ? (int)((GONetMain.valueBlendingBufferLeadSeconds / support14.syncAttribute_SyncChangesEverySeconds) * 2.5f) : 0;

‎Assets/GONet/Code/GONet/Generation/gonetParticipantAssetsPaths_to_lastFrameCountProcessed.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
���7Assets/GONet/Resources/GONet/GONet_GlobalContext.prefab�6Assets/GONet/Resources/GONet/GONet_LocalContext.prefab�:Assets/GONet/Sample/Projectile/Resources/CannonBall.prefab
1+
���7Assets/GONet/Resources/GONet/GONet_GlobalContext.prefab�6Assets/GONet/Resources/GONet/GONet_LocalContext.prefab�:Assets/GONet/Sample/Projectile/Resources/CannonBall.prefab

‎Assets/GONet/Resources/GONet/SyncSettingsProfiles/_GONet_Transform_Position.asset

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &11400000
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 0
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: c72ac148faf249b459357da12c865e3c, type: 3}
13-
m_Name: _GONet_Transform_Position
14-
m_EditorClassIdentifier:
15-
SyncChangesASAP: 0
16-
SyncChangesFrequencyOccurrences: 20
17-
SyncChangesFrequencyUnitOfTime: 0
18-
SendViaReliability: 1
19-
ShouldBlendBetweenValuesReceived: 1
20-
QuantizeDownToBitCount: 11
21-
QuantizeLowerBound: -1
22-
QuantizeUpperBound: 1
23-
QuantizationResultingPrecision: 0.0009765625 (i.e., 0.977 millimeters)
24-
ProcessingPriority: 0
25-
MustRunOnUnityMainThread: 1
26-
SyncValueTypeSerializerOverrides:
27-
- ValueType: 12
28-
CustomSerializerType:
29-
_classRef: GONet.Vector3Serializer, Assembly-CSharp
30-
SyncValueTypeValueBlendingOverrides:
31-
- ValueType: 12
32-
CustomValueBlendingType:
33-
_classRef: GONet.PluginAPI.GONetDefaultValueBlending_Vector3, Assembly-CSharp
34-
ShouldSkipSyncRegistrationId: 2
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: c72ac148faf249b459357da12c865e3c, type: 3}
13+
m_Name: _GONet_Transform_Position
14+
m_EditorClassIdentifier:
15+
SyncChangesASAP: 0
16+
SyncChangesFrequencyOccurrences: 20
17+
SyncChangesFrequencyUnitOfTime: 0
18+
SendViaReliability: 1
19+
ShouldBlendBetweenValuesReceived: 1
20+
QuantizeDownToBitCount: 18
21+
QuantizeLowerBound: -125
22+
QuantizeUpperBound: 125
23+
QuantizationResultingPrecision: 0.0009536743 (i.e., 0.954 millimeters)
24+
ProcessingPriority: 0
25+
MustRunOnUnityMainThread: 1
26+
SyncValueTypeSerializerOverrides:
27+
- ValueType: 12
28+
CustomSerializerType:
29+
_classRef: GONet.Vector3Serializer, Assembly-CSharp
30+
SyncValueTypeValueBlendingOverrides:
31+
- ValueType: 12
32+
CustomValueBlendingType:
33+
_classRef: GONet.PluginAPI.GONetDefaultValueBlending_Vector3, Assembly-CSharp
34+
ShouldSkipSyncRegistrationId: 2

0 commit comments

Comments
 (0)