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
