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.

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

V2 of connection and file sending managment #15

Closed
wants to merge 74 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
b24d989
Add Readme
Oct 11, 2024
fe23847
Add README.md
Oct 11, 2024
8504379
Merge pull request #2 from Hololens-PWr-Projekt/1-test
AdrakPro Oct 11, 2024
9136e31
Added modules to project
Oct 27, 2024
e90ed82
Added README and pip's dependencies
Oct 27, 2024
f596867
Created simple example for communication between hololens and client
Oct 27, 2024
1d240bd
Created script to start all servers at once
Oct 27, 2024
e3a5e8c
Added test files & configuration
Nov 18, 2024
4427e43
Added data models
Nov 18, 2024
e7a156c
Handling WebSocket connection & sending packets
Nov 18, 2024
50d523e
Splitting packets helper
Nov 18, 2024
24464b7
Startup script & send example packets
Nov 18, 2024
4f96d96
Unity config files
Nov 18, 2024
c5800b5
Refactor: first init Websocket then access
Nov 18, 2024
fe0318e
Refactored JsonManager
Nov 20, 2024
d8e43af
Added constructor & getters & setters to Vector3D
Nov 20, 2024
53b0bc7
Startup refactoring
Nov 20, 2024
baa55fe
Added button libs in Unity
Nov 23, 2024
d4ff902
Refactoring
Nov 23, 2024
ac16a2c
Added test button for sending packets
Nov 23, 2024
e5413da
Pass from python server, changed to C# desktop Avalonia
Nov 23, 2024
4b59bfa
Added Unity support for lang v10
Nov 23, 2024
83707fc
Added README.md
Nov 23, 2024
09a68ab
Added README.md
Nov 23, 2024
e603c0d
Added README.md
Nov 23, 2024
350126e
Rollback to version c# 9
Nov 23, 2024
3abcb11
Renamed from Vector3D to Vertex
Nov 23, 2024
18076ac
Restructed Packet format
Nov 23, 2024
2478220
Reformat
Nov 23, 2024
680d28a
Renamed
Nov 24, 2024
9e86760
Introduce MVVM structure
Nov 25, 2024
45a0555
WIP Data receving
Nov 26, 2024
2b216fa
Fix bug
Nov 27, 2024
01fb95e
Added JsonManager
Nov 27, 2024
0a58476
Refactor code
Nov 27, 2024
eb13860
WIP Splitting packets generate then reassembling generate wrong json …
Nov 27, 2024
153117f
Added Holo reconnecting to a server after fail
Nov 27, 2024
ed84a50
Poprawka Marka
Nov 27, 2024
ae79b8d
todo
Nov 27, 2024
b743b21
Refactoring
Nov 28, 2024
580997d
Refactor
Nov 28, 2024
fa35bcf
Added global .NET 8
Nov 29, 2024
6dfb3fb
Changed config
Nov 29, 2024
c9f6617
Updated UI
Nov 29, 2024
d87ecc4
Refactor model
Nov 29, 2024
f327425
Refactor
Nov 29, 2024
3a54291
Added Timestamp field to Packet
Nov 30, 2024
4234486
Fixed bug with JSON parsing
Dec 1, 2024
cad0390
Changed MAX_CHUNK_BYTES to 1MiB
Dec 1, 2024
ef07173
Refactor
Dec 1, 2024
76235c0
Added measuring time for received packets
Dec 1, 2024
38813ab
Added hiding data in view
Jan 12, 2025
3e1a3c5
Init v2
Jan 19, 2025
ce67ff7
Added MessagePack (Unity)
Jan 19, 2025
2c1b55a
Changed default Scene
Jan 19, 2025
aaee4a4
Created Packet model and utils (configuration/ID generator)
Jan 19, 2025
0d283bc
Implemented WebSocket Manager
Jan 19, 2025
e0bb143
Implemented Channel Manager
Jan 19, 2025
8cc758e
Added FileProcessor
Jan 19, 2025
dbba396
Implemented StartupClient
Jan 19, 2025
e0d63a4
Rest of config Unity files
Jan 19, 2025
837a643
Added .gitignore
Jan 19, 2025
8254807
v2 Server implementation
Jan 19, 2025
a1eecbd
Added Packet model
Jan 19, 2025
b3d6219
Added server config, generator and PacketTimeTracer
Jan 19, 2025
3477a0d
Added compatible with client ChannelManager and WebSocketManager
Jan 19, 2025
b16e0dd
Server main entry point
Jan 19, 2025
44edcdc
Final changes
Jan 22, 2025
fddb3c6
UWP compatible
Jan 22, 2025
54b068d
UWP compatbile
Jan 22, 2025
7eefe86
Further UWP
Jan 22, 2025
511c4cc
WIP
Jan 22, 2025
1cf228a
WIP (2)
Jan 22, 2025
eae2b34
WIP (2.1)
Jan 22, 2025
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
162 changes: 0 additions & 162 deletions .gitignore

This file was deleted.

33 changes: 33 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

# Hololens CONNECTION

> This subproject handles the connection between Hololens VR <=> server <=> client.


## Run Locally

Clone the project

Go to the project directory

```bash
cd CONNECTION
```

Install dependencies

```bash
pip install -r requirements.txt
```

Start all servers

```bash
python3 start.py
```


## License

[MIT](https://choosealicense.com/licenses/mit/)

77 changes: 77 additions & 0 deletions hololens/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/
.vscode

.idea
*.obj
# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

.idea
57 changes: 57 additions & 0 deletions hololens/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
},
"dotnet.defaultSolution": "hololens.sln",
"dotnet.preferCSharpExtension": true
}
8 changes: 8 additions & 0 deletions hololens/Assets/Hololens.meta

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

18 changes: 18 additions & 0 deletions hololens/Assets/NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources />
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
<config>
<add key="packageInstallLocation" value="CustomWithinAssets" />
<add key="repositoryPath" value="./Packages" />
<add key="PackagesConfigDirectoryPath" value="." />
<add key="slimRestore" value="true" />
<add key="PreferNetStandardOverNetFramework" value="true" />
</config>
</configuration>
23 changes: 23 additions & 0 deletions hololens/Assets/NuGet.config.meta

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

8 changes: 8 additions & 0 deletions hololens/Assets/Packages.meta

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

Loading