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

Sprint 3 Release #42

Merged
merged 73 commits into from
Jun 3, 2021
Merged

Sprint 3 Release #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
80d479c
Scene 1.0: render webcam texture on plane. Script FaceDetector:visual…
Kittysain Apr 19, 2021
1ad9970
add script folder
Kittysain Apr 19, 2021
c9912bc
recommit the faceDetector script
Kittysain Apr 19, 2021
0d7a150
Add detect and track python script
claravox Apr 19, 2021
2a2cd3c
Add blur faces
claravox Apr 19, 2021
89d65ec
Update Unity.gitignore
adamperlin Apr 20, 2021
4937fde
Update .gitignore, remove unneeded files, and re-commit needed files …
adamperlin Apr 20, 2021
7f48888
Make requested webcam resolution and fps explicit to override defaults
adamperlin Apr 20, 2021
22b5fc4
Add basic Gaussian blur for single face
adamperlin Apr 20, 2021
26bb862
Add face tracker that can follow faces that are angled
claravox Apr 21, 2021
02338ba
Add models needed for better detection
claravox Apr 21, 2021
4e0bcb6
Application does not seem to crash anymore when face goes out of range
claravox Apr 21, 2021
b335c6d
fixed bounding box thing
ekg15 Apr 21, 2021
b8a418c
Actually fix issue of wrong bounding box of the tracker
claravox Apr 23, 2021
f3ea406
Actively blurs face while tracking as well
claravox Apr 23, 2021
deb08de
Start face detection over if many frames have passed
claravox Apr 23, 2021
32bd9a4
Add basic Gaussian blur for single face
adamperlin Apr 20, 2021
40a1d32
in the scene 1.1 - Kitty, added a UI element, press the button to sav…
Kittysain Apr 26, 2021
84e869e
Merge branch 'develop' of https://github.com/claravox/CPE307-project …
Kittysain Apr 26, 2021
75c0768
WIP
adamperlin Apr 26, 2021
a24b01f
add UI elements
Kittysain Apr 28, 2021
faf0906
merged
ekg15 Apr 28, 2021
147f7e5
multiple face detection
ekg15 Apr 28, 2021
52474a1
Move back to HaarCascade, Profile detection with Cascade
claravox Apr 28, 2021
86fba51
make UI resize with the preview window, need to merge with face-blur …
Kittysain Apr 29, 2021
5c755db
Merge branch 'develop' into face-blur
Kittysain Apr 29, 2021
0767165
Merge pull request #9 from claravox/face-blur
adamperlin Apr 29, 2021
0f5d97e
added pixelation blur
Kittysain Apr 30, 2021
b121c23
Update FaceDetector.cs to only blur largest face
adamperlin May 2, 2021
928fc64
Fix early return bug
adamperlin May 3, 2021
94d370f
imread problem
Kittysain May 3, 2021
23d5c05
Add flower over face
claravox May 6, 2021
34cf791
Update FaceDetector.cs to only blur largest face
adamperlin May 2, 2021
97b4411
Add minimal image tracking face feature
claravox May 7, 2021
69afcd2
Change flower image, resize image to cover more of head
claravox May 7, 2021
f9779e5
Port to android; image capture functionality unimplemented and previe…
adamperlin May 9, 2021
de57526
Commit deletion of duplicate .so files in OpenCV+Unity library
adamperlin May 9, 2021
f69280e
Fix photo capture functionality in cross-platform friendly way
adamperlin May 9, 2021
a2540af
fix flower not appearing on canvas, improve flower img following the …
Kittysain May 9, 2021
d96070f
Merge branch 'blurWithOptions' into image-on-face
Kittysain May 9, 2021
7398cbd
Merge pull request #19 from claravox/fix-image-capture
Kittysain May 9, 2021
3ab6c08
Merge branch 'develop' into android-port
adamperlin May 9, 2021
a4827df
Merge pull request #18 from claravox/android-port
claravox May 9, 2021
692f4f1
fix the flower img
Kittysain May 9, 2021
28b6c6e
Merge pull request #20 from claravox/image-on-face
ekg15 May 9, 2021
d4af6a2
add other image for face overlay. set minimal face to be 100*100, fac…
Kittysain May 10, 2021
c37b20d
Merge branch 'develop' into blurWithOptions
Kittysain May 10, 2021
b63d3f8
update scale
Kittysain May 10, 2021
5752758
Merge branch 'blurWithOptions' of https://github.com/claravox/CSC307-…
Kittysain May 10, 2021
06c7c1b
preview scale fixed
Kittysain May 10, 2021
0a79e06
webcam texture front and back not find on PC
Kittysain May 10, 2021
6b9e006
multi face image overlay, improve UI
Kittysain May 13, 2021
8ca6c57
set core.autocrlf to false
Kittysain May 13, 2021
8756ccb
try restore png from lfs to git
Kittysain May 13, 2021
9559975
fix index out of array for img when restarted
Kittysain May 13, 2021
3991efd
Remove OpenCV+Unity
adamperlin May 17, 2021
380f35f
Switch to OpenCVFor Unity; move weights for neural net to appropriate…
adamperlin May 18, 2021
ebec9ae
modify git ignore
Kittysain May 23, 2021
961e95e
modify git ignore
Kittysain May 23, 2021
e00064a
Fix neural net face tracking on desktop
adamperlin May 23, 2021
d5f4d74
Merge pull request #31 from claravox/update-facetracking-algorithm
Kittysain May 23, 2021
f4d5eef
Merge branch 'blurWithOptions' into develop
Kittysain May 23, 2021
ff82c51
pixelate is put back, image is not working properly, code refactored
Kittysain May 25, 2021
f84dc1a
add native tool kit for andriod and ios, restore image save
Kittysain May 26, 2021
daac514
Fix neural net functionality for android
adamperlin May 26, 2021
7309618
Fix image overlay color
adamperlin Jun 2, 2021
c60c85f
improve UI significantly, image blur works, photo capture works
Kittysain Jun 2, 2021
1a1e39d
add logos
Kittysain Jun 2, 2021
c2cdddd
Add credit to version
Kittysain Jun 2, 2021
5e403bb
new logo
Kittysain Jun 2, 2021
d7ea440
Merge branch 'image-overlay-color-fix' of https://github.com/claravox…
Kittysain Jun 2, 2021
6963c51
update ui change camera option
Kittysain Jun 3, 2021
0812d6d
Merge pull request #39 from claravox/image-overlay-color-fix
claravox Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
53 changes: 53 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# 3D models
*.3dm filter=lfs diff=lfs merge=lfs -text
*.3ds filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text
*.c4d filter=lfs diff=lfs merge=lfs -text
*.collada filter=lfs diff=lfs merge=lfs -text
*.dae filter=lfs diff=lfs merge=lfs -text
*.dxf filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text
*.jas filter=lfs diff=lfs merge=lfs -text
*.lws filter=lfs diff=lfs merge=lfs -text
*.lxo filter=lfs diff=lfs merge=lfs -text
*.ma filter=lfs diff=lfs merge=lfs -text
*.max filter=lfs diff=lfs merge=lfs -text
*.mb filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.ply filter=lfs diff=lfs merge=lfs -text
*.skp filter=lfs diff=lfs merge=lfs -text
*.stl filter=lfs diff=lfs merge=lfs -text
*.ztl filter=lfs diff=lfs merge=lfs -text
# Audio
*.aif filter=lfs diff=lfs merge=lfs -text
*.aiff filter=lfs diff=lfs merge=lfs -text
*.it filter=lfs diff=lfs merge=lfs -text
*.mod filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.s3m filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text
*.xm filter=lfs diff=lfs merge=lfs -text
# Fonts
*.otf filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
# Images
*.bmp filter=lfs diff=lfs merge=lfs -text
*.exr filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.hdr filter=lfs diff=lfs merge=lfs -text
*.iff filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.pict filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text
*.tga filter=lfs diff=lfs merge=lfs -text
*.tif filter=lfs diff=lfs merge=lfs -text
*.tiff filter=lfs diff=lfs merge=lfs -text
# Collapse Unity-generated files on GitHub
*.asset linguist-generated
*.mat linguist-generated
*.meta linguist-generated
*.prefab linguist-generated
*.unity linguist-generated
47 changes: 47 additions & 0 deletions .gitattributes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# 3D models
*.3dm filter=lfs diff=lfs merge=lfs -text
*.3ds filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text
*.c4d filter=lfs diff=lfs merge=lfs -text
*.collada filter=lfs diff=lfs merge=lfs -text
*.dae filter=lfs diff=lfs merge=lfs -text
*.dxf filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text
*.jas filter=lfs diff=lfs merge=lfs -text
*.lws filter=lfs diff=lfs merge=lfs -text
*.lxo filter=lfs diff=lfs merge=lfs -text
*.ma filter=lfs diff=lfs merge=lfs -text
*.max filter=lfs diff=lfs merge=lfs -text
*.mb filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.ply filter=lfs diff=lfs merge=lfs -text
*.skp filter=lfs diff=lfs merge=lfs -text
*.stl filter=lfs diff=lfs merge=lfs -text
*.ztl filter=lfs diff=lfs merge=lfs -text
# Audio
*.aif filter=lfs diff=lfs merge=lfs -text
*.aiff filter=lfs diff=lfs merge=lfs -text
*.it filter=lfs diff=lfs merge=lfs -text
*.mod filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.s3m filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text
*.xm filter=lfs diff=lfs merge=lfs -text
# Fonts
*.otf filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
# Images
*.bmp filter=lfs diff=lfs merge=lfs -text
*.exr filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.hdr filter=lfs diff=lfs merge=lfs -text
*.iff filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.pict filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text
*.tga filter=lfs diff=lfs merge=lfs -text
*.tif filter=lfs diff=lfs merge=lfs -text
*.tiff filter=lfs diff=lfs merge=lfs -text
98 changes: 98 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/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/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# 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*
*/[Aa]ssets/OpenCVForUnity/*
*/[Aa]ssets/OpenCVForUnity.meta

# Visual Studio cache directory
.vs/

# 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

# 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/*
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk
*.DS_STORE
33 changes: 33 additions & 0 deletions SecurityAR/.collabignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# ===========================
# Default Collab Ignore Rules
# ===========================

# OS Generated
# ============
.DS_Store
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
[Tt]humbs.db
[Dd]esktop.ini

# Visual Studio / MonoDevelop generated
# =====================================
[Ee]xported[Oo]bj/
*.userprefs
*.csproj
*.pidb
*.suo
*.sln
*.user
*.unityproj
*.booproj

# Unity generated
# ===============
[Oo]bj/
[Bb]uild
sysinfo.txt
*.stackdump
6 changes: 6 additions & 0 deletions SecurityAR/.vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
8 changes: 8 additions & 0 deletions SecurityAR/Assets/Assets.meta
View file
Open in desktop

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

9 changes: 9 additions & 0 deletions SecurityAR/Assets/Assets/Raw and SpriteSheets.meta
View file
Open in desktop

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

Binary file added SecurityAR/Assets/Assets/Raw and SpriteSheets/Black1x.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.
104 changes: 104 additions & 0 deletions SecurityAR/Assets/Assets/Raw and SpriteSheets/Black1x.png.meta
View file
Open in desktop

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

Binary file added SecurityAR/Assets/Assets/Raw and SpriteSheets/Black2x.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.
Loading