Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:43:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4606 commits 76 branches 59 tags 1.2 GiB
Commit graph

2363 commits

Author SHA1 Message Date
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4 Add condition to updateAvatar() where if another avatar's head is at 
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
 2013-07-11 10:17:45 -07:00
Atlante45
6e2422a547 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:13:29 -07:00
Stephen Birarda
beb89e3d2b change some timing types from int to uint64_t to avoid costly assumptions 2013-07-11 10:09:00 -07:00
Stephen Birarda
4ed231670f put back the missing voxels 2013-07-11 10:04:27 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3 Merge pull request #644 from ZappoMan/occlusion_culling 
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
 2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264 Merge pull request #641 from ZappoMan/bug_fixes 
Two small bug fixes
 2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc merge 2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb Merge remote-tracking branch 'upstream/master' into particles 2013-07-10 18:32:42 -07:00
Jeffrey Ventrella
980a5b7980 cleanup 2013-07-10 18:32:17 -07:00
Jeffrey Ventrella
171c10dabe raised home position 2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
8ae10a6614 added emitter 2013-07-10 17:55:42 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
Atlante45
5ae24fc660 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Head.cpp
 2013-07-10 17:39:31 -07:00
Atlante45
906fc04e35 first step toward resizing avatars 2013-07-10 17:35:39 -07:00
Andrzej Kapolka
d59b9ce955 Flip x when in mirror mode, rather than special-casing all the head rotations. 
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
 2013-07-10 17:31:21 -07:00
Mark Peng
3909217815 Remove unused #include for glm intersect in Application.cpp 2013-07-10 17:24:47 -07:00
ZappoMan
78611e30e7 make occlusion culling default 2013-07-10 17:21:40 -07:00
Mark Peng
c832662807 Remove random print statements from eyecontact code in Application.cpp 2013-07-10 17:20:46 -07:00
Jeffrey Ventrella
84a7a78b8d made a test particle system 2013-07-10 17:15:03 -07:00
ZappoMan
a48f353f2f whitespace cleaned up 2013-07-10 17:07:55 -07:00
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
Andrzej Kapolka
a03a46ad16 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 16:36:21 -07:00
Andrzej Kapolka
100f7c19c3 Merge pull request #636 from PhilipRosedale/master 
Touchlook tuned and always on!
 2013-07-10 16:36:10 -07:00
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3 lazy load stars file only if stars render enabled 2013-07-10 16:12:34 -07:00
ZappoMan
d8f368a50c lazy load stars file only if stars render enabled 2013-07-10 16:06:23 -07:00
Mark Peng
62570f0804 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d Make lookAtVectors lock on other avatar's eyes if the mouse is over 
the other avatar's head.

Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
 2013-07-10 15:56:23 -07:00
Andrzej Kapolka
67afc61fd8 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 15:16:38 -07:00
Andrzej Kapolka
559dc4bb5d Flush the queue so that we don't get any funny data on the initial read. 2013-07-10 15:07:39 -07:00
Andrzej Kapolka
2ffd151a1f Ryan likes the eyelids starting at forty degrees. 2013-07-10 14:40:45 -07:00
Andrzej Kapolka
6a5fb4f535 Removed unused variables, added motion driver library for OS X. 2013-07-10 14:28:06 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -07:00
Andrzej Kapolka
6fe9a71868 Basic compass fusion. 2013-07-10 14:06:12 -07:00
ZappoMan
09f77279e2 add shortcut key to enable wants occlusion culling 2013-07-10 13:42:43 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Atlante45
d79acea6a7 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-10 12:46:50 -07:00
Stephen Birarda
70ccef0733 remove avatar data read and write to file 2013-07-10 12:37:23 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Mark Peng
4b6e7f1079 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075 Add print statements to debug eyecontact code in Application.cpp. 2013-07-10 11:56:16 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
atlante45
2e036a0e46 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
3433cf5a98 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3 Fixed broken shortcut (Turn on/off voxels is now Shift + V) 2013-07-09 16:20:55 +02:00
atlante45
b3c0f3fedb More code review for UI job 2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63 More consts for UI job 2013-07-09 14:49:01 +02:00
atlante45
3c4f8f5120 put hard coded numbers into variables for UI job 2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 12:56:27 +02:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c Modified code according to review for UI job 2013-07-09 10:25:46 +02:00
Philip Rosedale
e9f8e50d49 Merge pull request #623 from machinelevel/dev4 
Added safety checks to processEvents(), which was causing problems. Also...
 2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1 Merge pull request #627 from ey6es/kinected 
Basic depth camera support (only built in when OpenNI is available).
 2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9 Fixed multi-touch event loop problems by selectively processing just the touch events. 2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 16:29:51 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 15:31:11 -07:00
Stephen Birarda
aaaba9c42e more packet version refactoring 2013-07-08 15:14:18 -07:00
Stephen Birarda
185d5bb0a2 use packet version helpers for PACKET_TYPE_TRANSMITTER_DATA 2013-07-08 15:01:57 -07:00
Stephen Birarda
202d446f07 use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL 2013-07-08 14:59:00 -07:00
Stephen Birarda
374fffb151 use packet version helpers for PACKET_TYPE_SET_VOXEL commands 2013-07-08 14:40:15 -07:00
Stephen Birarda
b816761a74 use packet version helpers for PACKET_TYPE_MICROPHONE 2013-07-08 14:24:08 -07:00
Stephen Birarda
81e6bccd08 use packet version helpers in parseData methods 2013-07-08 14:13:36 -07:00
Andrzej Kapolka
5f3a37139f Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-08 14:04:42 -07:00
Stephen Birarda
c64a961a38 packet version handling in VoxelSystem parseData 2013-07-08 14:01:10 -07:00
Andrzej Kapolka
c5c9debed5 Fix for combined gyro/depth camera. 2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03 Orientation -> rotation. 2013-07-08 12:54:27 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Andrzej Kapolka
4a22154737 Fix for leaning, smoothing. 2013-07-08 11:35:42 -07:00
Stephen Birarda
047d5b5cab add packet version handling for DS packets 2013-07-08 11:17:29 -07:00
Stephen Birarda
d112edab64 resolve conflicts on merge with upstream master 2013-07-08 11:07:42 -07:00
atlante45
013aabc65c Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 15:54:37 +02:00
atlante45
1f78c6461d Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 13:37:55 +02:00
atlante45
6c840a9ec3 Functionnal version of minecraft import 2013-07-08 13:37:47 +02:00
Eric Johnston
4341e8596f Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-07 22:19:13 -07:00
Andrzej Kapolka
357ac05d35 Removed debug logging. 2013-07-05 22:58:57 -07:00
Andrzej Kapolka
f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
 2013-07-05 22:52:42 -07:00
Andrzej Kapolka
9c6e5b23e0 Alignment fixes. 2013-07-05 22:44:47 -07:00
Andrzej Kapolka
9c977450e3 Finally got the rotations figured out; I had forgotten the default pose/bind 
pose distinction.
 2013-07-05 22:14:32 -07:00
Andrzej Kapolka
ff5d1455aa More work on joint tracking. 2013-07-05 17:45:29 -07:00
tosh
c2e2ff0ffe changes broadcast function in Application to use a different name but the same signature as in NodeList 2013-07-05 14:16:50 +02:00
tosh
2da132be65 upstream merge 2013-07-04 21:21:11 +02:00
tosh
689794259d Merge branch 'master' of git://github.com/worklist/hifi into 19376 
Conflicts:
	interface/src/Application.cpp
 2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542 Properly make the goHome() function in slot group 2013-07-03 23:43:53 -07:00
Philip Rosedale
5df09b2932 remove debugging printf 2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b Tuned smooth gyro look values to feel better. 2013-07-03 23:17:43 -07:00
Philip Rosedale
92cec4cfa0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off 2013-07-03 22:55:01 -07:00
Andrzej Kapolka
43258f9dcd Use 15 blinks per minute as a base/maximum frequency. 2013-07-03 17:12:43 -07:00
Andrzej Kapolka
30f77975cf Trying to get the right rotations, send them on the wire. 2013-07-03 17:07:22 -07:00
ZappoMan
c0d14d2bd4 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-03 15:36:41 -07:00
Eric Johnston
3ea100e595 Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed. 
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
 2013-07-03 15:33:18 -07:00
Stephen Birarda
0be42698b5 resolve conflicts on merge with upstream master 2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f Merge pull request #622 from birarda/master 
remove an extra g
 2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b what is July 3rdg 2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8 Merge pull request #621 from birarda/master 
remove pre-build fervor error, comment out process event bug
 2013-07-03 15:05:46 -07:00
Stephen Birarda
e85e49ef3b add a comment to disable of processEvents 2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5 Merge pull request #620 from machinelevel/dev4 
[trivial] small bracket fix per request in https://github.com/worklist/h...
 2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674 comment out processEvents to remove event receipt bug 2013-07-03 14:27:07 -07:00
Eric Johnston
fe46a3f0c9 [trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files 2013-07-03 13:11:26 -07:00
Philip Rosedale
3388fccc86 Fixes per code review 2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 13:01:21 -07:00
Eric Johnston
e8ee041f20 Virtual method warning removal. 
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
 2013-07-03 11:46:53 -07:00
Eric Johnston
acef2bc669 Fixed two-finger touch delay, and all other hidden event-pile-up. 
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
 2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304 smooth gyro look on by default if not in settings 2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520 Improve gyro look to smoothly follow the head and not move for small movements 2013-07-03 11:10:40 -07:00
ZappoMan
2d6e522c35 debug stats 2013-07-03 10:59:36 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Andrzej Kapolka
ebab09e535 More work on joints. 2013-07-03 10:13:10 -07:00
Eric Johnston
fd2009738b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba Merge pull request #614 from machinelevel/dev4 
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
 2013-07-03 09:53:40 -07:00
tosh
a542ebc851 bandwidth meter - avoid division by zero 2013-07-03 14:01:09 +02:00
Eric Johnston
cf8257d3e9 fixed curly-braces per request 2013-07-02 17:49:43 -07:00
Stephen Birarda
4a804a9960 Merge pull request #615 from ey6es/master 
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
 2013-07-02 17:33:11 -07:00
Andrzej Kapolka
4ecb4ab3c6 Restore the amplification; blink faster. 2013-07-02 17:14:54 -07:00
Andrzej Kapolka
a1d0f255cc Not crazy about the rotation amplification. 2013-07-02 17:03:37 -07:00
Eric Johnston
5d59bcbec7 (changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements 
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
 2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a Fix for camera movement with webcam enabled; don't bother using roll from 
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
 2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4 fixed FOV preference to work with view frustum code properly 2013-07-02 16:58:31 -07:00
ZappoMan
f45f0610f5 fixed FOV preference with projection matrix 2013-07-02 16:54:55 -07:00
Andrzej Kapolka
1fdfca727d More work on Kinect-driven joints. 2013-07-02 16:49:07 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
ZappoMan
c7ff073686 more progress on merging 2013-07-02 15:50:40 -07:00
Andrzej Kapolka
4f01db6dc7 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:52:22 -07:00
Andrzej Kapolka
bf4757663c Merge pull request #609 from birarda/domain-stats 
rework Logstash to handle various stat types, add domain server node count stat
 2013-07-02 14:52:08 -07:00
Andrzej Kapolka
c4deeed121 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -07:00
Stephen Birarda
f7f321663a DRY up multiple stat type sending 2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56 Merge pull request #599 from PhilipRosedale/master 
3P transition turned off, field of view now in preferences
 2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0 Merge remote-tracking branch 'worklist/master' into 19385 2013-07-02 23:05:50 +02:00