Commit graph

99 commits

Author SHA1 Message Date
ZappoMan
e53833b306 make GlowEffect support DependencyManager 2014-12-15 17:29:48 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
ZappoMan
7d75d2d1bf make TextureCache work with DependancyManager 2014-12-15 10:34:16 -08:00
ZappoMan
e9ea6b20ce use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache() 2014-12-15 08:16:18 -08:00
ZappoMan
e35242345c first cut at HMD Tools dialog 2014-11-25 09:26:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
dev
4442b46880 Introduce the stereo improvment for the Oculus rendering path 2014-11-18 09:44:30 -08:00
Andrzej Kapolka
fb4c1d38eb Set Oculus camera fov/aspect ratio. 2014-11-04 19:04:31 -08:00
Andrzej Kapolka
03ce8081a4 Oh, when will I learn not to use "near" and "far" as variable names? 2014-11-04 11:44:47 -08:00
Andrzej Kapolka
3ba3299e35 Use glFrustum rather than Oculus's projection utility method, which seems to
be returning weird results.
2014-11-03 21:13:01 -08:00
David Rowe
0e3495986d Add countdown to HMD calibration billboard 2014-10-22 16:58:10 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
David Rowe
05915ae134 Make calibration message update its location more often 2014-10-08 11:53:07 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
David Rowe
32399d8620 Delete calibration message if exit VR display while calibrating 2014-10-04 20:07:37 -07:00
David Rowe
6992b41c5c Fix avatar rotation erroneously initiating HMD calibration 2014-10-04 19:53:00 -07:00
David Rowe
817da8ca05 Display a static billboard prompting user to hold still to calibrate HMD 2014-10-04 19:33:24 -07:00
David Rowe
0a4bc2bc48 Add VR display auto-calibration user message calculations 2014-10-03 13:47:11 -07:00
David Rowe
d3b37684cd Add VR display auto-calibration logic 2014-10-03 13:46:41 -07:00
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -07:00
Stephen Birarda
bd73c950ac cleanup for eyePosition ifdef HAVE_LIBOVR 2014-09-26 15:44:10 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -07:00
Andrzej Kapolka
b328304da4 Up/down, not top/bottom. 2014-09-10 14:15:00 -07:00
Andrzej Kapolka
600f36aa64 Fix for Oculus API. 2014-09-10 14:14:02 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Stephen Birarda
e3bab8bdc8 require presence of LibOVR for relative position from OculusManager 2014-08-14 15:47:03 -07:00
Stephen Birarda
4bf7bbe0df if enable VR mode is re-checked then attempt to re-connect to Oculus 2014-08-12 15:20:04 -07:00
Stephen Birarda
75aedae300 integration of positional tracking with DK2 2014-08-12 14:12:13 -07:00
Thijs Wenker
4ff7ff61e8 OSX compatibility with SDK 0.4.1 2014-08-12 13:25:22 +02:00
Thijs Wenker
fe3f1dbe83 forgot to put back one line of code 2014-07-31 22:56:47 +02:00
Thijs Wenker
e6571d334a Oculus SDK 0.4 support for Windows (tested with DK2 HMD) 2014-07-31 22:37:02 +02:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
barnold1953
c6bda4bf16 Moved sixense laser stuff to MyAvatar 2014-07-18 15:26:18 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
barnold1953
a785ceb3da Restored UI fade animation 2014-07-09 17:33:41 -07:00
barnold1953
004db004a6 Dynamically resize lasers so they always end on UI 2014-07-09 17:03:09 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
2014-07-09 16:32:02 -07:00
barnold1953
f8fdd2d11f Minor adjustments 2014-07-08 17:15:11 -07:00