Skip to content

daydream VR platform supporting #11

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
Merged
merged 4 commits into from
Jun 6, 2016
Merged

daydream VR platform supporting #11

merged 4 commits into from
Jun 6, 2016

Conversation

@songchengjiang
Copy link

@songchengjiang songchengjiang commented Jun 6, 2016

add CCVRGvrRenderer and CCVRGvrHeadTracker framework
remove VR 3rdparty dependence

@songchengjiang
Copy link
Author

songchengjiang commented Jun 6, 2016

@ricardoquesada I have removed the VR SDK dependence, and added a framework for daydream VR platform.

@ricardoquesada ricardoquesada merged commit 90db6da into ricardoquesada:vr Jun 6, 2016
@ricardoquesada
Copy link
Owner

ricardoquesada commented Jun 6, 2016

Thanks!

On Sun, Jun 5, 2016 at 11:42 PM, SongChengJiang [email protected]
wrote:

@ricardoquesada https://github.com/ricardoquesada I have removed the VR
SDK dependence, and added a framework for daydream VR platform.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AAOLisGBno6hDLhH2knUjWKrdmRwNxyOks5qI4kCgaJpZM4IuhVD
.

ricardoquesada added a commit that referenced this pull request Jun 15, 2016
@ricardoquesada
Squashed commit of the following:
180c2f1 
VR support for cocos2d-x

commit 087aff0
Merge: b32d329 fc44d0d
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 11:26:33 2016 -0700

    Merge branch 'v3' into vr

commit b32d329
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 11:25:27 2016 -0700

    fix: dont' include oculus files

commit 816928c
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 10:57:26 2016 -0700

    fix: missing guard in header

commit 2abd4eb
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 10:43:49 2016 -0700

    removed VR engines... should be part of package manager

commit 5831797
Merge: 12f4f71 b6d6bb0
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 10:42:37 2016 -0700

    Merge branch 'vr' of github.com:ricardoquesada/cocos2d-x into vr

commit 12f4f71
Author: Ricardo Quesada <[email protected]>
Date:   Wed Jun 15 10:42:12 2016 -0700

    fix: new VR API... easier to enable/disable different VR renderers

commit b6d6bb0
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 14 20:48:04 2016 -0700

    fix: compiles and runs on win10

commit e73aa89
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 14 20:27:06 2016 -0700

    fix: vr works again

commit 5615e27
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 14 18:55:18 2016 -0700

    fix: compiles on windows

commit 494061e
Merge: 284910b fd3b6d4
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 14 17:13:47 2016 -0700

    Merge branch 'v3' into vr

commit 284910b
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 14 17:12:25 2016 -0700

    android vr: better performance

commit aa8328e
Author: Ricardo Quesada <[email protected]>
Date:   Mon Jun 13 16:10:14 2016 -0700

    fix: low pass filter in accel and magnet

commit f6d9b62
Author: Ricardo Quesada <[email protected]>
Date:   Mon Jun 13 15:43:00 2016 -0700

    fix: removes debugging info

commit 2004f0c
Author: Ricardo Quesada <[email protected]>
Date:   Mon Jun 13 14:54:32 2016 -0700

    fix: kind of works on android! yeah!

commit d6dcb6a
Author: Ricardo Quesada <[email protected]>
Date:   Fri Jun 10 09:44:53 2016 -0700

    logging

commit 7e5d6ad
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 7 22:53:07 2016 -0300

    android head tracking

    compiles, doesn't work yet... how to debug java code?

commit cbf5f64
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 7 19:45:41 2016 -0300

    reading sensor from android

    not compiling yet

commit 6ee0a3c
Author: Ricardo Quesada <[email protected]>
Date:   Tue Jun 7 11:45:06 2016 -0300

    compiles on android... finally

commit fb728da
Author: Ricardo Quesada <[email protected]>
Date:   Mon Jun 6 18:15:12 2016 -0300

    fix: compile vr android files only on android

commit 90db6da
Merge: 2e56f03 cc936af
Author: Ricardo Quesada <[email protected]>
Date:   Mon Jun 6 12:15:56 2016 -0300

    Merge pull request #11 from songchengjiang/riq_vr

    daydream VR platform supporting

commit cc936af
Author: songchengjiang <[email protected]>
Date:   Mon Jun 6 10:38:27 2016 +0800

    remove VR 3rdparty dependence

commit 5f7a1a9
Author: songchengjiang <[email protected]>
Date:   Mon Jun 6 10:34:37 2016 +0800

    remove VR 3rdparty dependence

commit 3f72ecd
Author: songchengjiang <[email protected]>
Date:   Mon Jun 6 10:28:43 2016 +0800

    remove VR 3rdparty dependence

commit 2e56f03
Author: Ricardo Quesada <[email protected]>
Date:   Fri Jun 3 10:45:44 2016 -0300

    fix: started android support

commit 1910c9c
Author: songchengjiang <[email protected]>
Date:   Thu Jun 2 15:58:34 2016 +0800

    add CCVRGvrRenderer and CCVRGvrHeadTracker framework

commit 96200ee
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 31 13:07:44 2016 -0300

    fix: little fixes

commit a2eb811
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 31 12:12:59 2016 -0300

    Merge pull request #10 from songchengjiang/riq_vr

    bugs fixed

commit 5fddebc
Author: songchengjiang <[email protected]>
Date:   Fri May 27 15:57:30 2016 +0800

    parameter corrected

commit 925aad0
Merge: 9b5e02f 20a74e0
Author: songchengjiang <[email protected]>
Date:   Fri May 27 15:46:13 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	cocos/2d/CCScene.cpp

commit 9b5e02f
Author: songchengjiang <[email protected]>
Date:   Fri May 27 14:36:31 2016 +0800

    fixed ProjectionMatrix error on oculus platform
    fixed ScrollView error on oculus platform

commit 3c63ead
Author: songchengjiang <[email protected]>
Date:   Fri May 27 10:51:46 2016 +0800

    bugs fixed

    mobile VR platforms:
    fixed ProjectionMatrix  error
    fixed culling error of ScrollView

commit 20a74e0
Author: Ricardo Quesada <[email protected]>
Date:   Fri May 20 09:22:45 2016 -0300

    fix: setAdditionalTransform support reference

commit 8341df8
Merge: 83751de 469d38d
Author: Ricardo Quesada <[email protected]>
Date:   Wed May 18 07:38:49 2016 -0700

    Merge pull request #8 from songchengjiang/riq_vr

    Finished VR integration of SKDs based on VRProtocol

commit 469d38d
Author: songchengjiang <[email protected]>
Date:   Wed May 18 15:32:32 2016 +0800

    fix bug of deepoon's headtracking

commit 83751de
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 17 09:41:17 2016 -0700

    fix: Scene inverts the eye matrix

commit 41ae419
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 17 06:54:34 2016 -0700

    fix: inversed matrix for camera

commit 049dee7
Author: songchengjiang <[email protected]>
Date:   Tue May 17 15:51:57 2016 +0800

    add headtracker of oculus

commit 3f64783
Author: songchengjiang <[email protected]>
Date:   Tue May 17 14:22:56 2016 +0800

    add headtracker of SKDs

    gearvr/deepoon/cardboard

commit 59df985
Author: Ricardo Quesada <[email protected]>
Date:   Mon May 16 22:12:23 2016 -0700

    fix: head tracker works

commit 306c59d
Author: Ricardo Quesada <[email protected]>
Date:   Mon May 16 17:55:43 2016 -0700

    fix: adds missing methods to `VRIHeadTracker`

commit 91100b8
Author: songchengjiang <[email protected]>
Date:   Mon May 16 14:17:21 2016 +0800

    Rename Oculus's files

commit 01ef621
Author: songchengjiang <[email protected]>
Date:   Mon May 16 11:41:56 2016 +0800

    Rename files based on riq's changes

commit 734efbb
Merge: 91449c9 769a883
Author: songchengjiang <[email protected]>
Date:   Mon May 16 09:57:57 2016 +0800

    Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/vr/CCVRGeneric.cpp
    	cocos/vr/CCVRGenericHeadTracker.h

commit 91449c9
Merge: d3e4550 a33faaf
Author: songchengjiang <[email protected]>
Date:   Mon May 16 09:54:44 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/platform/CCGLView.cpp

commit a33faaf
Author: Ricardo Quesada <[email protected]>
Date:   Sat May 14 00:57:54 2016 -0700

    fix: adds head tracker

commit ea348cf
Author: Ricardo Quesada <[email protected]>
Date:   Fri May 13 18:40:32 2016 -0700

    fix: removes red background

commit 113c7de
Author: Ricardo Quesada <[email protected]>
Date:   Fri May 13 18:39:31 2016 -0700

    fix: centers image

commit 769a883
Author: songchengjiang <[email protected]>
Date:   Fri May 13 20:36:19 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

commit d3e4550
Author: songchengjiang <[email protected]>
Date:   Fri May 13 17:52:46 2016 +0800

    update win32 project for VR

commit ba0fdb8
Author: Ricardo Quesada <[email protected]>
Date:   Thu May 12 23:21:50 2016 -0700

    fix: no hardcoded values

    code is simpler, fixed a few bugs

commit b30596c
Author: Ricardo Quesada <[email protected]>
Date:   Thu May 12 21:50:18 2016 -0700

    fix: simplified distortion

commit 37b184f
Author: songchengjiang <[email protected]>
Date:   Fri May 13 09:39:34 2016 +0800

    finished VR rendering of Oculus

commit f7d74cd
Author: songchengjiang <[email protected]>
Date:   Thu May 12 10:00:43 2016 +0800

    Finished GearVR and Deepoon VR rendering integration

commit 776fb4f
Author: Ricardo Quesada <[email protected]>
Date:   Wed May 11 16:56:57 2016 -0700

    fix: distortion working... with too many hardcoded values

    time to "un-hardcode" the values

commit 0584773
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 10 19:49:07 2016 -0700

    feat: distortion WIP

commit 9b5ef01
Author: Ricardo Quesada <[email protected]>
Date:   Tue May 10 15:49:17 2016 -0700

    fix: simpler

    one texture that holds both left and right eye

commit bfff504
Author: Ricardo Quesada <[email protected]>
Date:   Mon May 9 10:50:43 2016 -0700

    fix: Camera code is cleaner

commit fcf730b
Author: songchengjiang <[email protected]>
Date:   Mon May 9 16:43:58 2016 +0800

    support cardboard VR rendering

commit f88b834
Author: Ricardo Quesada <[email protected]>
Date:   Fri May 6 21:16:10 2016 -0700

    fix: proj fixes. works ok in any resolution

commit f980a61
Author: Ricardo Quesada <[email protected]>
Date:   Fri May 6 19:08:47 2016 -0700

    fix: renders ok in any device

commit 4799ad3
Author: Ricardo Quesada <[email protected]>
Date:   Thu Apr 28 16:46:30 2016 -0700

    fix: renders something

    fix: passing camera to scene

    adds a way to return user camera

    fix: stereo rendering works

    fix: viewport left is correct

    fix: scissor is not needed...

    fix: works!

    fix: minor fixes

    fix: new approach... almost working

    fix: camera is moved

    whitespace fixes

    fix: whitespaces

    fix: new line

commit c137a53
Author: Ricardo Quesada <[email protected]>
Date:   Wed Apr 27 18:56:41 2016 -0700

    fix: VR refactor... still WIP

commit 16fde77
Author: Ricardo Quesada <[email protected]>
Date:   Tue Apr 26 22:21:21 2016 -0700

    feat: VR, initial commit
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.

2 participants

@songchengjiang @ricardoquesada