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

Vuforia #3

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
28bdc81
Added basic model controller for changing size, playing animations and
shreyasiyer14 Jun 1, 2017
8a28fb9
Added new test image target.
shreyasiyer14 Jun 5, 2017
1879a1d
Removed Wikitude files since plugins for Vuforia and Wikitude collided.
shreyasiyer14 Jul 16, 2017
e3538a4
Added vuforia trial license key and a few minor changes
realkushagrakhare Jul 16, 2017
891dfdd
Added a new target image
realkushagrakhare Jul 17, 2017
352fb98
Added intensity slider to change the light intensity of spider object
realkushagrakhare Jul 17, 2017
945951e
Added sensor scripts
shreyasiyer14 Jul 17, 2017
19c625c
Delete Alphav1.apk
shreyasiyer14 Jul 18, 2017
60c20e0
Added feature of automatically adjusting the brightness of the spider…
realkushagrakhare Jul 18, 2017
fba6f7f
Added a butterfly model and now it can be swapped with spider model i…
realkushagrakhare Jul 18, 2017
dccb219
Added a new serpent model with animation and made changes in InsectS…
realkushagrakhare Jul 19, 2017
d41c1e6
Minor updates
shreyasiyer14 Jul 19, 2017
5f505d3
Added a new Slider which varies the number of models in the scene. Ad…
realkushagrakhare Jul 19, 2017
cb5309e
Changed the walk button behaviour, and the size slider script.
shreyasiyer14 Jul 19, 2017
b897836
Updated .gitignore
shreyasiyer14 Jul 19, 2017
9c1974d
Delete test.apk
shreyasiyer14 Jul 19, 2017
4334503
Minor UI changes
realkushagrakhare Jul 21, 2017
5c56a77
Added on/off button to switch models on and off.
realkushagrakhare Jul 21, 2017
cd493a9
Added Photon Networking..
shreyasiyer14 Jul 25, 2017
03cc380
Changed the observe value in Photon view, to prevent flickering of the
shreyasiyer14 Jul 25, 2017
03effad
Update README.md
shreyasiyer14 Jul 26, 2017
0eced2b
Update README.md
shreyasiyer14 Jul 26, 2017
515b449
Modified modelSelectorController script
realkushagrakhare Jul 26, 2017
c5ab1e6
Minor bug fixes
realkushagrakhare Jul 26, 2017
cc8551d
Added methods to modify the state and count of the models
realkushagrakhare Jul 27, 2017
42621ff
Now the sliders in both the server and the client are synced
realkushagrakhare Aug 1, 2017
aa414fb
Update README.md
shreyasiyer14 Aug 1, 2017
705c084
Syncing InsectSelector Slider as well
realkushagrakhare Aug 1, 2017
262aba9
Merge branch 'vuforia' of https://github.com/l0ftyWhizZ/AR-Project in…
realkushagrakhare Aug 1, 2017
735c2d0
Created a new script which sends the texture of video background from…
realkushagrakhare Aug 2, 2017
966325e
Now walk button status is also synced.
realkushagrakhare Aug 2, 2017
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
*.pidb
*.userprefs

*.apk
.DS_Store
*.swp
Binary file added .vs/AR6June/v15/.suo
Binary file not shown.
9 changes: 9 additions & 0 deletions Assets/Butterfly (Animated).meta

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

6 changes: 6 additions & 0 deletions Assets/Butterfly (Animated)/Butterfly (Animated).txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This package offers a high detailed and animated butterfly for free use in any project.

The butterfly has high resolution .tga texture files, a poly-count of over 13.000 and comes with a beautiful animation.

Offered by: INNOWELL GmbH - http://www.innowell.eu/

8 changes: 8 additions & 0 deletions Assets/Butterfly (Animated)/Butterfly (Animated).txt.meta

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

9 changes: 9 additions & 0 deletions Assets/Butterfly (Animated)/Demo Scene.meta

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

Binary file not shown.

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

9 changes: 9 additions & 0 deletions Assets/Butterfly (Animated)/FBX.meta

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

9 changes: 9 additions & 0 deletions Assets/Butterfly (Animated)/FBX/Materials.meta

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Butterfly (Animated)/FBX/Materials/hair_unity.mat.meta

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

Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Butterfly (Animated)/FBX/Materials/stones.mat.meta

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

Loading