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

AR Pet Showcase updated to match GearVRf PR #2005 #652

Open
wants to merge 363 commits into
base: master
Choose a base branch
from
Open

AR Pet Showcase updated to match GearVRf PR #2005 #652

wants to merge 363 commits into from

Conversation

NolaDonato
Copy link
Collaborator

This PR includes PR #650 but updates it to match the APIs in GearVRf PR #2005.

The pet walks on the plane but the menu button on the bottom does not work. The commits for API changes were minimal and did not modify any files related to the menu.

GearVRf DCO signed off by: Nola Donato nola.donato@samsung.com

rachellimaa and others added 30 commits October 25, 2018 14:44
@rachellimaa @ragner
gvr-arpet: Link between some views and bluetooth connection
a014c01 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@ragner
Fix load model issue
6e338e8 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca @ragner
Code refactoring
de589c4 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca @ragner
Change initialization of app connection manager
7493add 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@ragner
Fix plane detection issue
e6c072e 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Fix pet loading delay
b668846 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Pre-load 3D model
311d956 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca @ragner
Update packages
3a3195b 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca @ragner
Rename classes
176b869 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@ragner
Update framekwork
c5d810b 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca @ragner
Connection manager adjustments
2f7f912 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca @ragner
Rename method
41293ef 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca @ragner
Adjust synchronized method
c369522 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@rachellimaa @ragner
gvr-arpet: adjusted views bluetooth connection
3443786 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@acosta @ragner
Use ConnectionMode to check which mode is being used
2fd2bbf 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@acosta @ragner
Create TAG to be used in ShareAnchorMode debug messages
5f7f7e4 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@acosta @ragner
Use PetContext in CloudAnchorManager
0196b9c 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@acosta @ragner
Set progress bar duration according to guest or host mode
7fb404b 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@ragner
Enable touch screen
040631e 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@acosta @ragner
Check the Cloud Anchor API key inside CloudAnchorManager
d73effc 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@acosta @ragner
Disable cursor icon when touch is enabled
f63ca5f 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@rachellimaa @ragner
adjusted positions hud and edit views
e4cbdee 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@rachellimaa @ragner
activated on hud the ball and edit modes
62c6cbc 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@ragner
Adjust physics
48713b5 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca @ragner
Connection manager improvement
0808309 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca @ragner
Disable call to connection test method in main class
411b124 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@acosta @ragner
Fix paired view and update border in status anchor mode
64b1e88 
GearVRf-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@andrenaveca @ragner
Adjust manager interface
bef284f 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@rachellimaa @ragner
adjusted text in center in views share anchor mode
a4e974e 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@rachellimaa @ragner
Close hud in ball mode
9ec1450 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
Diego Azulay and others added 24 commits November 1, 2018 11:53
Adjust character Y offset
94e0ff6 
GearVRf-DCO-1.0-Signed-off-by: Diego Azulay <diego.a@samsung.com>
@ragner
Fix pet scaling
e5a9aed 
GearVRf-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca
Anchor sharing screen flow refactoring
bb70fe6 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
Fix collider of AR planes
7b9c9a5 
GearVRf-DCO-1.0-Signed-off-by: Diego Azulay <diego.a@samsung.com>
@ragner
Fix grab bone
4041984 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@andrenaveca
Adjust view layout
554d9fd 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@andrenaveca
Fix bug in BT disconnection
9019c45 
GearVRf-DCO-1.0-Signed-off-by: Andre Naveca <a.naveca@samsung.com>
@acosta
Improvements on dragging support
4afce9e 
SXR-DCO-1.0-Signed-off-by: Afonso Costa <afonso.j@samsung.com>
@rachellimaa
added Application Output Screen
0970659 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@rachellimaa
fix XML file strings
cc37890 
GearVRf-DCO-1.0-Signed-off-by: Rachel Lima <rachel.l@samsung.com>
@ragner
Add physics to selected plane only
160f995 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Fix go to tap
877531f 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Fix plane merging
e7672f8 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Adjust initial scale
0013e3a 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Use pet's volume to min distances
abfb951 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Adjust speed acording to pet size
f787935 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Adjust min distance to bone toy
cea2d0f 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Adjust Ccd of physics plane
09a0320 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Fix min bone toy distance to pet
d37468f 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Reduce bony toy size
977599e 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Fix shared plane
2bc3a0f 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Makes pet's plane not infinity
a69230f 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@NolaDonato
Merge branch 'feature_arpet' of https://github.com/sidia-dev-team/Gea…
90246ea 
…rVRf-Demos into arpet2
@NolaDonato
Modified arpet for updated mixedreality apis
4777112
@NolaDonato
Copy link
Collaborator Author

@ragner and @dsazulay please check my work. The menu on the bottom left displays but does not do anything when you touch it.
I got a build error from line 28 in screen_exit_application.xml which I solved by removing the line defining the back button. This could be why the menu doesn't work for me.
Eva's head is fine in my version but I can't make her do anything because the menu doesn't work.

@ragner
Colliders working again
4fb6dec 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Configure far clipping
ddc172d 
SXR-DCO-1.0-Signed-off-by: Ragner Magalhaes <ragner.n@samsung.com>
@ragner
Copy link
Contributor

ragner commented Nov 5, 2018

@NolaDonato I did a PR with my review.

@NolaDonato
Merge pull request #4 from ragner/arpet2
81f71ee 
Pet's input working again
@ragner
Copy link
Contributor

ragner commented Nov 5, 2018

I did a PR to framework also. I put back my touchscreen logic. Your simplified touchscreen support was not working for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@NolaDonato @ragner @rachellimaa @andrenaveca @acosta @crbozz