Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiplayer FaceCam #624

Merged
merged 105 commits into from
Aug 17, 2023
Merged

Multiplayer FaceCam #624

Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
c741578
Added simple NetworkObject template.
Li-ID May 20, 2023
01c8cfa
Updated the Example.
Li-ID May 21, 2023
3cba6d8
Updated the Example. Added an RPC Example, should later be used for v…
Li-ID May 22, 2023
2b47053
The desktopPlayer now gets an (empty) FaceCam Object as child.
Li-ID May 22, 2023
7b3af5c
The FaceCam prefab became an proper NetworkObject and can render a Quad.
Li-ID May 22, 2023
18abdb0
Fixed spawning, updatet FaceCam prefab.
Li-ID May 22, 2023
bc0cb56
Merge branch 'master' into 560-FaceCam
Li-ID May 22, 2023
9c8072f
Trying to fix the FaceCam onto the players nose.
Li-ID May 22, 2023
4468793
Spawning the FaceCam Object as an real NetworkObject. (Bugfix)
Li-ID May 22, 2023
7b998a5
FaceCam NetworkObject is now a child of the player.
Li-ID May 22, 2023
3ad3950
FaceCam now spawns with every player as child.
Li-ID May 23, 2023
2680b7b
FaceCams are now always at the nose of the players.
Li-ID May 23, 2023
079c78e
Every Facecam is now gold if it belongs to the local player. Evereyon…
Li-ID May 23, 2023
5ed4298
Sending fake video from every client to the server.
Li-ID May 23, 2023
6153d9b
The FaceCams now broadcast their local fake video to all clients.
Li-ID May 23, 2023
657ff19
The FaceCams now broadcast their local fake video over the server to …
Li-ID May 23, 2023
6bd887d
Mostly everything is now in the FaceCam prefab.
Li-ID May 24, 2023
52ba9a8
Webcam prefab deleted.
Li-ID May 24, 2023
ba353be
FaceCam prefab now displays the Webcam locally.
Li-ID May 24, 2023
99d0054
FaceCam encodes and decodes the Frame between Texture2D and JPG. Move…
Li-ID May 24, 2023
ecd5af6
Fixing encodeing and decoding of the video frame.
Li-ID May 24, 2023
8d3a890
Finally sending real video over the network.
Li-ID May 24, 2023
36b35b9
Starting to merge WebCamTextureToMatHelperExample.cs into FaceCam.cs.…
Li-ID May 24, 2023
310f8c5
Cleaned up code of FaceCam.cs and commented it.
Li-ID May 24, 2023
cc67583
WebCamTextureToMatHelperExample.cs merged into FaceCam.cs.
Li-ID May 24, 2023
fa30867
Fixed little error in the comments.
Li-ID May 24, 2023
76be448
Crop the frame and displayed texture to the detected face, and update…
Li-ID May 25, 2023
f0492db
Video is correctly distributed over the network, and the face is crop…
Li-ID Jun 8, 2023
6c35e27
Simplified the code.
Li-ID Jun 13, 2023
2292f31
Always display video, not only if a face is found.
Li-ID Jun 15, 2023
1062bc7
FaceCam has now a fixed height.
Li-ID Jun 15, 2023
60db449
The FaceCam smoothly focus onto the face.
Li-ID Jun 16, 2023
0a0051a
Code cleaned up and simplified.
Li-ID Jul 7, 2023
f6dba12
Added functions to change FaceCam position and to turn it on and off.
Li-ID Jul 7, 2023
00891ff
Using unreliable RPC to send video. This should improve the performance.
Li-ID Jul 8, 2023
69fa768
Using reliable Rpc because the files can be bigger.
Li-ID Jul 8, 2023
8feb104
Cleaned up code and assets.
Li-ID Jul 8, 2023
ba5e4be
Finished the code documentation.
Li-ID Jul 13, 2023
c0efb50
Added DlibFaceLandmark with OpenCV example, and a corresponding prefab.
falko17 Jul 17, 2023
c3fd776
Moved the whole example to the prefab into the FaceCam folder. Prefab…
Li-ID May 24, 2023
dd09082
Fixed wrong files after rebase.
Li-ID Jul 17, 2023
b8959dd
Moved non prefab files from Assets/Resources/Prefabs/FaceCam to Asset…
Li-ID Jul 17, 2023
4bf8783
Addet Autor of WebCamTextureToMatHelperExample.cs.
Li-ID Jul 17, 2023
63b394b
Trailing whitespace removed.
Li-ID Jul 17, 2023
49a637d
Trailing whitespace removed.
Li-ID Jul 17, 2023
f9a44e6
Trailing whitespace removed.
Li-ID Jul 17, 2023
d658dd5
Code style improvement.
Li-ID Jul 17, 2023
8eb9789
Spelling correction.
Li-ID Jul 17, 2023
5162341
Code style improvement.
Li-ID Jul 17, 2023
e4f80ea
Code style improvement.
Li-ID Jul 17, 2023
f5742e8
Spelling correction.
Li-ID Jul 17, 2023
3611d6f
Spelling correction.
Li-ID Jul 17, 2023
8e8d8a0
Spelling correction.
Li-ID Jul 17, 2023
9693783
Spelling correction.
Li-ID Jul 17, 2023
4907999
Spelling correction.
Li-ID Jul 17, 2023
2806b98
Spelling correction.
Li-ID Jul 17, 2023
0bde50f
Code style improvement.
Li-ID Jul 17, 2023
dce4718
Code style improvement.
Li-ID Jul 17, 2023
2dbc92d
Spelling correction.
Li-ID Jul 17, 2023
8b6037f
Code style improvement.
Li-ID Jul 17, 2023
2979f14
Spelling correction.
Li-ID Jul 17, 2023
b99bf29
Code style improvement.
Li-ID Jul 17, 2023
c3a6098
Spelling correction.
Li-ID Jul 17, 2023
a960151
Code style improvement.
Li-ID Jul 17, 2023
ba65821
Code style improvement.
Li-ID Jul 17, 2023
3fddbee
Code style improvement.
Li-ID Jul 17, 2023
4c35ed2
Code style improvement.
Li-ID Jul 17, 2023
e7b3c9f
Code style improvement.
Li-ID Jul 17, 2023
104a63e
Code style improvement.
Li-ID Jul 17, 2023
8ab4daa
Code style improvement.
Li-ID Jul 17, 2023
38e90f3
Code style improvement.
Li-ID Jul 17, 2023
2c953e1
Spelling correction.
Li-ID Jul 17, 2023
d24d7f4
Code improvement. More accurate calculation.
Li-ID Jul 17, 2023
65a5ccd
Code style improvement.
Li-ID Jul 17, 2023
5f225f6
Code style improvement.
Li-ID Jul 17, 2023
42d6349
Spelling correction.
Li-ID Jul 17, 2023
624511e
Code style, and code improvement.
Li-ID Jul 17, 2023
54714fa
Merged FaceCam.cs
Li-ID Jul 17, 2023
a9ffc05
Fix assembly references #560
falko17 Jul 18, 2023
9bc0f5a
Fix compile errors in FaceCam.cs
falko17 Jul 18, 2023
f97504d
Remove redundant code in FaceCam.cs
falko17 Jul 18, 2023
15d6e67
Apply remaining review comments for FaceCam.cs
falko17 Jul 18, 2023
e54e397
Updated FaceCam.prefab settings.
Li-ID Jul 18, 2023
ef7674e
Cache the material of the FaceCam.
Li-ID Jul 18, 2023
2aef5ae
Code style improvement. No unnecessary type conversion.
Li-ID Jul 18, 2023
5517b02
Code style improvement.
Li-ID Jul 18, 2023
d39f948
#560 Protect against null pointer derference.
koschke Jul 25, 2023
245fb06
#560 More diagnosis in network connections.
koschke Jul 25, 2023
df22420
#560 Field networkManager should be private.
koschke Jul 25, 2023
82d0b6c
#560 Minor issues fixed:
koschke Jul 25, 2023
2700d2f
#560 Preloaded asset was removed by Unity for whatever reason.
koschke Jul 25, 2023
d58b77e
#560 Upgraded to Unity version 2022.3.5f1.
koschke Jul 25, 2023
409771e
Merge remote-tracking branch 'origin/master' into 560-FaceCam
koschke Jul 29, 2023
1cf379f
#560 Input and KeyCode must not be used. Use SEEInput instead.
koschke Jul 29, 2023
927e5c8
#560 Field networkManager can be declared readonly.
koschke Jul 29, 2023
1c0781b
#560 Re-activated the server check for instantiating the FaceCam prefab.
koschke Jul 29, 2023
b96f1d9
Merge remote-tracking branch 'origin/master' into 560-FaceCam
koschke Jul 29, 2023
14cd08b
Merge remote-tracking branch 'origin/master' into 560-FaceCam
koschke Aug 14, 2023
49febe8
Replaced an assertion by an error message.
koschke Aug 15, 2023
21614a4
Merge remote-tracking branch 'origin/master' into 560-FaceCam
koschke Aug 17, 2023
705d6bc
#560 Added a FIXME marker. An issue #633 was filed.
koschke Aug 17, 2023
b90fd9f
#560 Removed unused field.
koschke Aug 17, 2023
fc63286
#560 Documented assigned but otherwise unused field.
koschke Aug 17, 2023
4acdd74
Merge branch '560-FaceCam' of github.com:uni-bremen-agst/SEE into 560…
koschke Aug 17, 2023
0f791a9
#560 A CI check complained about using Object.Destroy.
koschke Aug 17, 2023
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
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ Assets/StreamingAssets/Videos.meta filter=lfs diff=lfs merge=lfs -text
Assets/StreamingAssets/Videos/** filter=lfs diff=lfs merge=lfs -text
Assets/Trailer/** filter=lfs diff=lfs merge=lfs -text
Assets/XR/** filter=lfs diff=lfs merge=lfs -text
Assets/StreamingAssets/DlibFaceLandmarkDetector/** filter=lfs diff=lfs merge=lfs -text
Assets/StreamingAssets/DlibFaceLandmarkDetector.meta filter=lfs diff=lfs merge=lfs -text
3 changes: 3 additions & 0 deletions Assets/Plugins/FaceCam.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Plugins/FaceCam/ExampleMaterial.mat
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Plugins/FaceCam/ExampleMaterial.mat.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Plugins/FaceCam/LoadingIcon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Assets/Plugins/FaceCam/LoadingIcon.png.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Assets/Resources/Prefabs/FaceCam.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7e64bdca8ca79144ca57228ee19577cb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Loading