Jeffrey Ventrella
570d2e104a
test
2013-05-20 11:53:42 -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
85bca558f5
Tabs -> spaces, spacing fix.
2013-05-20 09:38:01 -07:00
Andrzej Kapolka
0c03f66948
Fixed the frustum computation, fixed a bug in Plane.
2013-05-19 22:32:55 -07:00
ZappoMan
06242a82c4
fixed Philip's no animation problem
2013-05-19 20:53:46 -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
b3085debb8
further adjusts naming
2013-05-19 13:22:37 +02:00
tosh
fc2de0685b
adjusts naming and formatting of class definition
2013-05-19 12:48:17 +02:00
tosh
864d4e6734
Merge branch '19188' of git://github.com/tschw/hifi
2013-05-18 11:02:52 +02:00
birarda
1b29c6a6d3
Merge pull request #347 from birarda/voxel-noise
...
new audio injector setup fixes
2013-05-17 15:43:32 -07:00
Stephen Birarda
00998ba75e
some fixes for new audio injector setup
2013-05-17 15:42:37 -07:00
birarda
efec33c6a2
Merge pull request #344 from birarda/voxel-noise
...
include time for srand on UNIX
2013-05-17 15:09:30 -07:00
Stephen Birarda
82c373242f
include time for srand on UNIX
2013-05-17 15:09:11 -07:00
birarda
67bab7e73d
Merge pull request #342 from birarda/voxel-noise
...
use stream identifier to match injected audio across packets
2013-05-17 15:07:29 -07:00
Stephen Birarda
85c0c1fa98
fix the mod so we get values up to 255
2013-05-17 15:07:12 -07:00
Stephen Birarda
d72b931ebe
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
2013-05-17 14:57:10 -07:00
Philip Rosedale
bb86d7a141
Merge pull request #341 from ZappoMan/voxel_animation
...
fixed memory leak
2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5
fixed memory leak
2013-05-17 14:35:50 -07:00
Stephen Birarda
b7b39c2a6e
have addOrUpdateAgent return a pointer to the agent instead of a bool
2013-05-17 14:03:15 -07:00
Philip Rosedale
a08745a9e8
Merge pull request #340 from ZappoMan/voxel_animation
...
New Animation Server
2013-05-17 13:57:11 -07:00
ZappoMan
316da59da3
first cut at animation server
2013-05-17 12:44:39 -07:00
Stephen Birarda
fcfe5c9e25
disallow copying for AudioRingBuffer objects
2013-05-17 12:27:05 -07:00
Stephen Birarda
fb2f36519d
inline getters and setters in AvatarData
2013-05-17 12:19:19 -07:00
Stephen Birarda
199853711f
disallow copying of AvatarData objects
2013-05-17 12:15:10 -07:00
Stephen Birarda
12bf23e4c8
disallow Agent copying
2013-05-17 12:14:44 -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
1c126e2525
resolved conflicts
2013-05-16 17:32:54 -07:00
Philip Rosedale
9011484590
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-16 17:06:40 -06:00
Philip Rosedale
9f57787ece
Fixed jerking on gravity, added mouse pitch, yaw behavior.
2013-05-16 17:05:45 -06:00
Stephen Birarda
442d658835
switch from 255 to 0xFF for max volume constant
2013-05-16 14:10:48 -07:00
Stephen Birarda
a37b451993
add constants for volume byte values
2013-05-16 14:09:50 -07:00
Stephen Birarda
f6cc40362c
hook the injector up to the change AudioInjector setup
2013-05-16 13:10:48 -07:00
Stephen Birarda
a2f8d8ae25
break audio out of shared into its own library
2013-05-16 13:00:40 -07:00
Stephen Birarda
5514966d9c
add an AudioInjectionManager to handle multiple injections, link eve to it
2013-05-16 12:40:23 -07:00
Jeffrey Ventrella
be7be4ad99
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-16 11:18:32 -07:00
Stephen Birarda
9b72762eb8
fix missing bytes on read for audio injector
2013-05-15 16:31:43 -07:00
Stephen Birarda
af934e2104
type squishes in UDPSocket implementation
2013-05-15 16:19:45 -07:00
Stephen Birarda
13c10c95e8
type squishes in UDPSocket header
2013-05-15 16:17:38 -07:00
Stephen Birarda
fc5e42cf8b
add threaded injection of audio via audio injector class
2013-05-15 16:10:59 -07:00
Stephen Birarda
47766d6c6b
add methods to AudioInjector to prepare for procedural injection
2013-05-15 15:20:11 -07:00
Stephen Birarda
db0c1bdba1
another type squish in Agent header
2013-05-15 14:28:43 -07:00
Stephen Birarda
9b8fd55bb7
type squishes in Agent header
2013-05-15 14:28:20 -07:00
Stephen Birarda
80284470ed
type squishes in Agent class
2013-05-15 14:20:15 -07:00
Stephen Birarda
12b4b485f0
refactor the Agent copy constructor
2013-05-15 14:19:14 -07:00
Stephen Birarda
f333aaf809
refactor Agent constructor to call member variable constructors
2013-05-15 14:16:15 -07:00
Stephen Birarda
48b57c92bd
refactor Agent member variables
2013-05-15 14:12:21 -07:00
Stephen Birarda
2c242a7704
add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor
2013-05-15 14:02:09 -07:00
Stephen Birarda
e4a734fc78
refactor constructor in AudioInjector
2013-05-15 12:01:32 -07:00
Stephen Birarda
e83710e45e
prepend audio packets from the mixer with a packet header
2013-05-15 12:00:04 -07:00
Stephen Birarda
ce34a8f3e0
add packet headers and agent types for audio clarity
2013-05-15 11:43:49 -07:00
Stephen Birarda
4693082db0
refactor Audio to remove requirement of AudioData
2013-05-15 10:54:36 -07:00
tosh
168bd24342
comments out logging, after testing all is fine
2013-05-15 16:16:53 +02:00
tosh
6a47db91da
tidies up UrlReader component
2013-05-15 15:29:02 +02: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
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
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
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
ZappoMan
a1902e3dc9
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-14 12:14:53 -07:00
ZappoMan
4e92f5d3d8
tweaks to delta sending
2013-05-14 12:11:32 -07:00
ZappoMan
2c1518144a
added setAtBit() utility
2013-05-14 11:09:53 -07:00
ZappoMan
d59a8143d7
added wantDelta, made want bools a bit mask
2013-05-14 11:08:59 -07:00
ZappoMan
fa37b88fa8
first cut at delta view frustum encoding
2013-05-14 09:02:01 -07:00
ZappoMan
f63407aea5
added printDebugDetails()
2013-05-14 08:57:49 -07:00
Philip Rosedale
ba0263a436
Fixed uninitialized audio loudness value
2013-05-13 19:26:46 -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
ZappoMan
dd4303800d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-13 13:15:02 -07:00
ZappoMan
777dd6dc53
Added PointerStack class, and implemented support for monochrome in VoxelTree
2013-05-13 09:57:36 -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
f4565b329a
lengthOfVoxelData already includes the length of the color data.
2013-05-11 15:37:06 -07:00
Andrzej Kapolka
750843e867
More editing progress. Now there are threading issues. Joy!
2013-05-10 21:02:08 -07:00
ZappoMan
930353e658
optimized distanceToCamera() added distanceToPoint() and distanceSquaredToPoint()
2013-05-10 18:13:08 -07:00
Andrzej Kapolka
f0573e6ee5
When we add (or recolor) a voxel, make sure it has no children. When we
...
attempt to remove a voxel that would be a child of a larger solid one, carve
up the parent.
2013-05-10 17:31:55 -07:00
ZappoMan
ef20b3e4b3
optimized performance of VoxelNode::isLeaf()
2013-05-10 14:32:44 -07:00
Andrzej Kapolka
501aac39da
Use isColored, not getShouldRender.
2013-05-10 10:46:04 -07:00
Andrzej Kapolka
e6e5b20dee
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 10:20:04 -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
Philip Rosedale
527b65f6a4
Log cleanup. removed star field meridians.
2013-05-09 22:06:32 -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
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -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
ZappoMan
c73d4ddfa4
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:06:42 -07:00
Stephen Birarda
23f861f5e2
fixes per code review comments
2013-05-09 13:30:11 -07:00
Stephen Birarda
cd69297af2
some refactoring for member variables in AudioRingBuffer
2013-05-09 13:04:42 -07:00
Stephen Birarda
a8eb9187f1
underscore the sample length variables in AudioRingBuffer
2013-05-09 12:48:20 -07:00
ZappoMan
8ef78fde83
Merge pull request #259 from birarda/mixer-crash
...
fix the audio-mixer crash for uninitialized _shouldLoopbackForAgent variable
2013-05-09 11:49:42 -07:00
Stephen Birarda
a92571bdee
initialize the _shouldLoopbackForAgent variable
2013-05-09 11:45:59 -07:00
Stephen Birarda
d9a5bba1d1
remove the unhelpful stack trace setup, using gdb on server for now
2013-05-09 11:21:16 -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
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
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
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
5f55d511c5
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:01:50 -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
66e416d4dd
added VoxelNode::inFrustum() which returns OUTSIDE, INTERSECT, INSIDE to allow more optimal frustum analysis
2013-05-08 14:23:36 -07:00
ZappoMan
24501e5c68
added contains() and remove() methods
2013-05-08 14:22:03 -07:00
Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -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
ZappoMan
ed9a7ae900
Merge pull request #247 from ZappoMan/render_voxels_optimization
...
Use different voxel persist files for local or server mode
2013-05-08 12:22:03 -07:00
ZappoMan
2f3a7f8ea8
use different voxel persist files for local or server mode
2013-05-08 12:19:27 -07:00
Andrzej Kapolka
4ed7176ff6
Move the sun back up again to match the lighting.
2013-05-08 12:07:21 -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
Philip Rosedale
9dd2f2e589
Merge pull request #242 from ZappoMan/render_voxels_optimization
...
Fixed some bugs, and made better scenes
2013-05-08 10:34:54 -07:00
Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
ZappoMan
e508c9fedc
removed a redundant comment
2013-05-08 10:04:06 -07:00
ZappoMan
9a9656708c
CR cleanup
2013-05-08 10:03:05 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -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
bc55c09ed7
Added more SceneUtils support cleaned up voxel-edit to use scene utils
...
- Added addCornersAndAxisLines() scene
- Added addSurfaceScene() scene
- moved improved addSphereScene() from voxel-edit to SceneUtils.cpp
- added command line options to voxel-edit to create different scenes
2013-05-08 02:15:39 -07:00
ZappoMan
cdf72711b5
cleaned up compiler warning
2013-05-08 02:15:10 -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
b459cbc8ea
Fixed a couple bugs in pointToVoxel()
...
- fixed a byte packing bug related to having exactly 7 bits of octal data
where we weren't correctly packing the last bit and moving the byte count
forward. This resulted in bogus colors being written
- fixed a bug for points that exactly match an octet boundary test creating
voxels that are one a unit smaller than they should be
2013-05-08 01:16:07 -07:00
ZappoMan
6f05403c0d
added SceneUtils.h/.cpp which moves addSphereScene() to a common location
2013-05-08 01:06:10 -07:00
ZappoMan
7d6b28dd4d
Tweaks to createSphere() plus some new helper functions
...
- changed createSphere() to support new NATURAL mode which uses perlin
noise to create natural color and shape
- added getVoxelCount()
- coding standard cleanup
2013-05-08 01:02:55 -07:00
ZappoMan
146334e4d7
dead code cleanup
2013-05-08 00:49:37 -07:00
ZappoMan
2cee643e7c
update TREE_SCALE to 128 so it's power of 2, and MAX_VOXELS_PER_SYSTEM to 500k
2013-05-08 00:47:42 -07:00
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb
cleaned up some spacing issues in Orientarion class
2013-05-07 18:32:56 -07:00
Andrzej Kapolka
44f596653e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:50:27 -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
9658c40dd6
change lastAgentId member variable to _lastAgentID
2013-05-07 17:17:47 -07:00
Andrzej Kapolka
a1c3e8515d
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:11:55 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -07:00
Andrzej Kapolka
b245e16623
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:10:55 -07:00
Andrzej Kapolka
7c9b0d8f58
Have the voxel server push out an environment packet with its regular updates.
2013-05-07 15:10:02 -07:00
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -07:00
Stephen Birarda
e8fbfcab05
fix unpacking of other avatars in avatar mixer bulk packet
2013-05-07 14:57:24 -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
82cff262b1
for agent loopback perform no distance and angle calculations
2013-05-07 14:28:48 -07:00
Stephen Birarda
00c11d82b2
if the agent stops asking for loopback make sure the flag is set false
2013-05-07 13:50:01 -07:00
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -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
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Stephen Birarda
722205682e
expect domain server to append one's own ID to end of packet
2013-05-07 12:05:13 -07:00
Stephen Birarda
43a3775633
add _ownerID member variable to AgentList
2013-05-07 12:05:06 -07:00
Philip Rosedale
3afb1dc7a8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 08:40:43 -07:00
ZappoMan
d11e490b62
cleaned up code in createSphere()
2013-05-06 21:07:42 -07:00
ZappoMan
94473d6b95
made TREE_SCALE 100
2013-05-06 21:07:10 -07:00
Philip Rosedale
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Philip Rosedale
69cac10cee
null change
2013-05-06 18:21:33 -07:00
Philip Rosedale
ef68ef9c5d
Merge pull request #217 from birarda/off-axis
...
add off-axis attenuation to audio
2013-05-06 18:18:23 -07:00
Stephen Birarda
81fade33dc
refactoring in audio mixer in preparation for off axis attenuation
2013-05-06 17:07:57 -07:00
ZappoMan
bccad01e0e
fixed CR issue
2013-05-06 16:47:31 -07:00
ZappoMan
342e3e0407
fixed CR issue
2013-05-06 16:43:25 -07:00
ZappoMan
c2588e0120
fixed CR issue
2013-05-06 16:42:12 -07:00
ZappoMan
cfbcc4418f
some cleanup pre CR
2013-05-06 16:34:34 -07:00
ZappoMan
37b165c8e9
some cleanup pre CR
2013-05-06 16:30:34 -07:00
ZappoMan
f5808f43b5
some cleanup pre CR
2013-05-06 16:24:09 -07:00
ZappoMan
9fb57feb3b
some cleanup pre CR
2013-05-06 16:21:58 -07:00
ZappoMan
239aa1ed49
some cleanup pre CR
2013-05-06 16:18:30 -07:00
ZappoMan
dc481002ec
fixed Xcode compiler warnings
2013-05-06 16:00:43 -07:00
ZappoMan
35c840fefa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 15:57:44 -07:00
ZappoMan
89226b18a5
switched getAABox() interface
2013-05-06 15:50:42 -07:00
ZappoMan
96561e97d8
added VIEW_CULLING_RATE_IN_MILLISECONDS
2013-05-06 15:49:54 -07:00
ZappoMan
c975699cea
added debug to ViewFrustum::matches()
2013-05-06 15:48:05 -07:00
Stephen Birarda
90a8027f69
include cstdlib for call to exit
2013-05-06 15:36:48 -07:00
Stephen Birarda
c742c292b6
have the audio mixer output a stacktrace when it crashes
2013-05-06 15:29:21 -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
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
Stephen Birarda
499899c6e0
if there are no active agents in list begin() iterator should be end()
2013-05-06 13:11:40 -07:00
Stephen Birarda
beca9cac8d
update timestamp variables in Agent, use new packet headers for DS
2013-05-06 12:40:52 -07:00
ZappoMan
e0d040a73b
added removeChildAtIndex() which removes a node, but doesn't delete it
2013-05-06 11:02:28 -07:00
ZappoMan
17b137cc53
changed VoxelNodeBag to just compare pointers, since we don't really care about ordering the bag
2013-05-06 11:01:29 -07:00
ZappoMan
16b93f8c92
added PerformanceWarning class
2013-05-06 11:00:01 -07:00
ZappoMan
17e26b2d42
add matches()
2013-05-06 10:59:09 -07:00
Andrzej Kapolka
4d33c462fe
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/voxels/src/VoxelTree.h
2013-05-06 09:45:57 -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
34982227e4
removed color reaveraging from readNodeData() because server will already send averages
2013-05-04 21:58:16 -07:00
ZappoMan
6a32424fb2
make readFromFileV2() return bool for file exists
2013-05-04 09:41:10 -07:00
ZappoMan
c1847a7511
set dirty bit on tree in a couple new places
2013-05-04 09:19:46 -07:00
ZappoMan
3ed19ccb91
fixed comment
2013-05-04 08:28:00 -07:00
Andrzej Kapolka
aff465b17b
Missed a spot with the conversion from pointers to references.
2013-05-04 07:59:45 -07:00
Andrzej Kapolka
34565a4956
Pointers to references for in/out parameters, renamed line parameter to more
...
descriptive "distance."
2013-05-04 07:56:30 -07:00
ZappoMan
5253485261
added TREE_SCALE to default camera farClip
2013-05-04 07:46:42 -07:00
Andrzej Kapolka
ff4e21e504
Remaining pick bits.
2013-05-03 20:12:46 -07:00
ZappoMan
2c128fd813
added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown
2013-05-03 19:19:48 -07:00
Andrzej Kapolka
f8cbe34e07
Added basic ray intersection testing to VoxelTree.
2013-05-03 17:27:57 -07:00
ZappoMan
e3164b3976
added read/write voxel files
2013-05-03 17:09:43 -07:00
ZappoMan
f4099349e8
change to encodeTreeBitstreamRecursion() to allow calling without viewFrustum
2013-05-03 15:13:00 -07:00
ZappoMan
1366794bdc
added some tree methods for primitive voxel editing
2013-05-03 15:00:03 -07:00
ZappoMan
e9d556419f
got rid of some dead code
2013-05-03 14:39:00 -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
ZappoMan
34a059db9a
more optimizations of render pipeline
2013-05-02 22:26:56 -07:00
ZappoMan
771c604121
more render pipeline optimizations
2013-05-02 18:12:55 -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
ZappoMan
174c3ee65b
search into level appropriately
2013-05-02 11:31:20 -07:00
ZappoMan
6a7ebb3a55
fixed LOD issue in client
2013-05-01 22:57:19 -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
ZappoMan
cfcfacfbdb
cleanup
2013-05-01 18:25:42 -07:00
ZappoMan
4f86b5570f
first cut at improved render pipeline
2013-05-01 18:21:13 -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
Stephen Birarda
cee73e4622
don't replay last buffer for silent agent
2013-05-01 10:57:59 -07:00
ZappoMan
47326230a1
fixed build buster
2013-04-30 11:57:06 -07:00
ZappoMan
f8523e135d
cr cleanup
2013-04-30 11:44:59 -07:00
ZappoMan
2a746ec111
cr cleanup
2013-04-30 11:34:14 -07:00
ZappoMan
7fddd63a61
cr cleanup
2013-04-30 11:29:13 -07:00
ZappoMan
91ca787e2f
removed MarkerNode
2013-04-30 11:14:36 -07:00
ZappoMan
dae3881821
removed MarkerNode
2013-04-30 11:13:41 -07:00
ZappoMan
447de68fb5
cr cleanup, remove loadBitstreamBuffer()
2013-04-30 11:06:30 -07:00
ZappoMan
7d801e99d1
cr cleanup
2013-04-30 10:55:04 -07:00
ZappoMan
2ec2824e8f
cr cleanup
2013-04-30 10:46:48 -07:00
ZappoMan
a6b486aa89
cr cleanup
2013-04-30 10:39:45 -07:00
ZappoMan
59ce921645
cr cleanup
2013-04-30 10:38:30 -07:00
ZappoMan
778d3715ce
cr cleanup
2013-04-30 10:37:02 -07:00
ZappoMan
4cea0ffa10
cr cleanup
2013-04-30 10:33:13 -07:00
ZappoMan
5a90dc4487
cr cleanup
2013-04-30 10:32:55 -07:00
ZappoMan
0fd3f00054
cr cleanup
2013-04-30 10:28:34 -07:00
ZappoMan
218dd3d62b
cr cleanup
2013-04-30 10:27:38 -07:00
ZappoMan
37b139621a
cr cleanup
2013-04-30 10:27:32 -07:00
ZappoMan
6d378281a8
cr cleaup - third times a charm?
2013-04-30 10:24:13 -07:00
ZappoMan
3673ee36ad
cr cleanup and optimization of isLeaf()
2013-04-30 10:23:35 -07:00
ZappoMan
bf3b014743
code review cleanup
2013-04-30 10:16:04 -07:00
ZappoMan
8a5633a0db
got rid of compareOctalCodesDepth() and cleaned up compareOctalCodes()
2013-04-30 10:09:15 -07:00
ZappoMan
ee814d7ddc
better version of boundaryDistanceForRenderLevel()
2013-04-29 19:18:38 -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
823e23d50a
add VoxelConstants.h
2013-04-29 17:46:02 -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
ZappoMan
ea219cdd16
Merge pull request #163 from birarda/no-avatars
...
remove half-baked ping reply setup from avatar mixer
2013-04-29 14:53:24 -07:00
ZappoMan
a638542aa0
added support for LOD scanned sendding order of voxel scene
2013-04-29 14:34:17 -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
Stephen Birarda
7b8d377eb4
simplify the avatar mixer communication while publicly accessible
2013-04-29 12:47:03 -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
2f9c3da914
removed some dead code
2013-04-27 15:22:50 -07:00
ZappoMan
628b74b8e1
removed some dead code
2013-04-27 15:21:40 -07:00
ZappoMan
7fda49a5e1
removed some dead code
2013-04-27 15:17:59 -07:00
ZappoMan
7155557127
removed some dead code
2013-04-27 15:13:24 -07:00
ZappoMan
c364ec0dc7
removed mutex locking from VoxelTree for now
2013-04-27 15:09:32 -07:00
