Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-10 20:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21825 commits 25 branches 0 tags 1.1 GiB
Commit graph

196 commits

Author SHA1 Message Date
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Ryan Huffman
7249a7e299 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-12-19 15:27:33 -08:00
ZappoMan
046564ec47 oops double 2014-12-19 12:35:47 -08:00
ZappoMan
d585f8c707 replace gluOrtho2D() with glOrtho() 2014-12-19 12:10:40 -08:00
Ryan Huffman
51a64650e4 Fix use of glOrtho and replace getDeferredLightingEffect w/ DependencyManager 2014-12-19 09:04:54 -08:00
Ryan Huffman
5b89208068 Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/overlays/Cube3DOverlay.cpp
 2014-12-18 16:46:17 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Ryan Huffman
9bd7912f9f Add support for drawing 3d overlays on the Application Overlay 2014-12-17 16:25:25 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
fe7b678193 begin removal of C++ procedural audio calls 2014-12-16 15:33:38 -08:00
Stephen Birarda
369fdc5771 move audio toolbox into its own class 2014-12-16 15:24:57 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Stephen Birarda
0f18a9651b replace audio with AudioIOStatsRenderer in ApplicationOverlay 2014-12-16 14:53:36 -08:00
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Stephen Birarda
a9eaa4b9f7 more decoupling of Audio from Interface 2014-12-16 12:43:06 -08:00
Stephen Birarda
c734bc89a3 move the audio scope into its own class 2014-12-16 11:54:59 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Atlante45
43dc35d549 Use correct mouse coordinate 2014-12-09 17:53:23 -08:00
Atlante45
299389ccef Fixed typo 2014-12-08 09:59:33 -08:00
Atlante45
1bb08ef30f Centered reticule 2014-12-05 17:10:58 -08:00
Atlante45
90d4e7bae9 Comments 2014-12-04 19:38:39 -08:00
Atlante45
d2b0cdbac3 Hydra reticule rendering for Oculus 2014-12-04 19:31:59 -08:00
Atlante45
84da070901 Correct mouse position in occulus 2014-12-04 18:27:03 -08:00
Atlante45
7026af7b9a Centrilized Oculus interference in pickRay 2014-12-04 17:26:14 -08:00
Atlante45
3b6936b47d Changed Mag and reticules data representation 2014-12-04 11:16:01 -08:00
Atlante45
e246b979f7 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-03 17:50:17 -08:00
Atlante45
8d814ab07b Updated Oculus pickray 2014-12-03 17:05:42 -08:00
Atlante45
0624ab7c72 Fixed aspect ratio and cropped overlay texture 2014-12-03 16:04:23 -08:00
Atlante45
73004d1bee Decoupled reticules from Overlays view 2014-12-03 14:40:47 -08:00
Philip Rosedale
06b22cf605 ...and don't turn on/off UI from hydra 2014-12-02 14:50:25 -08:00
Atlante45
bf21376c90 TexturedHemisphere class 2014-12-02 13:34:11 -08:00
Atlante45
3c5f33f0ac Hemisphere vbo refactoring 2014-12-02 12:28:04 -08:00
ZappoMan
711f9f6905 fix bug where audio meter is incorrectly offset when in oculus mode 2014-11-26 12:34:47 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrzej Kapolka
b421ee9243 Fix for audio toolbox. 2014-11-07 14:09:40 -08:00
David Rowe
a9040c1a53 Minor adjustment to Oculus pick ray calc 2014-10-31 15:15:44 -07:00
David Rowe
16f4cffbd3 Center HMD HUD and magnifiers on default eye position 2014-10-31 12:19:26 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Andrzej Kapolka
146a6526be Fix for Oculus mouse pointer. 2014-09-10 17:02:04 -07:00
Andrzej Kapolka
590c8042f8 Attempting to fix a bug in the Oculus overlay. 2014-09-10 16:36:32 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Andrzej Kapolka
dc396e5687 Starting on bringing the overlay back to device-independent coordinates. 2014-09-08 13:36:02 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Ryan Huffman
4852fcc034 Add red border to main window when not connected to domain 2014-08-11 18:43:49 -07:00
AndrewMeadows
73ec862474 Merge pull request #3207 from PhilipRosedale/master 
Velocity filter head position for less jitter in camera
 2014-07-25 09:50:21 -07:00
Philip Rosedale
a5d6b2282e Merge pull request #3201 from wangyix/master 
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
 2014-07-24 21:40:43 -07:00
Philip Rosedale
5aecbe690d made calculateAverageEyePosition private, changed to getEyePosition() where used outside head 2014-07-23 22:56:59 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
barnold1953
98babe1751 Working hydra lazers when not in oculus 2014-07-21 12:17:13 -07: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
97165cadcc Removed unneeded variable 2014-07-10 17:34:10 -07:00
barnold1953
1781a2d125 fixed unused variable warning 2014-07-10 17:30:43 -07:00
barnold1953
4bf74c1b65 Fixed more ubuntu compiler warnings 2014-07-10 16:59:57 -07:00
barnold1953
e658ce8fb9 Fixed ubuntu compiler warning 2014-07-10 16:57:46 -07:00
barnold1953
71634b4c8d Fixed windows compiler warning 2014-07-10 16:56:04 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
barnold1953
baf825789e Made Oculus UI radius not a magic number 2014-07-10 10:28:56 -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
56ff74dd56 Removed ApplicationOverlay::resize() 2014-07-09 16:39:05 -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
8147f2cd91 Fixed some magnification window bugs 2014-07-09 16:30:00 -07:00
barnold1953
090f1fd852 Fixed bug with 3rd person UI ray picking 2014-07-09 16:09:06 -07:00
barnold1953
a2225da13d Code cleanup 2014-07-09 12:11:06 -07:00
barnold1953
e64f34a257 Separated mouse and controller pointers 2014-07-09 12:03:32 -07:00
barnold1953
d044af1400 Made it so you can only select in a 180 degree radius with oculus 2014-07-09 11:12:02 -07:00
David Rowe
51f7e8904d Integrate UI toggling menu item and Hydra UI toggling 
They work together and both fade the UI in / out.
 2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625 Guard _framebufferObject deletion 2014-07-08 21:02:32 -07:00
barnold1953
f8fdd2d11f Minor adjustments 2014-07-08 17:15:11 -07:00
barnold1953
87ad87e10f Actual stereoscopic 3D UI. Looks better now. 2014-07-08 16:25:21 -07:00
barnold1953
0ce7b178b0 Made Oculus UI framebuffer resize when window resizes 2014-07-08 12:47:41 -07:00
barnold1953
cc63f706a7 Functional sixense "laser" oculus selection mode. 2014-07-08 11:43:24 -07:00
David Rowe
2ad2b6cd1c Resize the overlay framebuffer when the application window is resized 2014-07-03 18:23:37 -07:00
barnold1953
ba997334ff Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f First pass at laser oculus UI pointer 2014-07-03 16:09:54 -07:00
Brad Hefta-Gaub
67910a5ba2 Merge pull request #3115 from Barnold1953/OculusSDK 
3DTV UI overlay + Oculus fixes
 2014-07-02 21:45:34 -07:00
barnold1953
b6a626c928 Removed comment 2014-07-02 17:18:12 -07:00
barnold1953
a859094d4a Clickable 3D UI in 3DTV 2014-07-02 16:40:02 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-07-02 10:37:30 -07:00
barnold1953
67ecde7d31 Made tree editor voxel world stationary and not crash 2014-07-01 21:39:19 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes. 
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
 2014-06-27 22:18:38 +02:00
Philip Rosedale
93b131d520 Fix build warning from wrong init order 2014-06-25 15:41:47 -07:00
Andrew Meadows
81209c38ca fix warning about out of order initialization 2014-06-25 09:09:44 -07:00
barnold1953
fa32ad5b11 De-janked code by removing magic numbers 2014-06-17 17:14:26 -07:00