Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 11:59:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4499 commits 74 branches 59 tags 1.2 GiB
Commit graph

2296 commits

Author SHA1 Message Date
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-21 18:46:20 +02:00
Philip Rosedale
3539ec858e Added hand movement and body motion to transmitter. Feel much better - like dancing. 2013-05-20 23:22:28 -07:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -07:00
Jeffrey Ventrella
9d3e76efe2 operating on head. patient under anesthesia 2013-05-20 17:53:55 -07:00
Jeffrey Ventrella
6e994ed425 Merge remote-tracking branch 'upstream/master' 2013-05-20 17:33:27 -07:00
Jeffrey Ventrella
72f8f447a1 starting a rework of Head renderer 2013-05-20 17:30:13 -07:00
Philip Rosedale
6392bb0045 Merge pull request #363 from birarda/head-changes 
move lean sideways and lean forwards to the head data class
 2013-05-20 17:25:05 -07:00
Andrzej Kapolka
1be859ede9 Use glDrawRangeElements, which indicates the range of used indices. It may or 
may not make a difference in performance, but it won't hurt.
 2013-05-20 17:14:41 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
ZappoMan
d1554e0150 Merge pull request #361 from birarda/head-changes 
add a HeadData class to reduce redundancy for head member variables
 2013-05-20 17:08:09 -07:00
Andrzej Kapolka
5b0640bbbf Whoops--fixed a matrix stack issue that was breaking Oculus rendering. 2013-05-20 16:52:40 -07:00
Stephen Birarda
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
tosh
4385fc31e8 adds missing include "InterfaceConfig.h" for OpenGL types 2013-05-21 00:59:29 +02:00
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -07:00
ZappoMan
a53f84fcb9 latest hacking 2013-05-20 15:51:47 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Andrzej Kapolka
06c78c2f12 Tweak: let the reader know when it needs to load the full VBO. 2013-05-20 15:41:19 -07:00
Stephen Birarda
257a1d1f2e move head rotations to new HeadData class to be used for transmission 2013-05-20 15:21:02 -07:00
Andrzej Kapolka
8d522cd3ed I believe the problem with voxel rendering is caused by the update thread's 
writing the data while the render thread is attempting to read it.  This
should fix the issue.
 2013-05-20 15:15:44 -07:00
Andrzej Kapolka
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
tosh
e70efe7481 fixes improper merge / changes 2013-05-20 23:37:06 +02:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
Jeffrey Ventrella
d144fb7f84 fix 2013-05-20 14:34:39 -07:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-20 23:15:06 +02:00
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
Jeffrey Ventrella
1e9b04d28f cleanup 2013-05-20 12:16:18 -07:00
Stephen Birarda
7b21b8520e Merge branch 'master' of github.com:worklist/hifi 2013-05-20 12:16:10 -07:00
Andrzej Kapolka
616285f4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:13:53 -07:00
Andrzej Kapolka
3f0fd2f976 Added toggle for voxel textures; they may be slowing some machines down. 2013-05-20 12:13:23 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
f09cbca00b cleanup 2013-05-20 12:12:46 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Andrzej Kapolka
85dc14bb94 Drag support for adding/removing (as well as coloring) voxels. I had to 
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
 2013-05-20 12:01:33 -07:00
Jeffrey Ventrella
d384e36af1 test 2013-05-20 11:59:19 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
28581e33cc turn off audio echo rendering (it's for debug) 2013-05-20 11:56:40 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
Stephen Birarda
dae7bf8674 use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
Jeffrey Ventrella
aa9783a88d Merge remote-tracking branch 'upstream/master' 2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
Andrzej Kapolka
0f2f4ee8f9 Add the discussed four lines to disable blending and enable backface culling. 2013-05-20 11:32:32 -07:00
Andrzej Kapolka
85bca558f5 Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00
Jeffrey Ventrella
7f0d2e572e some preliminary work on avatarRenderer 2013-05-20 07:38:00 -07:00
Andrzej Kapolka
ae02004ef6 Use M rather than L, since L is taken by the level display. 2013-05-19 22:40:53 -07:00
Andrzej Kapolka
0539739720 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-19 18:38:09 -07:00
Andrzej Kapolka
dd3e8d524a Support for eye offset position/orientation in camera/frustum. 2013-05-19 18:37:21 -07:00
tosh
e99a41f41b revises oscilloscope 2013-05-19 16:28:49 +02:00
tosh
fbdda8bce4 adds comments 2013-05-19 15:07:48 +02:00
tosh
cfd4100c6e revises log display 2013-05-19 14:52:01 +02:00
tosh
2120ab9b1e puts member variables last but first 2013-05-19 13:23:04 +02:00
tosh
de665c2d48 adjusts names 2013-05-19 13:01:57 +02:00
Jeffrey Ventrella
bbeac7701a small fix 2013-05-18 14:43:23 -07:00
Jeffrey Ventrella
64392d0a78 Merge remote-tracking branch 'upstream/master' 2013-05-18 14:32:28 -07:00
Jeffrey Ventrella
5a4813d5c9 improved algorithm for rotating eyes to look at target 2013-05-18 14:31:27 -07:00
Philip Rosedale
5475b19a9e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-18 12:33:31 -07:00
Philip Rosedale
d9cc07cf17 Working on audio echo cancellation 2013-05-18 12:33:21 -07:00
ZappoMan
0ff65b44b5 Merge pull request #337 from tschw/19165 
19165
 2013-05-18 10:45:15 -07:00
tosh
4f3f5e1abe clarifies some names 2013-05-18 13:35:06 +02:00
tosh
989256aad0 clarifies some names 2013-05-18 13:33:01 +02:00
tosh
2cc5f732ce Merge branch '19165' of git://github.com/tschw/hifi 2013-05-18 11:03:09 +02:00
tosh
864d4e6734 Merge branch '19188' of git://github.com/tschw/hifi 2013-05-18 11:02:52 +02:00
Stephen Birarda
c504e8aa1a fix incorrect ordering of member variables in Head 2013-05-17 18:30:41 -07:00
Stephen Birarda
391d6dca8e remove the voxel server erase all that's unused 2013-05-17 17:54:04 -07:00
Jeffrey Ventrella
f099702d2a Merge remote-tracking branch 'upstream/master' 2013-05-17 14:56:51 -07:00
Jeffrey Ventrella
f2af37801e tidied up the head class and fixed a negated pitch value in orientation 2013-05-17 14:56:14 -07:00
Stephen Birarda
fc0448a148 disallow copying of VoxelSystem objects 2013-05-17 12:32:42 -07:00
Stephen Birarda
3e65d5a548 inline getters and setters in Avatar 2013-05-17 12:25:00 -07:00
Stephen Birarda
1ba1b56b2c disallow copying of Avatar objects 2013-05-17 12:15:19 -07:00
Stephen Birarda
ce7918108c remove a lingering comment 2013-05-17 11:09:23 -07:00
Stephen Birarda
194035e464 repair indentation in Head constructor 2013-05-17 11:08:44 -07:00
Stephen Birarda
a11ddee974 fix the width and height for the new iris texture 2013-05-17 10:55:11 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Stephen Birarda
c214e9b179 use the default Avatar destructor, comment out unused consts in Head 2013-05-17 10:46:59 -07:00
Stephen Birarda
a1ea7b58dd remove unused GLUQuadric sphere from Avatar class 2013-05-17 10:45:26 -07:00
Stephen Birarda
0e7c0776f2 refactor the Head class to remove _sphere and use default copy constructor 2013-05-17 10:43:26 -07:00
Andrzej Kapolka
58a9a05ef7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-17 10:17:37 -07:00
Andrzej Kapolka
3ed99f40a6 Working on support for off-axis projection. 2013-05-17 10:17:21 -07:00
Jeffrey Ventrella
ade5b7bec3 formatting changes 2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
0edf72a2be trying to fix merge conflicts 2013-05-17 09:20:42 -07:00
Jeffrey Ventrella
7e0877e753 cleanup 2013-05-17 08:48:54 -07:00
tosh
7115975c41 Merge branch 'master' of git://github.com/worklist/hifi into 19165 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-17 12:28:34 +02:00
Philip Rosedale
c43847946c Tweaked mouse camera movement a bit 2013-05-16 20:31:17 -06:00
Philip Rosedale
e55efb81a8 Added acceleration decay of pitch (you look up/straight if you start moving) 2013-05-16 19:12:48 -06:00
Jeffrey Ventrella
1c126e2525 resolved conflicts 2013-05-16 17:32:54 -07:00
Jeffrey Ventrella
750a48bb73 cleaned up head class - made most members private. Added copy constructor 2013-05-16 17:20:00 -07:00
Andrzej Kapolka
a23ed58a53 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 16:25:05 -07:00
ZappoMan
068e863fb4 Merge pull request #334 from PhilipRosedale/master 
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
 2013-05-16 16:24:42 -07:00
Andrzej Kapolka
00171eccbb Slight fix for shadows; we were drawing an unnecessary layer of text. 2013-05-16 16:23:11 -07:00
Philip Rosedale
aad5f3bfff Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:21:24 -06:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in 
our text to separate it from the background.
 2013-05-16 16:10:38 -07:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Andrzej Kapolka
191c533ad2 Provide a gray background for the chat entry, so that we can see what we're 
typing.
 2013-05-16 14:24:18 -07:00
Philip Rosedale
7866c803fb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 14:44:15 -06:00
Philip Rosedale
b2709652b4 Tweaks to improve mouse Yaw behavior. 2013-05-16 14:43:46 -06:00
Andrzej Kapolka
d241dba573 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:09:31 -07:00
Andrzej Kapolka
86ddcea87f Better names for the shaders. 2013-05-16 13:08:21 -07:00
Philip Rosedale
31967e8afb Merge pull request #331 from ZappoMan/master 
get rid of the "kill the solar system" feature... protecting us from ourselves!
 2013-05-16 12:59:55 -07:00
ZappoMan
f8dc01a890 removed the - key killing all the planets 2013-05-16 12:56:13 -07:00
Philip Rosedale
a36d32e101 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:34:54 -06:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Jeffrey Ventrella
cd248188d9 thingy 2013-05-16 12:19:20 -07:00
Jeffrey Ventrella
aafb557b02 turned off look at behavior - until it is finished and working correctly 2013-05-16 12:14:36 -07:00
Jeffrey Ventrella
04828c8224 cleaned up copyright header notifications in several files 2013-05-16 12:06:36 -07:00
Jeffrey Ventrella
be7be4ad99 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 11:18:32 -07:00
tosh
489a0cb844 adds comments and blank lines to clarify the code 2013-05-16 18:56:32 +02:00
tosh
539e69cef0 puts private members to the bottom of the class definition 2013-05-16 18:56:20 +02:00
Philip Rosedale
c8c4b8fda5 Merge pull request #328 from kordero/master 
fixing sscanf issue with floats for certain locales
 2013-05-15 23:36:04 -07:00
Philip Rosedale
1b039c3755 Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned. 2013-05-16 00:10:10 -06:00
=
0016038fe3 fixing locale issue with decimal delimiter for floats 2013-05-16 02:39:10 -03:00
Andrzej Kapolka
0a6b4702c6 Experimenting with simple Perlin noise shader for voxels. 2013-05-15 22:18:56 -07:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Andrzej Kapolka
2885c14480 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 17:31:11 -07:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Andrzej Kapolka
cb2acb58e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:22:47 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Andrzej Kapolka
f15c670c4e Let's try initializing glut before Qt, since we're getting a warning on OS X. 2013-05-15 16:07:09 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Andrzej Kapolka
7211fd7027 Now that we have a Qt context, we can use their shader classes. However, we 
extend the program object class with glm-enabled functions.
 2013-05-15 13:27:37 -07:00
Philip Rosedale
f6389cac38 First commit, audio echo detection, also changed scope to show last buffer played rather than next buffer to play. 2013-05-15 13:03:22 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
Stephen Birarda
e0ee50fa9c spacing changes in Audio render 2013-05-15 12:38:11 -07:00
Stephen Birarda
351412f6e8 constantize SOUND_PITCH in addProceduralSounds 2013-05-15 12:36:53 -07:00
Stephen Birarda
63a2b203d9 constantize VOLUME_BASELINE in addProceduralSounds 2013-05-15 12:36:19 -07:00
Stephen Birarda
274c810dec constantize the number of packets to discard for stats 2013-05-15 12:35:41 -07:00
Stephen Birarda
b186dd0f65 comment cleanup for audioCallback 2013-05-15 12:24:58 -07:00
Stephen Birarda
c5fdfd64e7 remove extra space 2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593 spacing changes 2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04 correct some global references in Audio.cpp 2013-05-15 12:19:40 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c sensible initialization for Audio member variables 2013-05-15 11:29:52 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Philip Rosedale
72d657b51d Preventing render bug with mis-scaled mouth (part of screen all black) 2013-05-15 10:00:30 -07:00
Andrzej Kapolka
1f7b77eb95 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 09:55:56 -07:00
Philip Rosedale
124f04820e Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only. 2013-05-15 09:52:12 -07:00
Philip Rosedale
73c793c0a1 Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera 2013-05-15 09:37:36 -07:00
Philip Rosedale
daaf86a634 restrict avatar body yaw to be between 0-360 2013-05-15 08:06:53 -07:00
tosh
9765ce7b9c removes obsolete OGlProgram.h, moves utility macro for logging gl errors to Log.h 2013-05-15 14:25:40 +02:00
tosh
31e518ebfd moves dependency to new gl-program class to starfield/Config.h (where all 
the other dependencies to components outside the 'starfield' folder live)
and removes dependency to obsolete OGlProgram.h
 2013-05-15 14:21:32 +02:00
Jeffrey Ventrella
a0e8c0da74 more work on avatar lookat 2013-05-14 18:15:54 -07:00
Jeffrey Ventrella
a5e696b696 Merge remote-tracking branch 'upstream/master' 2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496 working on lookat (eye contact) 2013-05-14 17:30:41 -07:00
Philip Rosedale
5fec8bc8fe Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 17:11:27 -07:00
Philip Rosedale
6cfdf96dea Added mouse panning in the Yaw direction - at edges of screen. 2013-05-14 17:11:16 -07:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter 
add new packet header for V2 transmitter data
 2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -07:00
Andrzej Kapolka
45e1d341fa When we add voxels, add them with the selected color. 2013-05-14 16:02:50 -07:00
Philip Rosedale
62a97f23bf Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd Removed mouse shift prototype. 2013-05-14 15:10:44 -07:00
Andrzej Kapolka
775fd5bd2e Use the sun location in the environment to set the light position. 2013-05-14 14:53:29 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902 What matters is the active state, not the focus. 2013-05-14 14:40:18 -07:00
Andrzej Kapolka
b4ca7ca5e3 Just manually request focus. 2013-05-14 14:36:43 -07:00
Andrzej Kapolka
053c0d1ca5 Focus tweak; focus isn't returning to the GL widget after closing the color 
dialog on OS X.
 2013-05-14 14:34:36 -07:00
Andrzej Kapolka
ebc612f87a Start out with gray, fix coloring smaller portions by (similar to deleting) 
breaking up leaf nodes into their components.
 2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc Added support for "destructive" vs "non-destructive" voxel create 
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
 2013-05-14 14:19:31 -07:00
Andrzej Kapolka
4eced82cf4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-14 13:51:27 -07:00
Andrzej Kapolka
9033152401 Color selection for painting. 2013-05-14 13:49:24 -07:00
ZappoMan
43e190fe3c switched Want Delta menu to use new Qt menus 2013-05-14 12:19:23 -07:00
Jeffrey Ventrella
7117e4a76c Merge remote-tracking branch 'upstream/master' 2013-05-14 11:44:34 -07:00
Jeffrey Ventrella
acda87502e more work on camera shifting between modes 2013-05-14 11:43:51 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Andrzej Kapolka
60e8971eb9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:29:08 -07:00
ZappoMan
63510aa30b Merge pull request #301 from PhilipRosedale/master 
Improved stability of invensense for drift
 2013-05-14 11:27:01 -07:00
Andrzej Kapolka
537686d541 Allow changing the edit voxel size using the mouse wheel. 2013-05-14 11:06:03 -07:00
Philip Rosedale
d386221620 Merge pull request #297 from Ventrella/master 
added code to allow mouse hover over avatar to be used for touch effects
 2013-05-14 11:04:59 -07:00
Andrzej Kapolka
a5e7fdeacd Accidentally left a debug line in. 2013-05-14 10:47:21 -07:00
Andrzej Kapolka
096421347e Missed some comments in transferring from main.cpp to Application.h; trying to 
preserve original formatting.
 2013-05-14 10:45:54 -07:00
Andrzej Kapolka
31b94203ff Disable the menu shortcuts for "regular" keys when the chat entry is showing. 2013-05-14 00:24:53 -07:00
Andrzej Kapolka
1e99389a4b Various fixes, removed the bulk of main.cpp. 2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Philip Rosedale
6b85d93aee Simplified serial port init to not use baud. 2013-05-13 18:52:43 -07:00
Stephen Birarda
a3a91984d2 include stdio for sprintf 2013-05-13 18:22:55 -07:00
Stephen Birarda
2c66ec8520 include string for methods in PairingHandler 2013-05-13 18:19:19 -07:00
Stephen Birarda
a01b35f041 remove extra debugging 2013-05-13 18:16:59 -07:00
Philip Rosedale
87dfbf9f4f Improved Invensense stability by adding average of first few samples to better eliminate DC bias/drift 2013-05-13 18:04:21 -07:00
Stephen Birarda
b6925edbe8 add a PairingHandler to send pair requests to the pairing server 2013-05-13 17:34:34 -07:00
Jeffrey Ventrella
6e3ab12411 Merge remote-tracking branch 'upstream/master' 2013-05-13 16:54:41 -07:00
Jeffrey Ventrella
54010d36c4 created transitions between camera modes 2013-05-13 16:53:45 -07:00
ZappoMan
b196227385 Added wantResIn and wantColor feature between client and server 
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
 2013-05-13 15:02:46 -07:00
Jeffrey Ventrella
6c3de00bcd cleaned up some code spacing 2013-05-13 14:53:05 -07:00
Jeffrey Ventrella
6f1000447b Merge remote-tracking branch 'upstream/master' 2013-05-13 14:01:32 -07:00
Jeffrey Ventrella
3ab0fa4e8c added code to detect mouse hovering over avatar joints for various touch effects 2013-05-13 14:00:25 -07:00
Andrzej Kapolka
7a653741de Don't set the renderFullVBOs flag; that's not the problem. 2013-05-13 12:30:56 -07:00
Andrzej Kapolka
57af5b11dd Start out with voxel editing disabled; let the add/delete/color buttons toggle 
the mode.
 2013-05-13 11:27:55 -07:00
Andrzej Kapolka
4bbd3e2e07 Better way of coming up with a contrasting color. 2013-05-13 09:41:50 -07:00
Andrzej Kapolka
eb77f5ff83 Removed debug code, more tests for staged-for-deletion. 2013-05-12 20:36:10 -07:00
Andrzej Kapolka
be88fec7d3 Fixed the major bug, which is that non-leaves were being collapsed. Update 
full VBO on deletion, since otherwise we don't see the update.
 2013-05-12 20:08:01 -07:00
Andrzej Kapolka
4289921b7e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-11 15:39:18 -07:00
Andrzej Kapolka
9802403749 Let's do some locking to prevent simultaneous access from different threads. 2013-05-11 15:38:49 -07:00
Jeffrey Ventrella
442632f467 fixed merge conflict 2013-05-11 11:50:19 -07:00
Jeffrey Ventrella
5c10ca5677 Merge remote-tracking branch 'upstream/master' 2013-05-11 11:48:34 -07:00
Jeffrey Ventrella
08aba4decb fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized) 2013-05-11 11:48:00 -07:00
Philip Rosedale
f115f2a991 fixes to repair merge 2013-05-11 10:55:20 -07:00
Philip Rosedale
dec7e5921c Merge remote-tracking branch 'upstream/master' 2013-05-11 10:49:23 -07:00
Philip Rosedale
a89b011ddf Spacing fixes 2013-05-11 10:47:02 -07:00
Philip Rosedale
a1e9235db5 fixed per review 2013-05-11 10:41:34 -07:00
Philip Rosedale
59a681ee44 Fixes per review. 2013-05-11 10:19:57 -07:00
Jeffrey Ventrella
ab9fa0a556 cleaned up some code 2013-05-10 22:31:51 -07:00
Jeffrey Ventrella
f1346604f4 indentation 2013-05-10 22:10:06 -07:00
Jeffrey Ventrella
1e4305d277 Merge remote-tracking branch 'upstream/master' 2013-05-10 21:58:52 -07:00
Jeffrey Ventrella
e4c84e7b74 added mouse view shift behaviors 2013-05-10 21:58:11 -07:00
Andrzej Kapolka
750843e867 More editing progress. Now there are threading issues. Joy! 2013-05-10 21:02:08 -07:00
Stephen Birarda
2a47d8955a remove some leftover walking sound stuff 2013-05-10 17:44:50 -07:00
Philip Rosedale
4a4184b327 Head in first person follows head mouse at edges of screen 2013-05-10 17:41:16 -07:00
Jeffrey Ventrella
847bfbdadd mode cleanup after head operation 2013-05-10 17:29:04 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Stephen Birarda
7abe5024d9 some space removals in Interface main.cpp 2013-05-10 17:20:07 -07:00
Jeffrey Ventrella
b2d5bfab2b clean up from headotomy 2013-05-10 17:12:16 -07:00
Jeffrey Ventrella
2d12b9b800 Merge remote-tracking branch 'upstream/master' 2013-05-10 17:06:25 -07:00
Jeffrey Ventrella
7fc2756257 I just did a headotomy (removed all head-related stuff from Avatar and made it its own class) 2013-05-10 17:05:52 -07:00
Philip Rosedale
6b75fe6e21 Merge remote-tracking branch 'upstream/master' 2013-05-10 16:49:28 -07:00
Philip Rosedale
5e21cb48ba First person added to render mode and 'p' key 2013-05-10 16:48:21 -07:00
Stephen Birarda
44814a275c have OculusManager::isConnected always return false if not APPLE 2013-05-10 15:33:36 -07:00
Stephen Birarda
9db694f683 condtional calls to constructors in OculusManager on APPLE only 2013-05-10 15:30:31 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
ZappoMan
ddd55104c1 CR feedback 2013-05-10 14:45:18 -07:00
ZappoMan
6c84e9015e Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-10 14:33:08 -07:00
ZappoMan
ef20b3e4b3 optimized performance of VoxelNode::isLeaf() 2013-05-10 14:32:44 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Stephen Birarda
e5fce7d83e remove a useless comment 2013-05-10 13:55:26 -07:00
Stephen Birarda
f447abe03b zero the yaw on oculus connect, set head yaw instead of body 2013-05-10 13:52:54 -07:00
Philip Rosedale
97f91403a3 Merge pull request #278 from ZappoMan/render_voxels_optimization 
Implement Partial VBO strategy in copyWrittenDataToReadArrays()
 2013-05-10 13:50:49 -07:00
Jeffrey Ventrella
2032264e7e pull avatar from handshake 2013-05-10 13:42:51 -07:00
Jeffrey Ventrella
ca5adb791c pull avatars from handholding 2013-05-10 13:25:40 -07:00
ZappoMan
b9a023af37 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-10 13:19:06 -07:00
ZappoMan
322cb2ff23 implemented partial VBOs support in copyWrittenDataToReadArrays() 2013-05-10 13:18:51 -07:00
Jeffrey Ventrella
939665419d made some improvements to handshake 2013-05-10 13:04:41 -07:00
Jeffrey Ventrella
eb49a9e4f2 hand holding 2013-05-10 12:52:39 -07:00
Jeffrey Ventrella
9db5d7e202 hand holding 2013-05-10 12:45:37 -07:00
Jeffrey Ventrella
87f8df7e7b ... 2013-05-10 12:28:46 -07:00
Jeffrey Ventrella
a5496ee99e Merge remote-tracking branch 'upstream/master' 2013-05-10 12:24:24 -07:00
Jeffrey Ventrella
685df2c65c thingy 2013-05-10 12:23:58 -07:00
Jeffrey Ventrella
9598976894 Merge remote-tracking branch 'upstream/master' 2013-05-10 12:20:01 -07:00
Jeffrey Ventrella
619c1a843f working on hand holding algo 2013-05-10 12:18:49 -07:00
Andrzej Kapolka
012c2c9c9f Changed "Quit" menu item to "Test" (Quit should apparently be added 
automatically).
 2013-05-10 12:11:32 -07:00
Andrzej Kapolka
66a8e40712 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:09:25 -07:00
Andrzej Kapolka
8d0fdcac06 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:08:50 -07:00
ZappoMan
0888a6605f CR fixes 2013-05-10 12:08:43 -07:00
ZappoMan
bfa7c91a7a fixed menu behavior 2013-05-10 12:08:03 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9 fixed menu behavior 2013-05-10 12:04:52 -07:00
Jeffrey Ventrella
474423e33f Merge remote-tracking branch 'upstream/master' 2013-05-10 11:27:41 -07:00
Jeffrey Ventrella
40e7603e49 removed print statements 2013-05-10 11:27:07 -07:00
Philip Rosedale
7d69eb09c2 Merge remote-tracking branch 'upstream/master' 2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495 have the oculus drive the body yaw, head pitch, and head roll 2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c Re-added Head Mouse working correctly with invensense 2013-05-10 10:55:05 -07:00
Andrzej Kapolka
e6e5b20dee Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 10:20:04 -07:00
Stephen Birarda
cc38e4c5c4 Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 10:18:36 -07:00
Stephen Birarda
04447dfcbd drive body yaw and render pitch with oculus when connected 2013-05-10 10:17:21 -07:00
Stephen Birarda
adbca70eba expand the OculusManager to return euler angles 2013-05-10 10:16:23 -07:00
ZappoMan
3af8a1b8f4 code review fixes 2013-05-10 10:03:28 -07:00
Andrzej Kapolka
beadb6a93d Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2 Adding/removing voxels at different sizes. 2013-05-10 09:53:53 -07:00
ZappoMan
9dc09de75e make VoxelSystem::deleteVoxelAt() work properly 2013-05-10 09:32:56 -07:00
Jeffrey Ventrella
470349d662 made avatars taller an fixed proportions a bit 2013-05-09 23:31:45 -07:00
ZappoMan
6b5eceeae1 Merge pull request #269 from Ventrella/master 
improved camera first person mode and cleaned up some camera code
 2013-05-09 22:26:59 -07:00
ZappoMan
f0b4dde388 Merge pull request #267 from PhilipRosedale/master 
Stars meridians removed and count reduced, some log cleanup
 2013-05-09 22:25:56 -07:00
Philip Rosedale
8521a9e146 added one more log line 2013-05-09 22:23:15 -07:00
ZappoMan
4fe93af5cd create and delete voxels locally 2013-05-09 22:22:32 -07:00
Jeffrey Ventrella
751254ab56 set default camera mode back to third person 2013-05-09 22:22:21 -07:00
ZappoMan
bd3ea6ef65 create and delete voxels locally 2013-05-09 22:20:13 -07:00
Jeffrey Ventrella
6254a6886f cleaned up camera code and improved first person mode 2013-05-09 22:11:33 -07:00
Philip Rosedale
eefd0c36f1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
Jeffrey Ventrella
697e0d0cbe fixed spacing issue 2013-05-09 17:51:05 -07:00
Jeffrey Ventrella
bca5436fab indentation 2013-05-09 17:36:39 -07:00
Jeffrey Ventrella
6dfa20976d Merge remote-tracking branch 'upstream/master' 2013-05-09 17:24:50 -07:00
Jeffrey Ventrella
eed56db9e5 more fixes to hand holding 2013-05-09 17:24:16 -07:00
Philip Rosedale
cdab62c10c Merge pull request #265 from ZappoMan/render_voxels_optimization 
Optimized Voxel Rendering Performance by implementing blended VBO strategy
 2013-05-09 17:21:05 -07:00
Jeffrey Ventrella
ede3cc2f3d tweak tweak 2013-05-09 17:18:26 -07:00
Jeffrey Ventrella
ab3ee1688d more work on hand holding 2013-05-09 17:14:54 -07:00
ZappoMan
2128cb8bff get rid of dead code 2013-05-09 17:10:25 -07:00
Jeffrey Ventrella
6c58dbeab2 thingy 2013-05-09 17:02:40 -07:00
ZappoMan
33fc9f5389 fixed partial VBO updates 2013-05-09 17:01:20 -07:00
Jeffrey Ventrella
9d548c43ad twiddle tweak iterate whittle 2013-05-09 16:54:01 -07:00
Andrzej Kapolka
78b37fe920 Starting on coloring support. 2013-05-09 16:26:51 -07:00
Stephen Birarda
f656800fa7 add getters for yaw, pitch and roll to the OculusManager class 2013-05-09 16:10:49 -07:00
Andrzej Kapolka
ecd12e0ac4 Show the voxels to be added/deleted as wireframe cubes. 2013-05-09 16:09:07 -07:00
Jeffrey Ventrella
513701391e working on hand touching 2013-05-09 16:07:43 -07:00
Stephen Birarda
999ab5cb20 initial setup to connect to oculus and grab sensors 2013-05-09 15:45:09 -07:00
Jeffrey Ventrella
c2deba6e39 improved avatar touch code 2013-05-09 15:15:28 -07:00
Philip Rosedale
52337a1fae Merge remote-tracking branch 'upstream/master' 2013-05-09 15:03:45 -07:00
Philip Rosedale
c0a54eca14 Added head lean to broadcast data packets, lean now being set from invensense accelerometers. 2013-05-09 15:03:19 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
ZappoMan
7b22300164 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-09 14:39:41 -07:00
Jeffrey Ventrella
3ba93397bd fixed a bug in menu clicking 2013-05-09 14:37:13 -07:00
Andrzej Kapolka
c411083057 Working on adding an "add voxel in front of avatar" command. 2013-05-09 14:30:50 -07:00
ZappoMan
3aa862fa34 removed some debug messages 2013-05-09 14:19:42 -07:00
ZappoMan
c73d4ddfa4 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53 More work on partial VBO updates still not working 100% correctly 2013-05-09 14:04:08 -07:00
Philip Rosedale
ef1848a68c Merge remote-tracking branch 'upstream/master' 2013-05-09 14:03:03 -07:00
Philip Rosedale
dd33cedf8d Removed old serial code for Maple ADC 2013-05-09 14:01:22 -07:00
Jeffrey Ventrella
8ecfbce15e fixed some small formatting things 2013-05-09 14:00:40 -07:00
Jeffrey Ventrella
14d47d87d8 thingy 2013-05-09 13:52:03 -07:00
Jeffrey Ventrella
14b943f1f7 added lean code for Philip... 2013-05-09 13:48:05 -07:00
Andrzej Kapolka
145c6484f4 Fixed issue with mouse pressed state, use mouse buttons to add/delete voxels 
(numbers now switch between modes).
 2013-05-09 13:33:23 -07:00
Philip Rosedale
dbdd4160cc Added acceleration reading, gravity baseline, and line displays to invensense 2013-05-09 13:29:09 -07:00
Jeffrey Ventrella
b61a9687f8 thingy 2013-05-09 13:14:08 -07:00
Jeffrey Ventrella
17c61c88c7 cleaned up avatar slow-down upon nearness; fixed mouse pressed bug; 2013-05-09 13:04:22 -07:00
Jeffrey Ventrella
7cfc9844a3 Merge remote-tracking branch 'upstream/master' 2013-05-09 11:22:55 -07:00
Jeffrey Ventrella
e923f5446d clean up 2013-05-09 11:22:24 -07:00
ZappoMan
a476c8362c Merge pull request #254 from PhilipRosedale/master 
Fixed bug with bodies springing into view on startup
 2013-05-09 11:01:33 -07:00
Andrzej Kapolka
dcd42096a5 Tabs -> spaces. 2013-05-09 10:56:08 -07:00
Andrzej Kapolka
7ff8b84f4c Return the box face, as well as the distance, from the ray intersection test. 
Use it to determine which voxel neighbor we create when adding.
 2013-05-09 10:46:52 -07:00
Andrzej Kapolka
2b9c2ca9a2 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 10:42:59 -07:00
Philip Rosedale
d2cccce80a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 10:42:36 -07:00
Stephen Birarda
1c073c1c71 correct the accelerometer sensitivity 2013-05-09 10:38:02 -07:00
Stephen Birarda
f95ba24f21 also read accelerometer data from invensense boards 2013-05-09 10:34:40 -07:00
Andrzej Kapolka
4a0657fead Set up the lights after applying the camera transform so that they will be in 
world, not view, space.
 2013-05-09 10:29:15 -07:00
ZappoMan
a08d89a074 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-09 10:28:05 -07:00
ZappoMan
655f14121d Voxel Render Optimization - using blended VBO update strategy 
- Fixed a bug in updateNodeInArraysAsFullVBO() that caused blended strategy
  to not work properly.
- Implement strategy to usually update only the portion of the VBOs that
  have changed, unless nodes have been removed, and then update the full
  VBO. This siginificantly improves treeToArrays() performance
- Still to do implement partial strategy for copy buffers and update GPU
 2013-05-09 10:25:12 -07:00
Andrzej Kapolka
0cff127082 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 09:56:58 -07:00
Andrzej Kapolka
785e55e06f Working on voxel editing. 2013-05-09 09:56:35 -07:00
Jeffrey Ventrella
a75f655e40 Merge remote-tracking branch 'upstream/master' 2013-05-08 22:46:57 -07:00
Jeffrey Ventrella
0ac2765b09 cleaned up a few small code thingies; added a check for where avatar velocity updates avatar position; 2013-05-08 22:45:28 -07:00
Philip Rosedale
39c35ea5c4 spacing 2013-05-08 21:19:33 -07:00
Philip Rosedale
5db7b74c1e spacing 2013-05-08 21:19:15 -07:00
Philip Rosedale
2bf9b3e6fd Fixed problem with springy body repositioning on startup 2013-05-08 21:18:10 -07:00
ZappoMan
bb65137b7e Optimized performance of newTreeToArrays() by implementing blended VBO strategy 
- Introduced concept of sometimes only updating the new/changed part of the VBO
  while other times updating the full VBO. This allows us to get the speed
  advantage of only partial VBO updates when nodes haven't been removed
- Some debugging output related to _alwaysRenderFullVBO
- added cleanupRemovedVoxels() which actually deletes the nodes that were
  previously removed (fixes a memory leak!!)
 2013-05-08 20:33:41 -07:00
Philip Rosedale
408a21b515 Fixed Eve's missing mouth and the bad triangles! 2013-05-08 20:26:38 -07:00
Philip Rosedale
14f0ecdc51 Lowered avatar drag to allow faster flight, increased drag when near others 2013-05-08 20:07:27 -07:00
Philip Rosedale
4bb8f49132 Added new cooler movement sound that is velocity sensitive. 2013-05-08 20:02:29 -07:00
Philip Rosedale
ddc97a6ac9 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876 Added gyro pitch to view, moved onscreen displays around to look nicer. 2013-05-08 19:35:48 -07:00
Jeffrey Ventrella
fc549b73bd fixed merge conflict 2013-05-08 19:25:23 -07:00
Jeffrey Ventrella
bbd85664d6 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063 put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer 2013-05-08 19:22:21 -07:00
ZappoMan
5cfbcc5caa Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 18:06:30 -07:00
ZappoMan
244b4a17f7 lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing 2013-05-08 18:06:13 -07:00
ZappoMan
bf81587e1b Merge pull request #243 from PhilipRosedale/master 
Procedural noise support added on client, adds a bit of noise when moving
 2013-05-08 17:44:15 -07:00
Philip Rosedale
08c48bf6a7 Merge remote-tracking branch 'upstream/master' 2013-05-08 17:27:31 -07:00
Philip Rosedale
5052f4af5e Added render option for avatars, code cleanup. 2013-05-08 17:26:44 -07:00
Philip Rosedale
ebf06187b7 Merge remote-tracking branch 'upstream/master' 2013-05-08 16:16:27 -07:00
ZappoMan
9bde92fe78 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 15:35:09 -07:00
ZappoMan
4e789dcfbf Merge pull request #250 from ey6es/master 
Directory fix for shaders on OS X.
 2013-05-08 15:34:55 -07:00
Andrzej Kapolka
da822e5299 We need to adjust the directory on OS X before we attempt to load the shaders. 2013-05-08 15:33:39 -07:00
ZappoMan
b35c88029e Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 15:07:24 -07:00
ZappoMan
4301506f0c Merge pull request #249 from ey6es/master 
Fix for build error on OS X.
 2013-05-08 15:07:08 -07:00
Andrzej Kapolka
1f58e28b36 Need the ARB suffix on this. I'm surprised it compiled for me! 2013-05-08 15:05:35 -07:00
ZappoMan
5f55d511c5 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 15:01:50 -07:00
Philip Rosedale
5e450827d8 Merge pull request #237 from ey6es/master 
Added basic environment data and atmosphere rendering.
 2013-05-08 15:01:12 -07:00
ZappoMan
9a04f2c00c Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 14:57:20 -07:00
Philip Rosedale
ad25150d62 Merge remote-tracking branch 'upstream/master' 2013-05-08 14:51:52 -07:00
Philip Rosedale
fd5789abb8 Merge remote-tracking branch 'upstream/master' 2013-05-08 14:40:53 -07:00
Philip Rosedale
a9882d054f Invensense gyros now correctly controlling head motion, code cleanups. 2013-05-08 14:39:41 -07:00
ZappoMan
cb5ccee1e4 CR cleanup 2013-05-08 14:32:55 -07:00
ZappoMan
ed30a03b2e CR cleanup 2013-05-08 14:30:18 -07:00
ZappoMan
ad67c363ec Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 14:27:37 -07:00
ZappoMan
70557cd51c Optimized removeOutOfView() 
- don't recurse down trees that are fully INSIDE of the view frustum, because those nodes
  are guaranteed to also be INSIDE
- changes to extraData of the recurse operation to make this possible
- adding debug stats to track how many nodes are inside, outside, intersect
- change call to removeOutOfView() to not call if last elapsed time has not
  yet passed since last call (similar to treeToArrays() logic)
 2013-05-08 14:24:08 -07:00
Andrzej Kapolka
1c8b835bb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-08 13:15:21 -07:00
Andrzej Kapolka
caeccf59ec When the stars and the atmosphere are both on, adjust the stars' alpha value 
based on the distance from the atmosphere.
 2013-05-08 13:13:56 -07:00
ZappoMan
0b873dddc8 Merge pull request #244 from Ventrella/master 
moved Orientation class to shared folder
 2013-05-08 12:51:26 -07:00
Andrzej Kapolka
8a21823469 Render the stars, when enabled, before the atmosphere. 2013-05-08 12:11:48 -07:00
ZappoMan
7a5ce57b4e added alwaysDisplay mode to PerformanceWarnings class 2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	voxel-server/src/main.cpp
 2013-05-08 11:56:03 -07:00
Andrzej Kapolka
5138f62aef Use the "proper" alpha value (i.e., the one from the original shader). This 
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
 2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34 Include the "sky from space" shaders, too, and use them when the camera is 
outside the atmosphere's outer radius.
 2013-05-08 11:42:31 -07:00
Philip Rosedale
131377aaf9 Converted gyro values to floats and converted to exact degrees/second per docs. 2013-05-08 11:22:49 -07:00
Philip Rosedale
de6627f922 Merge remote-tracking branch 'upstream/master' 2013-05-08 10:40:05 -07:00
Andrzej Kapolka
8d4a74cf03 Render environment -> render atmosphere. 2013-05-08 10:00:31 -07:00
Philip Rosedale
355cff21c5 Merge remote-tracking branch 'upstream/master' 2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc Added Procedural audio noise when moving, scaled to velocity 2013-05-08 09:04:38 -07:00
Jeffrey Ventrella
9e60c8a36e increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder 2013-05-08 08:59:29 -07:00
ZappoMan
de969891d8 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec removed addRandomSphere() which was dead code 2013-05-08 00:46:02 -07:00
ZappoMan
f1425216ba removed VoxelSystem::createSphere() which was dead code 2013-05-08 00:45:27 -07:00
Andrzej Kapolka
80cdd597f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a Merge pull request #225 from PhilipRosedale/master 
Added perlin noise example function noiseTest()
 2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35 Merge pull request #223 from Ventrella/master 
cleaned up a bunch of spacings inside of parentheses
 2013-05-07 17:51:43 -07:00
Andrzej Kapolka
9e6e5acf19 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:42:47 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00
Stephen Birarda
75ba88923f remove the serial interface close in destructor, incorrect solution 2013-05-07 17:09:49 -07:00
Andrzej Kapolka
c7e31ec414 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929 Wavelengths, switch for environment rendering, far plane adjustment. 2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0 revert the type squish 2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd revert type squish, spacing, code review comment 2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65 make eve send her ID to identify with the avatar mixer 2013-05-07 13:38:56 -07:00
Philip Rosedale
0ae700d746 Merge remote-tracking branch 'upstream/master' 2013-05-07 12:53:19 -07:00
Philip Rosedale
e1645b1158 Testing audio noise generation at client 2013-05-07 12:48:35 -07:00
Stephen Birarda
0566330a8a some magic number removals 2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd add constant for UNKNOWN_AGENT_ID 2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8 more deletions 2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e trivial deletions for cleanup 2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1 have interface clients tell the avatar-mixer and voxel-server what their ID is 2013-05-07 12:05:19 -07:00
Philip Rosedale
331d4116d9 Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D. 2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656 Noise Test function, adjust chat position 2013-05-07 10:41:39 -07:00
Philip Rosedale
27540f1286 Fixes per code review 2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9 Fixes in merge. 2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0 changed some spacing formatting things 2013-05-06 22:23:16 -07:00
Philip Rosedale
31593dccd4 improved comment of function 2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb Added Utility function angleBetween() which returns the positive angle between any two 3D vectors. 2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
ef76c6ba0a Merge remote-tracking branch 'upstream/master' 2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c more work on avatar touch, reachable radius, and hand states 2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478 Merge remote-tracking branch 'upstream/master' 2013-05-06 18:23:06 -07:00
Stephen Birarda
55a1e26585 remove the Texture class no longer in use 2013-05-06 18:10:21 -07:00
Stephen Birarda
f424b75e7b some spacing repairs after merging Philip's levels pull 2013-05-06 17:50:44 -07:00
birarda
133e95f116 Merge pull request #210 from PhilipRosedale/master 
Added invensense gyro level indicators
 2013-05-06 17:47:38 -07:00
Jeffrey Ventrella
9c1f163175 Merge remote-tracking branch 'upstream/master' 2013-05-06 17:00:04 -07:00
Philip Rosedale
9c56e5a2f7 Merge remote-tracking branch 'upstream/master' 2013-05-06 16:59:46 -07:00
Jeffrey Ventrella
9fc56a6230 working out avatar touch stuff 2013-05-06 16:59:43 -07:00
ZappoMan
84da976383 removed _voxelCleanupLock 2013-05-06 16:38:24 -07:00
ZappoMan
f5808f43b5 some cleanup pre CR 2013-05-06 16:24:09 -07:00
Philip Rosedale
ff88d1fc06 Created a drawVector() call that will draw a vector in 3-space with axes for testing 2013-05-06 16:18:27 -07:00
Jeffrey Ventrella
fd4a0c9acd working on detection of avatars entering into each other's peripersonal space 2013-05-06 16:17:16 -07:00
ZappoMan
94529d54e8 some cleanup pre CR 2013-05-06 16:16:21 -07:00
ZappoMan
b69c1a3474 some cleanup pre CR 2013-05-06 16:14:10 -07:00
ZappoMan
68d58650a5 removed some debug code 2013-05-06 16:09:21 -07:00
ZappoMan
09923d1c97 second cut at view culling voxels 2013-05-06 15:51:56 -07:00
Jeffrey Ventrella
c1ac3eb320 improving the code for detecting collisions, hand movement and handholding 2013-05-06 15:14:13 -07:00
Jeffrey Ventrella
114dfeacf6 thingy 2013-05-06 14:22:01 -07:00
Jeffrey Ventrella
40771e4c47 thingy 2013-05-06 14:18:14 -07:00
Jeffrey Ventrella
bc15bc2292 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:53:16 -07:00
ZappoMan
4f7adf7a05 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:47:13 -07:00
Philip Rosedale
3b3e6ae075 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:42:23 -07:00
Andrzej Kapolka
a44cb3fcb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-06 13:41:30 -07:00
Stephen Birarda
784fa5882a closing of serial interface should be conditional on __APPLE__ 2013-05-06 13:36:58 -07:00
ZappoMan
043a284d4d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:36:31 -07:00
Andrzej Kapolka
5b873c1e8f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-06 13:33:07 -07:00
ZappoMan
7ba9d4aa86 First cut are removing out of view voxels and switch to using PerformanceWarnings 2013-05-06 13:32:09 -07:00
Stephen Birarda
250df35bc1 resolve conflicts on merge with upstream master 2013-05-06 13:31:50 -07:00
Andrzej Kapolka
2226d722cf Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa Starting on environment bits. 2013-05-06 13:30:07 -07:00
Philip Rosedale
eedbb98c32 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:29:34 -07:00
Philip Rosedale
f39fa3549b invensense horizontal lines for RT indicator 2013-05-06 13:29:02 -07:00
Stephen Birarda
6666229d83 close the serial file descriptor in destructor 2013-05-06 13:25:49 -07:00
Stephen Birarda
49042046de remove duplicated constructor after merge 2013-05-06 13:20:13 -07:00
Stephen Birarda
6d91e4721e Merge remote-tracking branch 'upstream/master' into domain-rfd 2013-05-06 13:18:34 -07:00
Stephen Birarda
ee4c55afe7 move SerialInterface constructor to header file 2013-05-06 13:18:06 -07:00
Stephen Birarda
0b810fa4c2 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:09:15 -07:00
Stephen Birarda
f3a9dcf777 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:08:45 -07:00
Philip Rosedale
e85e44456b Tweaking level indicators for new Invensense 2013-05-06 13:05:45 -07:00
Jeffrey Ventrella
6273594f51 made a call to initializeBodySprings at the end of initializeSkeleton 2013-05-06 12:56:31 -07:00
Jeffrey Ventrella
2a1bbcc168 improved avatar gravity code and moved source of gravity vector to main.cpp 2013-05-06 12:35:52 -07:00
Jeffrey Ventrella
40213dfedd Merge remote-tracking branch 'upstream/master' 2013-05-06 11:31:33 -07:00
Jeffrey Ventrella
5c7fd0fe7d a few small formatting and glitch fixes 2013-05-06 11:29:18 -07:00
Stephen Birarda
37f1360542 fix spacing for gravity vector 2013-05-06 10:39:36 -07:00
Stephen Birarda
928beac8e0 Merge branch 'master' of github.com:worklist/hifi into invensense 2013-05-06 10:38:53 -07:00
ZappoMan
af6f51527a short circuit shouldRender logic in treeToArrays() 2013-05-05 10:34:09 -07:00
ZappoMan
2c8c6a2600 Coding standard cleanup and VoxelNode optimization 
- make octalCode and children members private
- add public getters for accessing these private members
- change constructor to require an OctalCode for all non-roots
- default constructor constructs a rootNode
- make primary access for deleting, adding, and accessing children through public methods that do bookkeeping
- calculate AABox on voxel creation so that we don't need to do all the math when we deal with voxels
- added methods on VoxelNode for common items like getCorner(), getCenter(), getLevel(), etc
 2013-05-05 10:17:02 -07:00
ZappoMan
24dee12d67 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-04 08:25:35 -07:00
ZappoMan
7d1e271c39 fix bug in bogus avatar data file 2013-05-04 08:23:06 -07:00
ZappoMan
5253485261 added TREE_SCALE to default camera farClip 2013-05-04 07:46:42 -07:00
Jeffrey Ventrella
f8762c5e37 added avatar data file stuff that got lost during a merge or something 2013-05-03 16:58:52 -07:00
Jeffrey Ventrella
707d513dac Merge remote-tracking branch 'upstream/master' 2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300 fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly. 2013-05-03 16:11:35 -07:00
Stephen Birarda
66e2771135 some cleanup in interface main 2013-05-03 15:58:55 -07:00
Andrzej Kapolka
bc0c1cf5f9 Fixed bug with rendering stars on OS X: was using some weird extension on 
Apple rather than standard VBOs.
 2013-05-03 15:44:51 -07:00
Andrzej Kapolka
c1a3478954 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-03 15:44:14 -07:00
Stephen Birarda
24c1ea5e7f resolve conflicts on merge with upstream master 2013-05-03 15:37:22 -07:00
Jeffrey Ventrella
85ad5601d7 added avatar shadow 2013-05-03 15:22:01 -07:00
Stephen Birarda
bd3c902b68 remove logging of audio stats 2013-05-03 15:13:38 -07:00
Stephen Birarda
31e9c18346 couple of extra line deletions in main.cpp 2013-05-03 15:09:44 -07:00
Stephen Birarda
da93b596de some deletion cleanup in main.cpp 2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9 store avatar position and yaw in file to restore on relaunch 2013-05-03 15:05:28 -07:00
Stephen Birarda
90a08b4dd8 cleanup in Audio and Util 2013-05-03 14:45:47 -07:00
Andrzej Kapolka
8923057d0e Compile fix, need to use integer GL uniform. 2013-05-03 13:00:48 -07:00
ZappoMan
8e7dd4ba8f Merge pull request #187 from ey6es/master 
Fix for Oculus rendering: we need to resize the render texture when the display is resized.
 2013-05-03 12:24:54 -07:00
ZappoMan
f78c59f828 Merge pull request #189 from birarda/pairing 
basic version of the pairing server
 2013-05-03 12:24:29 -07:00
Jeffrey Ventrella
8457b91fe0 cleaned up a bunch of leftover tabs and converted each to 4 spaces 2013-05-03 11:15:49 -07:00
Stephen Birarda
5f26d44fd8 Merge remote-tracking branch 'upstream/master' into pairing 2013-05-03 10:59:34 -07:00
Stephen Birarda
bd6f0d9885 couple of line deletions 2013-05-03 10:58:57 -07:00
Andrzej Kapolka
9dfc6c6590 Fix for fullscreen mode switching: when we reshape, we need to resize the 
render texture (if it exists).
 2013-05-03 10:57:51 -07:00
Jeffrey Ventrella
026ee4345c Merge remote-tracking branch 'upstream/master' 2013-05-03 10:54:07 -07:00
Jeffrey Ventrella
e0b33e56da couple of small code cleanups 2013-05-03 10:52:44 -07:00
Andrzej Kapolka
346f213e3b Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/main.cpp
 2013-05-03 10:31:40 -07:00
Philip Rosedale
f05451b4f1 Merge pull request #186 from ZappoMan/render_voxels_optimization 
Some more tweaks to test pipeline
 2013-05-03 10:27:56 -07:00
Andrzej Kapolka
08350a5d3a Rather than a command line parameter, provide a menu option for switching 
to/from fullscreen mode.
 2013-05-03 10:22:10 -07:00
Philip Rosedale
1fbc13941d Fixes per merge (Ventrella) 2013-05-03 10:16:58 -07:00
Andrzej Kapolka
43b5e9430f Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-03 10:04:50 -07:00
ZappoMan
5710dd750d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-03 10:01:37 -07:00
ZappoMan
a4f2dc283d various changes to help debug render pipeline 
- fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger
- added createLine() to VoxelTree
- added axis lines made of voxels to scene
- added corner points made of voxels to scene
 2013-05-03 09:58:52 -07:00
Philip Rosedale
b703d0982e Changed avatar.h to store _distanceToNearestAvatar 2013-05-03 09:55:25 -07:00
ZappoMan
2b11cad1ab Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-02 22:33:41 -07:00
Philip Rosedale
9716ea9550 Ground plane moved to 0->10 and lines are exactly 1 meter 2013-05-02 22:28:41 -07:00
ZappoMan
34a059db9a more optimizations of render pipeline 2013-05-02 22:26:56 -07:00
Philip Rosedale
581365f1f1 Fixes per code review. 2013-05-02 20:51:17 -07:00
Philip Rosedale
2195a140fd Merge remote-tracking branch 'upstream/master' 2013-05-02 20:36:43 -07:00
ZappoMan
771c604121 more render pipeline optimizations 2013-05-02 18:12:55 -07:00
Jeffrey Ventrella
7a52d51251 adding avatar renderer 2013-05-02 17:47:28 -07:00
Jeffrey Ventrella
c46fc5a861 (1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4) 2013-05-02 17:46:10 -07:00
ZappoMan
fcce4753c9 more optimizations on render pipeline 2013-05-02 16:37:31 -07:00
ZappoMan
5a14c71225 added dirty bit support to VoxelTree, use it to determine when to call treeToArrays 2013-05-02 15:57:31 -07:00
Andrzej Kapolka
8e2c43e983 Need to disable blending when we render the distorted screen quad. 2013-05-02 15:54:58 -07:00
Andrzej Kapolka
ccded56ecf Use the right type here; Xcode complains about it. 2013-05-02 15:20:29 -07:00
Andrzej Kapolka
762c635744 Restored constant value added another reference to the SDK docs. 2013-05-02 14:44:03 -07:00
Andrzej Kapolka
5de15dd5a4 Final bits for Oculus support. Works! 2013-05-02 14:39:00 -07:00
Jeffrey Ventrella
673936e141 adjusted proportions of avatar skeleton to make it closer to average human 2013-05-02 14:05:51 -07:00
ZappoMan
8f0dd1ffa1 added render pipeline warnings menu item 2013-05-02 13:17:06 -07:00
Jeffrey Ventrella
cd334c2ade renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some 2013-05-02 13:13:56 -07:00
Andrzej Kapolka
b0bbca281d Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-02 13:10:39 -07:00
Andrzej Kapolka
94f1e03eb1 More work on Oculus integration; added some notes to explain the source of the 
magic numbers.
 2013-05-02 13:02:11 -07:00
ZappoMan
e2481f514c lower warning threshold to 1 millisecond for voxel render pipeline steps 2013-05-02 12:53:56 -07:00
Stephen Birarda
d2ca0d4dc4 Merge remote-tracking branch 'upstream/master' into invensense 2013-05-02 12:29:37 -07:00
ZappoMan
275772bb3d debugging voxel sending behavior 2013-05-02 12:26:51 -07:00
Stephen Birarda
9e3b862c67 hook up the invensense via existing SerialInterface class 2013-05-02 12:26:12 -07:00
Jeffrey Ventrella
4eda930f4a Merge remote-tracking branch 'upstream/master' 2013-05-02 11:06:18 -07:00
Jeffrey Ventrella
35a8066bd6 fixed merge problem 2013-05-02 11:05:51 -07:00
Jeffrey Ventrella
42ce96c82e Merge pull request #177 from Ventrella/master 
I made a few minor fixes in Avatar
 2013-05-02 11:01:24 -07:00
ZappoMan
a6d2bb73ad added warnings if bitstream processing takes too long 2013-05-01 23:24:46 -07:00
ZappoMan
6a7ebb3a55 fixed LOD issue in client 2013-05-01 22:57:19 -07:00
Philip Rosedale
900caa6278 Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements 2013-05-01 22:40:38 -07:00
Philip Rosedale
ee1e5d16fc Avatars are now slowed down when they get near other avatars, for easy fine positioning. 2013-05-01 22:03:57 -07:00
ZappoMan
0f71627923 fixed local mode 2013-05-01 21:22:41 -07:00
Philip Rosedale
e2ce927492 Merge remote-tracking branch 'upstream/master' 2013-05-01 20:57:40 -07:00
Philip Rosedale
09a6a476d5 Slow down when near other avatars - incremental commit 2013-05-01 20:55:40 -07:00
Philip Rosedale
f78f983e2d Merge pull request #176 from ZappoMan/render_voxels_optimization 
Render voxels optimization
 2013-05-01 20:52:48 -07:00
Jeffrey Ventrella
1e6ba9cc34 (1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding 2013-05-01 20:35:21 -07:00
ZappoMan
015fd05e62 code cleanup 2013-05-01 18:37:14 -07:00
ZappoMan
62e7c0383b cleaned up some code for distanceToCamera() 2013-05-01 18:31:05 -07:00
Andrzej Kapolka
5b6b28664f Most of the way towards basic Oculus support. 2013-05-01 18:22:45 -07:00
ZappoMan
4f86b5570f first cut at improved render pipeline 2013-05-01 18:21:13 -07:00
Jeffrey Ventrella
4b18a25b7f cleaned up some tabbing issues in main.cpp 2013-05-01 17:11:35 -07:00
Jeffrey Ventrella
f86a92fef0 fixed some small formatting glitches in code and added a way to make head lean affect the position of the head 2013-05-01 16:51:15 -07:00
Jeffrey Ventrella
aeb545656e (1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake; 2013-05-01 15:38:55 -07:00
Jeffrey Ventrella
c88a7f8f55 fixed merge 2013-05-01 13:51:59 -07:00
Jeffrey Ventrella
b388e9a760 (1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm 2013-05-01 13:00:08 -07:00
Philip Rosedale
08e1bfb712 Merge remote-tracking branch 'upstream/master' 2013-05-01 12:46:33 -07:00
Andrzej Kapolka
a412f7b1cb Derp, forgot to move this in my codebase. 2013-05-01 12:41:53 -07:00
Philip Rosedale
17b22cccb4 Merge remote-tracking branch 'upstream/master' 2013-05-01 12:38:54 -07:00
Philip Rosedale
02ef1db0d0 Adding devices for Glass, Android 2013-05-01 12:38:22 -07:00
Andrzej Kapolka
11a750f6a0 Changes according to Philip's feedback: spacing around operators, removed 
unused variables, moved font family names to #defines.
 2013-05-01 12:17:57 -07:00
Andrzej Kapolka
15e46bac82 Disable kerning, expand bounds to account for antialiasing. 2013-05-01 11:59:21 -07:00
Andrzej Kapolka
668e25f9cd Fixed merge issue. 2013-05-01 11:51:19 -07:00
Andrzej Kapolka
5d457afaf9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.h
 2013-05-01 11:46:23 -07:00
Stephen Birarda
0f3d3fb4c7 move private member constants in Avatar.h to implementation 2013-05-01 11:04:58 -07:00
Andrzej Kapolka
13a4058068 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-30 16:06:44 -07:00
Philip Rosedale
24a636486e Added Google glass support, cleaned up gyro code, ready for Oculus! 2013-04-30 16:04:55 -07:00
Philip Rosedale
55330cf14f Merge repairs. 2013-04-30 13:49:42 -07:00
Philip Rosedale
6142372219 Merge remote-tracking branch 'origin/master' 2013-04-30 13:44:49 -07:00
Philip Rosedale
8e06602e9a Added Avatar method to allow received UDP transmitter data to drive the avatar head rotation, cleaned up gyro code. 2013-04-30 13:40:16 -07:00
Andrzej Kapolka
675c0cb74e Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-04-30 12:37:24 -07:00
birarda
8153b2af95 Merge pull request #161 from ZappoMan/view_frustum_work 
First cut at new Voxel Sending strategy
 2013-04-30 11:48:55 -07:00
Andrzej Kapolka
39a70ce9e7 Rather than Xs, use a "solid block" pseudo-character to draw a bar. Tweaked 
the colors to indicate the pressed key again.
 2013-04-30 11:06:23 -07:00
Andrzej Kapolka
ccdc1146a2 Removed cut and paste error from CMake file, made a couple variables in 
TextRenderer more descriptive.
 2013-04-30 10:26:47 -07:00
Andrzej Kapolka
8b742e43e6 GCC fails on these constants (ISO C++ forbids initialization of member 
‘COLLISION_BALL_FORCE’), so I moved them into the CPP (they don't seem to
require external visibility anyway).
 2013-04-30 10:15:48 -07:00
ZappoMan
622a078d24 code review cleanup 2013-04-30 10:10:17 -07:00
Andrzej Kapolka
733ccd4787 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-30 10:04:39 -07:00
Andrzej Kapolka
34f2a28114 Delete our glyph textures on destruction. 2013-04-30 10:04:01 -07:00
Andrzej Kapolka
a24f215f09 Moved menu, chat entry field to ui subdirectory. 2013-04-30 09:59:05 -07:00
Andrzej Kapolka
068d3d216e Need to commit these, too, for the font rendering change. 2013-04-29 19:12:34 -07:00
Andrzej Kapolka
a8c28a6d2a First stab at text rendering by rendering glyphs (using Qt's font rendering) 
into textures, storing the associated metrics, and drawing strings as
sequences of textured quads.
 2013-04-29 18:54:12 -07:00
ZappoMan
429ba8c729 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 17:48:12 -07:00
ZappoMan
accda966d5 Add LOD culling to the server protocol. 
- Add LOD/distance culling to VoxelTree:encodeTreeBitstreamRecursion()
  and VoxelTree::searchForColoredNodesRecursion()
- added new levels to boundaryDistanceForRenderLevel()
- added more spheres to the scene to get a better sense of LOD behavior
 2013-04-29 17:38:52 -07:00
Jeffrey Ventrella
6b66d8e789 Merge remote-tracking branch 'upstream/master' 2013-04-29 14:12:01 -07:00
Jeffrey Ventrella
fe9ab0a213 improved collisions 2013-04-29 14:11:33 -07:00
Andrzej Kapolka
c9c32630e8 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-29 13:22:25 -07:00
Andrzej Kapolka
0fe4d57ad7 I think this is the least intrusive fix for the chat crashes: lock the agent 
list when we're updating from the network, simulating, or rendering.  I think
there are likely to be other synchronization issues, but this is a start.
 2013-04-29 13:17:39 -07:00
Jeffrey Ventrella
9924be9188 Merge remote-tracking branch 'upstream/master' 2013-04-29 10:41:58 -07:00
Jeffrey Ventrella
4e4521325d added 'isCollidable' to avatar bone so that some bones do not collide (for handshaking) 2013-04-29 10:38:29 -07:00
ZappoMan
781721b79c clean up constants for voxels 2013-04-29 06:49:57 -07:00
ZappoMan
7c180c800f printf/pringLog cleanup 2013-04-29 06:28:19 -07:00
ZappoMan
ff996c9946 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 06:18:25 -07:00
Philip Rosedale
3787c93142 Fixes per review 2013-04-28 14:49:08 -07:00
Jeffrey Ventrella
caac600030 improved hand holding algorithm 2013-04-27 22:00:02 -07:00
Philip Rosedale
b9234b0a02 Merge remote-tracking branch 'upstream/master' 2013-04-27 17:19:55 -07:00
Jeffrey Ventrella
37e304fd14 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:45:58 -07:00
Philip Rosedale
5e737ce5d4 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:39:19 -07:00
Philip Rosedale
f6ef117788 Merge pull request #157 from tschw/19165 
19165
 2013-04-27 16:37:46 -07:00
ZappoMan
e373a8b866 removed accidentally added whitespace 2013-04-27 14:59:58 -07:00
ZappoMan
2d518520f5 removed extra AgentList() constructor which got accidentally included in merge mistake 2013-04-27 14:58:38 -07:00
ZappoMan
94bb6a1b0f removed some testing/debug code 2013-04-27 14:57:23 -07:00
ZappoMan
999930743e removed some debug code 2013-04-27 14:55:34 -07:00
ZappoMan
2f2af7ec09 removed some debug code 2013-04-27 14:53:08 -07:00
ZappoMan
e4c39369aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-27 14:49:03 -07:00
ZappoMan
70818bd3fe Added some new debugging code, removed some old debugging code, some small coding standard tweaks 2013-04-27 12:03:20 -07:00
Jeffrey Ventrella
57cbd9c6d9 cleaned up collision code some 2013-04-27 09:47:46 -07:00
Jeffrey Ventrella
5c3bd5fe87 improved collisions between avatars 2013-04-27 09:33:58 -07:00
Jeffrey Ventrella
308b9dcf82 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:44:42 -07:00
Jeffrey Ventrella
adccd62f87 made a different prototype for camera shifting into first-person 2013-04-26 17:43:47 -07:00
Philip Rosedale
16ea53f921 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:40:27 -07:00
Philip Rosedale
ebc5d665c0 Merge pull request #158 from ey6es/master 
Reverted threading change by default, since we're seeing lower frame rates.
 2013-04-26 17:19:11 -07:00
birarda
7ddf33b9c3 Merge pull request #159 from birarda/audio 
tune distance ratio, remove debugging in audio mixer
 2013-04-26 17:14:36 -07:00
Andrzej Kapolka
c26becf6cb Added toggle for nonblocking networking; default to threaded for now, since 
we're seeing lower frame rates.
 2013-04-26 17:10:52 -07:00
Philip Rosedale
99957f31f3 Merge remote-tracking branch 'upstream/master' 2013-04-26 17:09:05 -07:00
Philip Rosedale
69cf6e303d Merge pull request #155 from Ventrella/master 
merge
 2013-04-26 16:54:28 -07:00
Philip Rosedale
996a8794d0 Merge remote-tracking branch 'upstream/master' 2013-04-26 16:37:58 -07:00
tosh
dbfef9d802 Merge branch 'master' of git://github.com/worklist/hifi into 19165 
Conflicts:
	interface/src/Audio.cpp
 2013-04-27 00:53:29 +02:00
Jeffrey Ventrella
2486b6e15c moved inline functions from Camera.h to Camera.cpp as per Stephen's request 2013-04-26 13:33:36 -07:00
Jeffrey Ventrella
59ef9e5d7e removed incomplete code snippet in Avatar.h 2013-04-26 13:21:49 -07:00
Andrzej Kapolka
21f1669388 How'd those tabs get in there? 2013-04-26 13:10:44 -07:00
Andrzej Kapolka
c4776fcd27 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 13:03:09 -07:00
Jeffrey Ventrella
e9592f9360 moved handController 2013-04-26 12:55:13 -07:00
ZappoMan
88039e6dac Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-26 12:17:09 -07:00
Jeffrey Ventrella
10b6c7759d Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 12:16:22 -07:00
Jeffrey Ventrella
dc11055f8e merge with upstream master and resolve conflicts 2013-04-26 12:15:48 -07:00
Philip Rosedale
824abca443 Removed field and Cloud classes 2013-04-26 11:57:04 -07:00
Stephen Birarda
948f9607f6 send head position as source position to mixer 2013-04-26 11:49:52 -07:00
Philip Rosedale
2e518f8dac Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything. 2013-04-26 11:36:44 -07:00
Stephen Birarda
ded5da47ff correct the sign of the absolute head yaw sent to avatar mixer 2013-04-26 11:35:55 -07:00
Andrzej Kapolka
0932a8b382 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 11:31:15 -07:00
Stephen Birarda
7c855464e1 make the absolute head yaw getter const 2013-04-26 11:22:42 -07:00
Stephen Birarda
fbdcd57529 correct yaw sent to audio-mixer in Audio 2013-04-26 11:21:34 -07:00
Andrzej Kapolka
b9fdba2711 Rather than creating a thread to read datagrams, just set the socket to 
nonblocking mode and check it before simulating.  This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
 2013-04-26 11:08:41 -07:00
Stephen Birarda
1884bfc17e some spacing cleanup in Audio class 2013-04-26 10:58:01 -07:00
Jeffrey Ventrella
fe2e180f16 merge with upstream master 2013-04-26 10:56:48 -07:00
Philip Rosedale
e304e0dfb3 Fixing spacing nits in balls class 2013-04-26 10:21:17 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -07:00
Philip Rosedale
61578d1ddb Added balls class 2013-04-26 09:59:50 -07:00
Philip Rosedale
e4c2004a69 Added constant to turn OFF avatar BALLS testing 2013-04-26 09:34:10 -07:00
ZappoMan
91f6aaa96e testing of new searchForColoredNodes() 2013-04-26 09:23:48 -07:00
ZappoMan
17694b3f46 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Fixed conflict in interface/src/main.cpp
 2013-04-25 23:49:08 -07:00
ZappoMan
a176753379 added VoxelNodeBag 2013-04-25 23:47:12 -07:00
Jeffrey Ventrella
ce1ceb849f Added HandControl class and also Avatar Touch class 2013-04-25 23:32:04 -07:00
Philip Rosedale
cac9e33f8c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
 2013-04-25 20:47:01 -07:00
tosh
95f2b4373d adjusts main.cpp (oscilloscope does not render when disabled and does no longer need an external check) 2013-04-26 05:09:00 +02:00
tosh
50eb9a2a54 Merge branch 'master' of git://github.com/worklist/hifi into 19165 2013-04-26 05:07:31 +02:00
Philip Rosedale
1a5f499b45 First commit with initial Balls class for avatar sphere cloud 2013-04-25 19:56:47 -07:00
tosh
41115fc0f1 reimplements oscilloscope and connects output channels 2013-04-26 04:25:58 +02:00
Andrzej Kapolka
c6661e8b8e Lowered the chat message height and put it in a variable. 2013-04-25 17:48:47 -07:00
Andrzej Kapolka
c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	avatar-mixer/src/main.cpp
 2013-04-25 17:40:55 -07:00
Andrzej Kapolka
1713bebb64 Added the basic key press/message composition display. 2013-04-25 17:36:47 -07:00
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
ZappoMan
32da105d62 new testing/debug code for encodeTreeBitstream() 2013-04-25 17:33:43 -07:00
Stephen Birarda
09256d8c4e put back default for AVATAR_BONE_RIGHT_FOREARM 2013-04-25 17:15:48 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
Stephen Birarda
d2714e9321 resolve conflicts on merge with upstream master 2013-04-25 17:04:18 -07:00
Stephen Birarda
e6d278ea12 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 17:01:17 -07:00
Stephen Birarda
3df81cc92a resolve conflicts on merge with upstream master 2013-04-25 16:41:35 -07:00
Stephen Birarda
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Jeffrey Ventrella
7a94310d4e Merge remote-tracking branch 'upstream/master' 2013-04-25 16:32:27 -07:00
Jeffrey Ventrella
86e72a90d4 working on camera view shifting from first person to third person 2013-04-25 16:31:42 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
7e0dab6224 spacing fixes in Avatar class 2013-04-25 16:18:17 -07:00
Stephen Birarda
da6bbacc8e type squish in main.cpp 2013-04-25 16:12:43 -07:00
Stephen Birarda
2bda700753 put iterator statements on one line in main.cpp 2013-04-25 16:12:22 -07:00
Stephen Birarda
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Stephen Birarda
8370fd2d19 spacing fixes in Avatar class 2013-04-25 16:04:08 -07:00
Stephen Birarda
be37237b84 fix indent in Avatar class 2013-04-25 15:58:42 -07:00
Stephen Birarda
114f949a6e spacing cleanup in Avatar class 2013-04-25 15:58:03 -07:00
Stephen Birarda
625a963918 prefer -> notation to (*TYPE) for AgentList iterator 2013-04-25 15:49:25 -07:00
Andrzej Kapolka
d5da35e91a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 15:41:57 -07:00
Andrzej Kapolka
620e1c728c Removed kludge; it turned out lighting was enabled. 2013-04-25 15:41:09 -07:00
Stephen Birarda
dac660efda resolve conflicts after merge with upstream master 2013-04-25 15:30:57 -07:00
Stephen Birarda
5ddd9a9f4f Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 15:27:40 -07:00
Andrzej Kapolka
d041072d40 Delete support (though the one on my numeric keypad doesn't work?), 
sending key states.
 2013-04-25 15:26:05 -07:00
Stephen Birarda
2850d74a84 add typedefs for stl iterator implementation 2013-04-25 14:48:07 -07:00
Jeffrey Ventrella
7a0ed469b8 added methods to camera class to check for when the view frustum needs to be reshaped (but the calls are not yet being made - need to make sure the right place to use it) 2013-04-25 14:25:28 -07:00
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -07:00
Jeffrey Ventrella
5a0a1c1cec increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum. 2013-04-25 13:51:20 -07:00
Stephen Birarda
836d286b75 initial transition from vector to multi-dimensional array in AgentList 2013-04-25 13:11:13 -07:00
Jeffrey Ventrella
9a4d27c0b5 cleaned up some camera code and added some functionality for first-person view 2013-04-25 12:19:23 -07:00
Jeffrey Ventrella
68b3f54f5c tiny change 2013-04-25 10:44:01 -07:00
Philip Rosedale
9e62728c33 Changed velocity to be dvec3 2013-04-25 10:18:30 -07:00
Philip Rosedale
b9fb888073 Small speed/cleanup to thrust setting 2013-04-25 10:02:14 -07:00
Philip Rosedale
ba55175870 Gravity is ON near origin, off in space, and a gravity field can be created with getGravity() 2013-04-25 09:50:35 -07:00
Andrzej Kapolka
10a9f31d65 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 09:41:13 -07:00
ZappoMan
2c48139ff3 some cleanup 2013-04-25 00:02:51 -07:00
ZappoMan
0bec7156aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-24 23:50:57 -07:00
ZappoMan
9bc2f667b6 adding some temporary debugging code 2013-04-24 23:46:47 -07:00
ZappoMan
732b4879e0 added a test routine for testing insertIntoSortedArrays() 2013-04-24 23:20:20 -07:00
Andrzej Kapolka
1a79bbd80d Fleshing out the chat entry widget. 2013-04-24 18:30:46 -07:00
Philip Rosedale
fd329cd1bb Merge remote-tracking branch 'upstream/master' 2013-04-24 17:56:57 -07:00
Jeffrey Ventrella
80576120ee Merge remote-tracking branch 'upstream/master' 2013-04-24 17:54:31 -07:00
Jeffrey Ventrella
72e6e18992 fixed avatar collisions 2013-04-24 17:54:09 -07:00
Philip Rosedale
fe1357aba2 Merge remote-tracking branch 'upstream/master' 2013-04-24 17:45:58 -07:00
Philip Rosedale
2a3d06f6de Fixed warning in starfield code 2013-04-24 17:45:26 -07:00
Andrzej Kapolka
9d4fded901 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-04-24 17:11:37 -07:00
Andrzej Kapolka
f538e2bdbc Added key state to avatar data, started on chat entry field. 2013-04-24 17:06:55 -07:00
birarda
d4e64462dd Merge pull request #141 from PhilipRosedale/master 
Wider log, log screen in menu
 2013-04-24 17:05:12 -07:00
Jeffrey Ventrella
2163976f06 adding the files 2013-04-24 17:01:59 -07:00
Philip Rosedale
0e4da5198d Merge remote-tracking branch 'upstream/master' 2013-04-24 16:59:18 -07:00
Jeffrey Ventrella
ff1334d8b6 Merge remote-tracking branch 'upstream/master' 2013-04-24 16:58:54 -07:00
Philip Rosedale
bc65126004 Wider log window, log panel on by default, menu->tools->log to control. 2013-04-24 16:58:52 -07:00
Jeffrey Ventrella
e54fd0dd7d renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments 2013-04-24 16:54:07 -07:00
Philip Rosedale
6c986a1049 Merge pull request #127 from tschw/19188 
19188
 2013-04-24 16:53:04 -07:00
birarda
b8054790b0 Merge pull request #138 from Ventrella/master 
major changes to hand holding logic (ordering mostly)
 2013-04-24 16:45:33 -07:00
Jeffrey Ventrella
a9ff483d3d fix 2013-04-24 15:35:11 -07:00
Andrzej Kapolka
6c435569c2 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-24 15:31:10 -07:00
Andrzej Kapolka
e02aaa39f7 To fix font rendering on Linux (which uses points), we need to restore the 
default point size attenuation settings.
 2013-04-24 14:59:11 -07:00
Jeffrey Ventrella
e93430d553 fix 2013-04-24 14:56:29 -07:00
Jeffrey Ventrella
bfc4befb9b Merge remote-tracking branch 'upstream/master' 2013-04-24 14:55:25 -07:00
Jeffrey Ventrella
86086ef20c just did a fairly major re-ordering of avatar interaction logic in Head.cpp 2013-04-24 14:52:04 -07:00
Stephen Birarda
9c3ebf9f64 only set hand state for mouse press for me 2013-04-24 14:11:07 -07:00
Philip Rosedale
179bdc9fa2 Merge remote-tracking branch 'upstream/master' 2013-04-24 13:12:40 -07:00
Philip Rosedale
33f95c696b Fixes per code review 2013-04-24 13:12:08 -07:00
Stephen Birarda
cfbe8a719c fix getter for hand state in AvatarData 2013-04-24 12:39:25 -07:00
Philip Rosedale
055e62c165 Merge remote-tracking branch 'upstream/master' 2013-04-24 12:24:09 -07:00
Andrzej Kapolka
63a581dae4 Added normals to voxel geometry, enabling lighting. 2013-04-24 11:47:44 -07:00
Jeffrey Ventrella
4e7f1ee422 more cleanup of hand holding code 2013-04-24 11:39:43 -07:00
Philip Rosedale
78aa4fdf80 Simplified average loudness calculation, mouths and eyebrows of other people now move again! 2013-04-24 11:26:59 -07:00
Jeffrey Ventrella
eca6999c2c added behavior in Eve for alternating between grasping and ungrasping hand (tho unable to test transmission). Also, improved readability of hand grasping logic in Head.cpp 2013-04-24 11:02:23 -07:00
Philip Rosedale
50af1f68bf Merge remote-tracking branch 'upstream/master' 2013-04-24 08:46:27 -07:00
Jeffrey Ventrella
ee9ae3f220 improved avatar hand-holding logic 2013-04-24 08:13:15 -07:00
tosh
225188a6f9 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-24 13:32:30 +02:00
Jeffrey Ventrella
8135a45ccf removed pinky orientation lines in avatar bones 2013-04-23 22:05:02 -07:00
Jeffrey Ventrella
54aac82e9c cleanup 2013-04-23 21:30:53 -07:00
Jeffrey Ventrella
61a17060c3 one more glitch... 2013-04-23 21:17:39 -07:00
Philip Rosedale
d65f577268 Merge remote-tracking branch 'upstream/master' 2013-04-23 21:12:24 -07:00
Jeffrey Ventrella
48da3f726e fixed bug - didn't change bodyPosition in eve or voxel 2013-04-23 21:07:40 -07:00
Philip Rosedale
a440570cb4 Merge remote-tracking branch 'upstream/master' 2013-04-23 21:00:53 -07:00
Jeffrey Ventrella
428cb89895 Merge remote-tracking branch 'upstream/master' 2013-04-23 20:44:50 -07:00
Jeffrey Ventrella
61d7a82fc6 made lots of changes in the logic of how my avatar encounters other avatars and detects hand state 2013-04-23 20:44:12 -07:00
Philip Rosedale
99a4d0f3dc Merge remote-tracking branch 'upstream/master' 2013-04-23 20:11:35 -07:00
Jeffrey Ventrella
eb631e2ef6 renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc. 2013-04-23 14:05:23 -07:00
Jeffrey Ventrella
a73ea8c255 some preparation for adding hand state to avatar interactions 2013-04-23 13:48:34 -07:00
Stephen Birarda
42ba5a51d4 Merge remote-tracking branch 'upstream/master' 2013-04-23 13:38:59 -07:00
Stephen Birarda
7ae320d7e1 intial version of eve that says WALL-E every so often 2013-04-23 13:37:49 -07:00
Philip Rosedale
be7fb7bce5 Merge remote-tracking branch 'upstream/master' 2013-04-23 13:32:15 -07:00
Philip Rosedale
d550b09399 Added 'gyro look' option to have gyro drive your render yaw, added render menu. 2013-04-23 13:31:05 -07:00
Jeffrey Ventrella
e19d4fd5f9 changes from Philip's push - I assume 2013-04-23 12:23:08 -07:00
Jeffrey Ventrella
a1e3149d6a Merge remote-tracking branch 'upstream/master' 2013-04-23 12:20:26 -07:00
Philip Rosedale
90c56e796b One... last.... const.... 2013-04-23 12:07:12 -07:00
Philip Rosedale
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -07:00
Philip Rosedale
7aea9d1e61 Fixed :: prefix for local variables 2013-04-23 11:21:36 -07:00
Philip Rosedale
2ef45e8512 Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data. 2013-04-23 11:15:11 -07:00
Jeffrey Ventrella
8e27a69e92 Merge remote-tracking branch 'upstream/master' 2013-04-23 11:13:24 -07:00
Jeffrey Ventrella
8df6a7e056 added collision code for avatar (not operational yet). and some cleanup. 2013-04-23 11:12:38 -07:00
Philip Rosedale
9760b7d410 First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head. 2013-04-23 09:47:52 -07:00
tosh
723d49d78c Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-23 16:08:47 +02:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Jeffrey Ventrella
1524bd55a8 Merge remote-tracking branch 'upstream/master' 2013-04-22 17:42:07 -07:00
Jeffrey Ventrella
602fd94af2 a few cleanups 2013-04-22 17:41:12 -07:00
birarda
2d8092eaf7 Merge pull request #106 from Ventrella/master 
Improved avatar rendering
 2013-04-22 17:33:42 -07:00
ZappoMan
978a41f6ca Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 17:22:24 -07:00
ZappoMan
4e0a3e3b58 switch to boxInFrustum() instead of pointInFrustum() for more accuracy 2013-04-22 17:21:47 -07:00
Jeffrey Ventrella
9a53832599 Merge remote-tracking branch 'upstream/master' 2013-04-22 16:33:30 -07:00
Jeffrey Ventrella
3dc03f44a1 improved rendering of avatar 2013-04-22 16:32:35 -07:00
Stephen Birarda
fb703171f2 make other heads the same color and same size 2013-04-22 16:30:45 -07:00
birarda
84adea86e3 Merge pull request #103 from birarda/master 
fix rendering of other agent types
 2013-04-22 16:05:32 -07:00
Stephen Birarda
ba4235c175 don't render agents that are not of type avatar 2013-04-22 16:04:46 -07:00
Jeffrey Ventrella
caead24462 Merge remote-tracking branch 'upstream/master' 2013-04-22 15:40:25 -07:00
Jeffrey Ventrella
ca2840f905 Cleaned up some const values in Head.h, implemented avatar gravity and ground collision, improved test sphere collision, added _usingBodySprings test to getHeadPosition, improved camera settings in main.cpp, cleaned up commented-out code in main.cpp 2013-04-22 15:39:31 -07:00
ZappoMan
1b52bb4e20 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	voxel-server/CMakeLists.txt
 2013-04-22 14:48:24 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
Jeffrey Ventrella
1b91a8e653 Merge remote-tracking branch 'upstream/master' 2013-04-22 14:05:29 -07:00
Stephen Birarda
c00b5f5e8d fix missed reference to AGENT_TYPE_INTERFACE 2013-04-22 14:05:16 -07:00
Jeffrey Ventrella
60f0e6581d improved test sphere collision algorithm 2013-04-22 14:04:36 -07:00
ZappoMan
487b74f073 Merge pull request #100 from birarda/eve 
intial revision of eve the NPC
 2013-04-22 13:58:54 -07:00
Jeffrey Ventrella
f8884d420c Merge pull request #99 from Ventrella/master 
fixed remote avatar hand position
 2013-04-22 13:44:02 -07:00
birarda
79a178997d Merge pull request #98 from PhilipRosedale/master 
Added stats to menu bar for both avatars and other servers
 2013-04-22 13:23:09 -07:00
Philip Rosedale
7d52af6fd4 Fixed per stephen 2013-04-22 13:20:12 -07:00
Jeffrey Ventrella
b7d6ce9747 fixed avatar hand position by making avatars simulate all the time,and also fixing logic of _isMine 2013-04-22 13:15:46 -07:00
Philip Rosedale
736eb335a9 Added stats at upper right for servers and avatars separately. 2013-04-22 13:12:17 -07:00
Stephen Birarda
c68ec079eb rename AGENT_TYPE_INTERFACE to AGENT_TYPE_AVATAR, more stubbing for eve 2013-04-22 11:54:24 -07:00
Jeffrey Ventrella
7b60ddf057 Merge remote-tracking branch 'upstream/master' 2013-04-22 10:31:51 -07:00
Jeffrey Ventrella
2e402c3b17 added - and then removed - some orientation-related tests 2013-04-22 10:29:14 -07:00
ZappoMan
358efb472d Clean up AABox to coding standard, made several methods const 
- Cleaned up AABox to be consistent with the coding standard
- converted some methods to const and fixed up callers
 2013-04-21 22:46:13 -07:00
ZappoMan
3dc818d31e Changed false colorization to use point in frustum for now, since that works 2013-04-21 15:22:36 -07:00
ZappoMan
7a632115e4 fixed crash when no avatar mixer is present and display stats is enabled 2013-04-21 12:18:42 -07:00
ZappoMan
34b401d13f changed render_view_frustum() to match coding standard, added menu items, cleanup 
- split render_view_frustum() into two parts: loadViewFrustum() and renderViewFrustum()
- cleaned up debug menu items to match actual false color behaviors
- coding standard cleanup
 2013-04-21 12:01:54 -07:00
ZappoMan
67910a2c29 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-19 20:08:47 -07:00
ZappoMan
8c4536199f added menu items for false color operations 2013-04-19 20:02:14 -07:00
ZappoMan
75a79a09ed fixed LOD bug, added support for false colors 
- fixed LOD bug related to mismatch with getting node position
- changed VoxelSystem to honor new VoxelNode color support for false color
- added some implementations of tree recursion that do things like false
  color the tree for distance, randomly, or resetting to true color, or
  stomping on the local version of the true color to debug packet sending
 2013-04-19 19:58:37 -07:00
Jeffrey Ventrella
08105c3898 I did a major cleanup of the Head class, including putting all the "head"-related members into a single structure. We may consider making a separate class just to handle the head. 2013-04-19 17:09:28 -07:00
Jeffrey Ventrella
06f8990d42 removed avatar structure from Head class (leftover from the start of the prototyping phase) 2013-04-19 14:52:06 -07:00
Jeffrey Ventrella
9a93ab7d7c cleaned up logic for body springs mode and moving hand mode 2013-04-19 14:34:01 -07:00
Jeffrey Ventrella
d962230556 fixed sneaky array-out-of-bounds error in avatar bones and cleaned up some of the code for testing hand shake target positions 2013-04-19 12:44:09 -07:00
Jeffrey Ventrella
623c998439 removed init values in HandMovement structure 2013-04-18 21:31:20 -07:00
Jeffrey Ventrella
9dd423f544 removed updateAvatarHand function 2013-04-18 19:30:27 -07:00
Jeffrey Ventrella
ed5f117b04 Merge remote-tracking branch 'upstream/master' 2013-04-18 19:26:29 -07:00
Jeffrey Ventrella
298bc7eee9 added more robust avatar hand movement algorithm in main.cpp 2013-04-18 19:24:57 -07:00
tosh
bc9279917d Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/src/starfield/renderer/Renderer.h
 2013-04-19 03:09:53 +02:00
tosh
715534154e numerous starfield fixes 2013-04-19 02:46:34 +02:00
Stephen Birarda
daac10511e output avatar mixer stats below the voxel stats 2013-04-18 16:58:08 -07:00
Stephen Birarda
d0e3a96485 Merge remote-tracking branch 'upstream/master' into mixer-stats 2013-04-18 15:33:57 -07:00
Stephen Birarda
44cb57afad put back brad's voxel stats, he loves them too much 2013-04-18 15:33:17 -07:00
Stephen Birarda
588fc67cb9 add SimpleMovingAverage to each Agent, collect bytes received stats 2013-04-18 15:02:26 -07:00
ZappoMan
987553974a Merge pull request #86 from Ventrella/master 
reversed left-right strafe, commented-out updateAvatarHand
 2013-04-18 15:01:48 -07:00
Jeffrey Ventrella
2b5d23de5d Merge remote-tracking branch 'upstream/master' 2013-04-18 14:54:08 -07:00
Philip Rosedale
54cef39f51 Fixed problem with avatars rendering at 2X their location 2013-04-18 14:48:00 -07:00
Stephen Birarda
b9a1faf284 add a new SimpleMovingAverage class, replaces CounterStats 2013-04-18 14:46:39 -07:00
Jeffrey Ventrella
9ce1683c50 reversed strafe left right, and commented-out updateAvatarHand 2013-04-18 14:45:54 -07:00
Jeffrey Ventrella
449e05fd2a Merge remote-tracking branch 'upstream/master' 2013-04-18 14:13:27 -07:00
Jeffrey Ventrella
47ee938530 reversed x value in hand movement 2013-04-18 14:12:45 -07:00
Philip Rosedale
5443d80c6f Removed negation of front vector which was reversing yaw in avatar skeleton. 2013-04-18 14:00:48 -07:00
Philip Rosedale
daac59d64e Merge remote-tracking branch 'upstream/master' 2013-04-18 13:36:43 -07:00
Philip Rosedale
d9099b5f5a removed 2 unneeded debug lines 2013-04-18 13:34:37 -07:00
Jeffrey Ventrella
de6f33efa6 added "_" to all of Philip's old private members and tidied up the formatting in Head.h some 2013-04-18 13:16:36 -07:00
tosh
1e58f6fd40 fixes upside down aspect ratio 2013-04-18 20:02:24 +02:00
ZappoMan
74c5916519 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/main.cpp
 2013-04-18 10:57:41 -07:00
ZappoMan
894715598c fixed a comment 2013-04-18 08:49:07 -07:00
Philip Rosedale
a834c52b40 Quick attpemt to fix logging code 2013-04-18 07:48:57 -07:00
Philip Rosedale
8e19caf21c Merge remote-tracking branch 'upstream/master' 2013-04-18 07:23:06 -07:00
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262 
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
 2013-04-18 12:38:35 +02:00
ZappoMan
f0d891b641 Merge pull request #80 from PhilipRosedale/master 
Stars back on
 2013-04-18 01:38:42 -07:00
ZappoMan
532dc285e7 Changed render_view_frustum() to handle broken camera yaw 
- I discovered that the Camera class has a Yaw that is actually
  180deg off of true yaw. So when the avatar is facing at a yaw
  of 0deg, we were setting the camera to 180. This was causing
  the direction vectors to be rotated from where we expected them
  to be, and as a result the frustum was wrong
- I did not fix the camera and the calls to glRotate() since I
 don't yet understan how these work. BUT. I did fix the frustum
 code to fix up this yaw before calculating the vectors
 2013-04-18 01:16:54 -07:00
Philip Rosedale
a1d51f8db8 Merge remote-tracking branch 'upstream/master' 2013-04-18 00:20:47 -07:00
Philip Rosedale
ad30abdf20 sphere on 2013-04-18 00:20:22 -07:00
Philip Rosedale
1dd2fcf37d Merge pull request #81 from ZappoMan/view_frustum_work 
Updated Orientation class to use Philip's technique.
 2013-04-18 00:18:19 -07:00
ZappoMan
309eb08490 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-17 23:53:47 -07:00
Philip Rosedale
23dc5f435b Merge remote-tracking branch 'upstream/master' 2013-04-17 23:45:36 -07:00
ZappoMan
44e6fcc5e9 remove pitch from camera since it still breaks Orientation 2013-04-17 23:42:39 -07:00
ZappoMan
8b9e252246 Updated Orientation class to use Philip's technique. 
- Changed Orientation class to use Philip's technique for determining vectors
- updated main.cpp to take command line option to run Orientation tests
- tweaked eulerToOrthonormals() to return right vector instead of left vector
 2013-04-17 23:21:12 -07:00
Jeffrey Ventrella
bca2460395 Merge remote-tracking branch 'upstream/master' 2013-04-17 23:20:08 -07:00
Jeffrey Ventrella
bd0eb9f69c renamed Yaw Pitch Roll to _headYaw, _headPitch, _headRoll, in Head class. And also added a "bigSphere avatar collision test", also added a bone radius (for collision detection) 2013-04-17 23:18:36 -07:00
Philip Rosedale
f70429e575 Added a translucent ground plane, and made a few more grid lines. Easier to see when 'standing' on. 2013-04-17 22:47:58 -07:00
Philip Rosedale
bb2cc54c97 Stars turned back on by default - lemme know if anyone sees problems. 2013-04-17 22:23:19 -07:00
Philip Rosedale
b7346474d0 Merge pull request #71 from tschw/19188 
19188
 2013-04-17 22:15:39 -07:00
ZappoMan
e51031c464 Merge pull request #78 from ZappoMan/view_frustum_work 
Added more tests for Orientation
 2013-04-17 21:14:37 -07:00
Philip Rosedale
d200936615 Added eulerToOrthonormals function for Brad in Util.cpp, sample execution at start of main. 2013-04-17 21:10:31 -07:00
Jeffrey Ventrella
46c95ea4af did some code cleanup in Head class and added some _isMine checks to differentiate between my av and others 2013-04-17 18:28:26 -07:00
ZappoMan
a64fca17c5 Added more tests for Orientation 2013-04-17 18:25:12 -07:00
Jeffrey Ventrella
6b8fe0cba1 Merge remote-tracking branch 'upstream/master' 2013-04-17 18:11:38 -07:00
Jeffrey Ventrella
4e12f26467 added _isMine check for my _bodyYaw update 2013-04-17 18:10:32 -07:00
Stephen Birarda
3538e2cf5b fix the number of bytes used for head broadcast 2013-04-17 17:59:59 -07:00
Jeffrey Ventrella
aba20c6afd a few debugging changes 2013-04-17 17:48:08 -07:00
Stephen Birarda
484ab53764 fix the flipped sign for agentHead translate 2013-04-17 17:04:29 -07:00
Jeffrey Ventrella
d7f37e5972 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:04:24 -07:00
Philip Rosedale
db95b0d726 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:00:10 -07:00
birarda
8d4061dd72 Merge pull request #72 from birarda/master 
a better interim solution for bytes per avatar
 2013-04-17 16:58:49 -07:00
Stephen Birarda
e75add411c use a constant number of BYTES_PER_AVATAR as an interim solution 2013-04-17 16:58:16 -07:00
Jeffrey Ventrella
ecb5047e7c removed initializeAvatar() method in Head class (deprecated). and also un-negated the pos in the rendering of other avatars (same fix as Philip just made) 2013-04-17 16:58:04 -07:00
Philip Rosedale
6b03622e29 Fixed bug having other people showing up at negative of their transmitted position. 2013-04-17 16:49:39 -07:00
Jeffrey Ventrella
5aeb307be2 including Philips hand position transmission code 2013-04-17 15:36:40 -07:00
Jeffrey Ventrella
5595bb8cf6 Merge remote-tracking branch 'upstream/master' 2013-04-17 15:34:00 -07:00
Jeffrey Ventrella
0306b63af4 added more cleanup and preparation for switching over to quaternions 2013-04-17 15:32:16 -07:00
tosh
3175ba7d45 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-18 00:18:38 +02:00
Philip Rosedale
952cb2f2ae Added head _isMine variable, added hand position transmission! 2013-04-17 15:14:30 -07:00
tosh
38d229ab67 reiterates starfield: 
o allows UrlReader to cache the downloaded content in a local (updating it
    automatically when the server indicates a newer time stamp)

  o retires the FieldOfView class

  o makes the stars move again

  o fixes bad deletion in UrlReader (delete instead of delete[])

  o allows UrlReader to advertise supported compression algorithms to the server
 2013-04-18 00:13:41 +02:00
Philip Rosedale
5729ecb3f4 Merge remote-tracking branch 'upstream/master' 2013-04-17 14:23:43 -07:00
Stephen Birarda
4b1ce1158f fix number of bytes for avatar processBulkAgentData 2013-04-17 13:15:44 -07:00
Jeffrey Ventrella
a44ff94f85 Merge remote-tracking branch 'upstream/master' 2013-04-17 12:50:41 -07:00
Jeffrey Ventrella
3856a70b7e added "_" to several members in Head class, and cleaned up some code formatting (housecleaning :) 2013-04-17 12:48:47 -07:00
Jeffrey Ventrella
4f0ca2f33e added quaternions to avatar body and bone structure (but not using them yet) 2013-04-17 12:31:03 -07:00
ZappoMan
eca7863cd9 Merge pull request #64 from birarda/master 
fix reference to resources directory via switchToResourcesParentIfRequired
 2013-04-17 12:04:25 -07:00
tosh
ebc6a25574 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-17 20:57:39 +02:00
Stephen Birarda
e9592c45c7 fix reference to resources directory on OS X 2013-04-17 11:56:32 -07:00
tosh
77832dbcb4 makes FieldOfView store the view matrix instead of its inverse 2013-04-17 20:53:24 +02:00
Jeffrey Ventrella
3cee28f0ef added back the av position 2013-04-17 11:23:47 -07:00
tosh
bf5f54c9d0 integrates logging for 'avatars' library, fixes missig return in Log.cpp, adds _lib suffix for log callback namespaces and reverts voxels -> voxLib rename in main 2013-04-17 20:14:29 +02:00
tosh
f899ff9378 adds logging support to voxels library 2013-04-17 20:01:58 +02:00
tosh
c261449937 Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-17 20:01:51 +02:00
tosh
493fafb213 adds optional LogStream for cpp iostream-style logging 2013-04-17 19:48:30 +02:00
tosh
e55863a662 integrates logging for 'shared' library 2013-04-17 19:46:00 +02:00
tosh
349e89aaa6 integrates logging for interface 2013-04-17 19:04:10 +02:00
tosh
e7810179de reduces default character size 2013-04-17 19:03:39 +02:00
Philip Rosedale
2e928166ed Merge remote-tracking branch 'upstream/master' 2013-04-17 10:00:17 -07:00
tosh
81cae86559 brings logging component to stable state 2013-04-17 18:35:10 +02:00
tosh
4fa5760162 Merge branch 'master' of git://github.com/worklist/hifi into 19262 
Conflicts:
	interface/src/Util.cpp
 2013-04-17 18:34:43 +02:00
ZappoMan
184d28e905 Adding testOrientationClass() to run unit tests on the orientation class. 2013-04-17 00:42:49 -07:00
Jeffrey Ventrella
a6f82e1236 moved renderOrientstionDiretions to Utils 2013-04-16 23:39:43 -07:00
Jeffrey Ventrella
bd7c4273c3 tested camera orthonormals 2013-04-16 22:47:04 -07:00
Jeffrey Ventrella
f8d7b84a67 Merge remote-tracking branch 'origin' 2013-04-16 20:36:03 -07:00
Jeffrey Ventrella
1fb8d0b268 consolidated some code in Head.cpp 2013-04-16 20:35:50 -07:00
Philip Rosedale
d046162eaf Merge remote-tracking branch 'upstream/master' 2013-04-16 20:32:32 -07:00
Philip Rosedale
39bb556cd3 Fix to add local variable underscores to head get/add body yaw functions. 2013-04-16 20:29:10 -07:00
ZappoMan
7a239fc7f0 Small tweaks to initial values for offset camera, so people can make sense of it 2013-04-16 20:25:08 -07:00
tosh
9ea3c58087 removes leftover #include 2013-04-17 05:06:28 +02:00
Jeffrey Ventrella
1db06a8399 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-16 18:27:26 -07:00
Jeffrey Ventrella
f766843b7a adjusted the ordering of porcessed in camera update method 2013-04-16 18:27:19 -07:00
Stephen Birarda
d0a83f3c0e correct the number of bytes per agent from avatar mixer 2013-04-16 18:09:27 -07:00
Philip Rosedale
1aac3eb0df Merge remote-tracking branch 'upstream/master' 2013-04-16 17:31:27 -07:00
Jeffrey Ventrella
dcd6aafb77 trying to get around git confusion 2013-04-16 15:54:20 -07:00
Jeffrey Ventrella
fc5d412e53 fixed idealYaw issue 2013-04-16 15:51:22 -07:00
tosh
3be23b3faa integrates logging 2013-04-17 00:48:27 +02:00
ZappoMan
4f5ddb3700 fixed yaw/ideal yaw problem correctly 2013-04-16 15:46:20 -07:00
ZappoMan
edfb1501f1 fixed merge problem with shifted avatar 2013-04-16 15:41:38 -07:00
tosh
ba4f6bc92c Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-17 00:40:37 +02:00
tosh
e811410f77 works around GLUT bugs related to monospace glyphs 2013-04-17 00:39:35 +02:00
tosh
dc4dc887ac silences warning about deprecated conversion of string literal to char* 2013-04-17 00:38:39 +02:00
tosh
cf3e2635c1 brings Log class into stable state 2013-04-17 00:38:21 +02:00
tosh
58b40f7ed2 adds Log class 2013-04-17 00:37:21 +02:00
Jeffrey Ventrella
fcbf44cad9 trying to get around git confusion 2013-04-16 15:11:23 -07:00
Jeffrey Ventrella
0c85f832e6 trying to get around git confusion 2013-04-16 14:56:49 -07:00
birarda
7ef80b37be Merge pull request #55 from ZappoMan/view_frustum_work 
Latest view frustum work
 2013-04-16 14:53:48 -07:00
Stephen Birarda
2f5d5398b2 comment cleanup in Camera.cpp 2013-04-16 14:39:23 -07:00
ZappoMan
0ff88b882b tweaks to default Camera near clip, and camera positions in interface 2013-04-16 14:06:48 -07:00
Jeffrey Ventrella
1bef9544d9 Merge remote-tracking branch 'origin/master' 2013-04-16 13:56:45 -07:00
Jeffrey Ventrella
216cc465e7 Added idealYaw to camera and also switched ordering of gl camera rotation commands 2013-04-16 13:51:14 -07:00
Philip Rosedale
f4f8a4e41b Merge remote-tracking branch 'upstream/master' 2013-04-16 13:26:49 -07:00
Stephen Birarda
f8ab33ccc7 add missing packet header for broadcast head data 2013-04-16 12:48:47 -07:00
Stephen Birarda
8129c2477a fix broken voxel server build, change some char* to unsigned char* 2013-04-16 12:35:49 -07:00
Stephen Birarda
53108b01ef resolve conflicts on merge with upstream master 2013-04-16 12:02:33 -07:00
Stephen Birarda
1dd21a450e Merge remote-tracking branch 'upstream/master' 2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf fix broken builds from last commit, pull new avatar data in VoxelAgentData 2013-04-16 11:59:03 -07:00
Stephen Birarda
5c091a51a6 change signature of parseData to use unsigned char*, include packet header always 2013-04-16 11:51:36 -07:00
stojce
6b59374921 Merge pull request #48 from stojce/19261 
Code Review for Job #19261
 2013-04-16 08:40:01 -07:00
stojce
75c63f53fc use safe version of sprintf 2013-04-16 17:38:34 +02:00
ZappoMan
a3fabaf300 Merge pull request #50 from tschw/19188 
19188
 2013-04-16 08:25:07 -07:00
ZappoMan
1408be00f5 Merge pull request #47 from PhilipRosedale/master 
Cleanup and partial re-enabling of head gyros
 2013-04-16 08:21:27 -07:00
Philip Rosedale
2179932f60 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-16 07:35:03 -07:00
Philip Rosedale
1cdeac0fec Merge pull request #49 from ZappoMan/view_frustum_work 
Latest view frustum work
 2013-04-16 07:24:36 -07:00
tosh
7c2cff824f renames AngleUtils -> AngleUtil for consistency with the rest of the files 2013-04-16 14:07:19 +02:00
tosh
ac55c610be tidies changeset 2013-04-16 14:06:03 +02:00
ZappoMan
246380b41e temp fix to setPitch() problem. Removed some debug printfs. Fixed menu flicker bug. 2013-04-16 00:55:44 -07:00
Philip Rosedale
d00001613f Renamed functions in head, added ability to change body yaw. 2013-04-15 21:06:45 -07:00
Philip Rosedale
5e5a7e0a0c Improved SerialInterface: Added gravity vector get function, closer to coding standards, better rendering of levels. 2013-04-15 20:52:18 -07:00
Philip Rosedale
b3e99513cb Merge branch 'master' of https://github.com/worklist/hifi 2013-04-15 18:37:59 -07:00
Philip Rosedale
cd3e414eda Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros. 2013-04-15 18:37:46 -07:00
Stephen Birarda
288a259ac1 more conflict resolutions for broken build after pull 2013-04-15 18:37:25 -07:00
Stephen Birarda
2b49442039 resolve conflicts on merge with upstream master 2013-04-15 18:34:40 -07:00
Stephen Birarda
c6f8cc50a9 Merge remote-tracking branch 'upstream/master' 2013-04-15 18:34:18 -07:00
ZappoMan
e7fa540796 cleaning up of whacky currentCamera experiment 2013-04-15 18:30:33 -07:00
ZappoMan
faf57d9fa8 a little hackery when in view frustum mode so we can see the frustum without OpenGL clipping us 2013-04-15 18:11:23 -07:00
ZappoMan
47a4211257 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/main.cpp
 2013-04-15 18:05:35 -07:00
Stephen Birarda
a5a93443c6 re-work AvatarData to handle body position and rotation 2013-04-15 18:05:22 -07:00
Jeffrey Ventrella
1e388347dc yargh 2013-04-15 18:03:34 -07:00
ZappoMan
2625ef014c latest View Frustum work 2013-04-15 17:57:48 -07:00
ZappoMan
c2c36e6cea Tweaks to Camera class 
- added lens attributes
- coding standard cleanup
 2013-04-15 17:56:52 -07:00
stojce
8da449041c small code formating fix 2013-04-16 02:26:11 +02:00
stojce
39df647dcb #19261 - Add startup time to the main window title, fit to screen 2013-04-16 02:24:38 +02:00
Jeffrey Ventrella
fc8c0498cf adjusted avatar height and camera up to compensate - improves navigation 2013-04-15 16:16:05 -07:00
Stephen Birarda
a4011934c6 move Orientation class to avatars library, constants to SharedUtil 2013-04-15 15:39:23 -07:00
Jeffrey Ventrella
99c2480642 small tweaks to get ready for bigger tweaks in avatar bone logic 2013-04-15 15:29:49 -07:00
Jeffrey Ventrella
427253b8b0 cleaned up formatting in Head 2013-04-15 15:05:30 -07:00
Jeffrey Ventrella
e97383be2e updated many aspects of the avatar hand motion as determined by mouse motion and mouse click 2013-04-15 14:58:32 -07:00
Jeffrey Ventrella
574ab04e09 Merge remote-tracking branch 'origin/master' 2013-04-15 12:06:48 -07:00
ZappoMan
bd837862de fixed lighting when in frustum render mode 2013-04-13 16:16:10 -07:00
ZappoMan
e6a1fb416d improved the menu states names for frustum rendering modes 2013-04-13 15:58:10 -07:00
ZappoMan
e429dfe61f fixed bug in rendering menu rows where state was longer than 5 characters 2013-04-13 15:57:30 -07:00
ZappoMan
37322fcb73 Many menu improvements, and some render_view_frustum() improvements 
- Added menu items for Quit, Voxels, Stars, Frustum features, etc.
- Added FrustomDrawMode enhancements to render_view_frustum()
 2013-04-13 15:20:21 -07:00
ZappoMan
e921d06877 Added new feature to MenuRow to allow custom callback for State 
Note: there's some bug in the menu render code that doesn't like state strings
that are longer than 4 characters + NULL. So, the current code will clip any
state string that is longer than 4 characters. We need to look into this 5
character limit. It's a bug.
 2013-04-13 15:18:19 -07:00
ZappoMan
093f489520 make menu columns render properly for menu items wider than 100 pixels 2013-04-13 13:07:02 -07:00
Philip Rosedale
98c8228161 had to take out call to myAvatar.getBonePosition - unclear why it now isn't working. 2013-04-12 21:11:03 -07:00
Philip Rosedale
d5d746ff9e Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 21:01:15 -07:00
Philip Rosedale
1d69acef56 Removed hand class files, relocated transmitter receiver function to Head.h 2013-04-12 21:01:01 -07:00
Jeffrey Ventrella
ca05823010 added some smoothness to the camera 2013-04-12 18:06:11 -07:00
ZappoMan
7c7c931e83 fixed build buster after merge 2013-04-12 17:10:04 -07:00
ZappoMan
98904d84ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/Head.cpp
 2013-04-12 17:02:11 -07:00
ZappoMan
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -07:00
Jeffrey Ventrella
6ddebd523c cleaned up Orientation calls to right, up, front 2013-04-12 16:52:31 -07:00
ZappoMan
5504d87212 Merge and Cleanup 
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
 2013-04-12 16:32:46 -07:00
Philip Rosedale
5368cbf79a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 16:15:01 -07:00
Philip Rosedale
6d7f343be8 draw a test sphere around my hand in orldspace 2013-04-12 16:13:40 -07:00
Jeffrey Ventrella
84ca2dcb32 added get avatar bone 2013-04-12 16:12:31 -07:00
Philip Rosedale
524ed7deb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:35:02 -07:00
ZappoMan
25f1f1ae3f include glmUtils.h so that we get vec3 opertator* 2013-04-12 15:08:57 -07:00
ZappoMan
77996fb140 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:06:41 -07:00
ZappoMan
d568cce0cd changed interface to use ViewFrustum class for rendering view frustum 
- updated ViewFrustum class to work correctly
- added new keyboard interface to adjust offset camera position and up
- removed keyboard interface for local add sphere, since we don't need that anymore
 2013-04-12 15:01:48 -07:00
Jeffrey Ventrella
15c9053fac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:01:38 -07:00
Jeffrey Ventrella
265fcc6095 a few small fixes on the avatar springs 2013-04-12 15:00:48 -07:00
ZappoMan
d01d1164ca latest view frustum work 2013-04-12 13:36:44 -07:00
ZappoMan
76d22f1b2b more angle tweaks 2013-04-12 11:34:10 -07:00
ZappoMan
7f1ba5c733 playing around with fov angle 2013-04-12 11:26:32 -07:00
Philip Rosedale
dcacad3755 Removed unneeded GLenable cruft 2013-04-12 10:02:41 -07:00
ZappoMan
85bef98f4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 18:42:12 -07:00
birarda
e638805bd7 Merge pull request #30 from PhilipRosedale/master 
Added startup timer
 2013-04-11 17:54:45 -07:00
Philip Rosedale
76e2ca301e Fixes stephen asked for - remove finger stuff 2013-04-11 17:53:57 -07:00
Philip Rosedale
27c032270c Resolved merge 2013-04-11 17:49:43 -07:00
Philip Rosedale
47dfb08ff2 Merge remote-tracking branch 'origin/startupTimer' 2013-04-11 17:46:20 -07:00
birarda
9ea6457c0c Merge pull request #28 from PhilipRosedale/master 
Trivial change for Stephen to teach me
 2013-04-11 17:41:19 -07:00
Jeffrey Ventrella
948ca6279c improved avatar handshake forces 2013-04-11 17:39:18 -07:00
Philip Rosedale
f1bf7d0eb5 trivial test, removed one unneeded variable 2013-04-11 17:35:32 -07:00
Jeffrey Ventrella
766fad8c2a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-11 16:51:27 -07:00
Jeffrey Ventrella
1dc390bf3a working on avatar local ori motions 2013-04-11 16:51:08 -07:00
Stephen Birarda
7c3f5264b5 resolve conflicts on merge with upstream master 2013-04-11 16:48:40 -07:00
Stephen Birarda
a1d209dd70 manage one AgentList per process via singleton 2013-04-11 15:45:04 -07:00