Commit Graph

31 Commits

Author SHA1 Message Date
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
rob gay
392f655286 Fix CIS issue with OSC dependency on Networking not being public. Add missing _API identifiers to public API
#rnx
#jira UE-92210
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12925828 in //UE4/Release-4.25/... via CL 12925838 via CL 12925842
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12925848 by rob gay in Main branch]
2020-04-20 12:29:28 -04:00
rob gay
fe9f8a9abc Move OSCServerProxy packet processing to be pumped on tick and not forwarding request to task graph. Avoids crash caused by callback on destructed server proxy.
#jira UE-92165
#rb aaron.mcleran
#test -game, editor, stand-alone client in QAGame, stress test spamming messages while starting and stopping OSCServer
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12912089 in //UE4/Release-4.25/... via CL 12912091 via CL 12912092
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12912094 by rob gay in Main branch]
2020-04-19 23:22:40 -04:00
rob gay
9459ab89e9 Fix logging line breaks & minor formatting in OSC cvars
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 11969904 in //UE4/Release-4.25/... via CL 11970114
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11970137 by rob gay in Main branch]
2020-03-05 20:34:27 -05:00
Rob Gay
c7e7bba0b5 Change names of OSC Types to avoid collisions with common macro names & reduce type tag size to uint8
#rb ethan.geller
#jira UE-89566

[CL 11672362 by Rob Gay in Main branch]
2020-02-27 13:24:09 -05:00
jeremie roy
1495cdafc5 Add native delegates to OSC server
Pass address and port to callbacks

#jira UE-89626
#rb rob.gay

#ROBOMERGE-SOURCE: CL 11644149 in //UE4/Release-4.25/... via CL 11644150
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11644152 by jeremie roy in Main branch]
2020-02-26 17:35:14 -05:00
rob gay
63d3d32b29 - Add new cvars to manipulate and test OSC client/server connections as well as query state of initialized respective uobjects
- Ensure OSC clients/servers are stopped on destruction
- Fix-ups for BP API (refs on wrong side of node)
#rb phil.popp


#ROBOMERGE-SOURCE: CL 11591275 via CL 11591285
#ROBOMERGE-BOT: (v655-11596533)

[CL 11617633 by rob gay in Main branch]
2020-02-25 15:59:37 -05:00
rob gay
acecb998e7 Fix bad macro syntax
#rb none


#ROBOMERGE-SOURCE: CL 11591201 via CL 11591205
#ROBOMERGE-BOT: (v655-11596533)

[CL 11617601 by rob gay in Main branch]
2020-02-25 15:59:22 -05:00
rob gay
4aae50c3af - Enable OSC for all platforms
- Fix null termination memory scribble/crash when passing empty strings as payload in message members
- Fix memory scribble when sending messages larger than 1024 bytes

Minor features:
- Clean-up some OSC BP interface issues (missing UPARAM(ref) markup, comments, etc.)
- Add bool return to message payload array requests to determine if failed or if value is "fresh"
- Add BP functions to convert Object path to and from OSCAddress
- Add ability to remove OSC containers at index
- Fix pattern matching for wildcarding over span of containers/method

#rb ryan.mangin


#ROBOMERGE-SOURCE: CL 11591183 via CL 11591193
#ROBOMERGE-BOT: (v655-11596533)

[CL 11617587 by rob gay in Main branch]
2020-02-25 15:59:15 -05:00
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
rob gay
33f0b404f3 Fix compiler error
#rb none
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 10119460 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10119669 by rob gay in Main branch]
2019-11-12 20:28:53 -05:00
rob gay
c4522de695 - Clean Up OSC address function comments in blueprint
- Add optimized Push/PopContainers (multiple) to FOSCAddress (only caches aggregates after removing/adding all)
- Add missing BP call for FOSCAddress::ClearContainers
#rb ethan.geller
#jira none

#ROBOMERGE-SOURCE: CL 10119453 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10119661 by rob gay in Main branch]
2019-11-12 20:28:49 -05:00
rob gay
f7f99ae640 Fix comment typo
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 10115092 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10115096 by rob gay in Main branch]
2019-11-12 14:48:12 -05:00
Rob Gay
c2c256431a Remove duplicate code in OSC plugin post merge completion that was moved to FAudioAddressPattern to allow for modulation to route mixes using same address pattern matching logic
#rb ethan.geller
#jira UE-81970

[CL 9627883 by Rob Gay in 4.24 branch]
2019-10-16 19:53:12 -04:00
Rob Gay
c0fc8f54d1 - Fix bug with OSC bundle corruption due to read not accounting for header element offset
- Clarify server's function call (not necessarily OnMessageReceive, but OnPacketReceive and then diverts to packet type accordingly)
#jira UEAU-350
#rb aaron.mcleran

[CL 9306478 by Rob Gay in Main branch]
2019-09-30 15:56:49 -04:00
rob gay
643faac36b OSC string parse pad position required increment to next character.
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7983636 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 7983675 by rob gay in Main branch]
2019-08-13 11:47:36 -04:00
rob gay
bb3167ead3 Fix bug with reading OSC string sometimes not finding null terminator introduced in earlier CL.
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7980537 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 7980545 by rob gay in Main branch]
2019-08-13 11:16:59 -04:00
rob gay
a392ae3a3b Add back code in module start-up to ensure networking is loaded for packaged builds.
#rb none
#jira UE-77240

#ROBOMERGE-SOURCE: CL 7955468 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v393-7951996)

[CL 7955470 by rob gay in Main branch]
2019-08-12 18:43:32 -04:00
rob gay
4791712aa3 - Fix package fail in OSC by moving networking implementation to internal proxies for Client/Server code & cleaning up build.cs
- Fix crash in packaged builds on initialization by moving socket connection for Server/Client to separate function (as opposed to being created in uobject construction)
- Minor clean-up to thread code & recurse & dispatch bundles and contained messages/bundles appropriately
#jira UE-77240
#rb aaron.mcleran

#ROBOMERGE-SOURCE: CL 7954178 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v393-7951996)

[CL 7954198 by rob gay in Main branch]
2019-08-12 17:31:07 -04:00
rob gay
78f6183677 - Remove unnecessary Get/SetAddress on base IOSCPacket class.
- Safeguard against calling stop and then attempting to send message after Socket is closed and nulled on OSCClient.
- Move caching hash/IsValidPattern/IsValidPath to CacheAggregates and call anytime OSCAddress properties are modified.
- Use OSCAddress spec pattern matching instead of substring match
#rb ethan.geller
#jira none
[FYI] aaron.mcleran

#ROBOMERGE-SOURCE: CL 7918044 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v391-7919777)

[CL 7935801 by rob gay in Main branch]
2019-08-09 12:49:04 -04:00
rob gay
b96b758d44 - Clean-up and document public API
- Make OSC address pattern matching only match once and allow multiple delegates to subscribe to match
#rb aaron.mcleran
#jira none

#ROBOMERGE-SOURCE: CL 7780979 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v386-7774470)

[CL 7780981 by rob gay in Main branch]
2019-08-05 19:38:09 -04:00
rob gay
0f31472eaf Remove code optimization from build cs
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7772382 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7772384 by rob gay in Main branch]
2019-08-05 14:35:43 -04:00
rob gay
785e54e6b9 - Fix unity builds
- Add OSC Address Matching API
#rb maxwell.hayes
[FYI] aaron.mcleran
#jira none

#ROBOMERGE-SOURCE: CL 7772115 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7772131 by rob gay in Main branch]
2019-08-05 14:29:36 -04:00
Rob Gay
d258ed10c1 Fix non-unity build
#rb none
#jira none

[CL 7711898 by Rob Gay in Main branch]
2019-08-03 03:10:35 -04:00
rob gay
dc91465537 Fix earlier errors backed out by moving packet implementation out of public API to private implementation so manager implementation can be private
Reinstating change:
- Remove unnecessary custom types
- Move Manager implementation to private directory
#rb maxwell.hayes
[FYI] aaron.mcleran
#jira none

#ROBOMERGE-SOURCE: CL 7711823 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7711824 by rob gay in Main branch]
2019-08-02 23:34:44 -04:00