Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 10:36:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18710 commits 25 branches 0 tags 1.1 GiB
Commit graph

9666 commits

Author SHA1 Message Date
Andrzej Kapolka
0c1ea784b9 Set face. 2014-11-10 11:49:02 -08:00
Andrzej Kapolka
431bb0af1d Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-11-10 11:46:09 -08:00
Sam Gateau
7ccb7495c7 Merge and resolve conflict on APplication.cpp 2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub
fc89f92097 Revert "Revert "Fix build warning"" 2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
Brad Hefta-Gaub
09490b58b4 Revert "Fix build warning" 2014-11-07 21:47:28 -08:00
Brad Hefta-Gaub
8e9d0a6396 Merge pull request #3762 from ctrlaltdavid/fix-build-warning 
Fix build warning
 2014-11-07 20:24:08 -08:00
Brad Hefta-Gaub
8e17bc74bf Merge pull request #3759 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-07 20:14:18 -08:00
David Rowe
94d82455a0 Fix build warning 2014-11-07 19:56:54 -08:00
Stephen Birarda
1e52232a4c add destructors for arrays in Hair 2014-11-07 17:21:53 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00
David Rowe
a904b128b3 Fix boolean literal value 2014-11-07 15:28:39 -08:00
Andrzej Kapolka
cd110d6048 Fix for invalid projection matrix on startup. 2014-11-07 14:35:01 -08:00
Sam Gateau
9d146e7ea3 improving the evalFromRawMatrix decomposition 2014-11-07 14:27:22 -08:00
Andrzej Kapolka
7008012492 Trigger fixes. 2014-11-07 14:20:31 -08:00
Andrzej Kapolka
b421ee9243 Fix for audio toolbox. 2014-11-07 14:09:40 -08:00
Andrzej Kapolka
61e0660d65 This actually seems to work differently on OS X versus Linux. 2014-11-07 14:01:28 -08:00
Andrzej Kapolka
a4db244182 Mirror/warning fixes. 2014-11-07 13:57:20 -08:00
Sam Gateau
dc748a85a3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 11:14:55 -08:00
Stephen Birarda
bd8b71a02a complete handling of local audio loopback 2014-11-07 11:05:01 -08:00
Stephen Birarda
66949ee7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:57:37 -08:00
Brad Hefta-Gaub
4a6c5e4203 Merge pull request #3753 from RyanDowne/master 
Changes to Hair to make it look more like clothing
 2014-11-07 10:55:08 -08:00
Ryan
d0ca9ed14c Changes to Hair to make it look more like clothing 2014-11-07 10:45:58 -08:00
Stephen Birarda
e78f149369 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:28:31 -08:00
Stephen Birarda
f1a238a6c2 piping for local UI sounds 2014-11-07 10:08:09 -08:00
ZappoMan
45ca063249 use original textures for textureNames 2014-11-07 10:00:04 -08:00
Sam Gateau
fa9318aafe Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 09:59:09 -08:00
Sam Gateau
e1a9830d9a mirror doesn't work with the new transform stack 2014-11-07 09:58:32 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
ZappoMan
7b40a7cd89 CR feedback 2014-11-07 09:07:28 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
David Rowe
7e6d616f20 Add text overlay textWidth() method 
Is accessible from JavaScript.
 2014-11-07 08:58:31 -08:00
David Rowe
02f6f6769b Enable different copies of otherwise identical text renderers 
Needed when using computeWidth() because it messes up draw() rendering.
 2014-11-07 08:56:50 -08:00
Atlante45
011e531971 Magic numbers and casts 2014-11-07 14:41:59 +01:00
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
c1385a9c35 fix random crash on checkEnterLeaveEntities 2014-11-06 17:41:55 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Atlante45
dcfeef4712 Reference and comments 2014-11-07 00:24:37 +01:00
Atlante45
1e6cadc7c1 Extra lines 2014-11-07 00:06:57 +01:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Sam Gateau
9e34e9d0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-06 14:15:59 -08:00
AndrewMeadows
efd9626c2f Merge pull request #3740 from samcake/temp0 
Introduce the input stream stage to the gpu::Batch and apply it for model rendering
 2014-11-06 14:14:08 -08:00
Sam Gateau
555360e470 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-11-06 14:04:03 -08:00
Sam Gateau
bed524716d Removed all the prefix to the enum values, since all the enums are in the gpu scope we consider its good to avoid name colisions 2014-11-06 14:01:43 -08:00
Andrzej Kapolka
788f1b91c0 Use near radius as threshold, since we need to switch to full screen rendering 
whenever any point of the near window intersects the light volume.
 2014-11-06 12:54:49 -08:00
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Sam Gateau
820c0798aa In BufferStream, clean up the constructor and destructor 2014-11-06 10:43:54 -08:00
Sam Gateau
2d06e71e32 Remove double definition of static const arrays for Types and Dimensions 2014-11-06 10:42:14 -08:00
Sam Gateau
5a51a99f76 Fixing missing brackets after if 2014-11-06 10:40:06 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00
Sam Gateau
4a73b0773b first take at the Transform encapsulating a transform matrix 2014-11-06 09:56:05 -08:00
Sam Gateau
67535a386c first take at the Transform encapsulating a transform matrix 2014-11-06 09:55:34 -08:00
Atlante45
efc86b9f75 Remove debug 2014-11-06 17:42:27 +01:00
Atlante45
ff197a2f64 Base implementation for own reverb 2014-11-06 12:46:37 +01:00
Philip Rosedale
54957a2fa1 merge fix 2014-11-05 21:08:24 -08:00
Philip Rosedale
0b205f3f16 fix bad spaces 2014-11-05 17:06:00 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Andrzej Kapolka
fd00461b4e Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
DaveDubUK
7a1f7bd418 Update to walk.js v 1.1 
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
 2014-11-05 20:11:11 +00:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Sam Gateau
2b27af51f1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-05 09:35:26 -08:00
Andrzej Kapolka
fb4c1d38eb Set Oculus camera fov/aspect ratio. 2014-11-04 19:04:31 -08:00
Andrzej Kapolka
a0e0c47701 Depth value tweak. 2014-11-04 18:27:24 -08:00
Sam Gateau
562ecc8e3a fix glLight attenuation bad values by filtering before glcall 2014-11-04 18:18:24 -08:00
Andrzej Kapolka
52d0b15979 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 18:13:58 -08:00
Andrzej Kapolka
892987d68a Increase tesselation to minimize artifacts. 2014-11-04 18:13:33 -08:00
Andrzej Kapolka
feabd1d5b3 Use a fullscreen quad when we're actually inside the light influence. 2014-11-04 18:08:56 -08:00
Sam Gateau
a344d46871 fix std::bitset method 2014-11-04 18:05:04 -08:00
Sam Gateau
1eb49d3763 fixing template bracket issues 2014-11-04 17:54:54 -08:00
Andrzej Kapolka
1763d8f7f0 Switch to using cones/spheres (as opposed to screen-aligned quads) with depth 
testing for light geometry.
 2014-11-04 17:29:19 -08:00
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Sam Gateau
4afa0b4188 more GL error checking 2014-11-04 15:52:25 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Andrzej Kapolka
576ac23e71 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 15:10:19 -08:00
Sam Gateau
66d732fc33 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 14:52:22 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -08:00
Andrzej Kapolka
3b56f613e2 Cone render function, some cleanup of GeometryCache methods. 2014-11-04 13:21:51 -08:00
Philip Rosedale
c4eeebe03e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:44:31 -08:00
Stephen Birarda
fab3a61f1b Merge pull request #3737 from birarda/lobby 
fix for Camera.getPosition() calls
 2014-11-04 12:40:08 -08:00
Stephen Birarda
72f80d4a0f make camera getPosition() callable from js 2014-11-04 12:39:50 -08:00
Philip Rosedale
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -08:00
Philip Rosedale
6b8476a87f Merge pull request #3734 from birarda/lobby 
bubble up a PickRay with action event, camera cleanup
 2014-11-04 12:03:29 -08:00
Andrzej Kapolka
f00c54c23c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 11:45:23 -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
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Sam Gateau
e290347a05 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 23:48:03 -08:00