ZappoMan
4f1131fc97
add markWithChangedTime() method as public method
...
Conflicts:
libraries/voxels/src/VoxelNode.cpp
libraries/voxels/src/VoxelNode.h
2013-06-05 16:05:32 -07:00
ZappoMan
873ae85d4e
changed deleteVoxelCodeFromTree() to use recursion to allow for proper unwinding, updating of parent path
2013-06-05 16:01:37 -07:00
ZappoMan
726a0cecf2
fixed build issue
2013-06-04 17:40:34 -07:00
ZappoMan
4f2af717f2
Fixed merge issue with new orientation vectors, migrated to common identity names
2013-06-04 17:27:40 -07:00
ZappoMan
6e70f3b187
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 16:21:20 -07:00
ZappoMan
a12353e112
hopefully fix unix build buster
2013-06-04 11:38:47 -07:00
Andrzej Kapolka
d09700adde
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
2013-06-04 11:00:59 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
ZappoMan
37cc436b2b
CR feedback
2013-06-04 01:08:18 -07:00
ZappoMan
1f3de3e12b
CR feedback
2013-06-04 01:03:26 -07:00
ZappoMan
ceb15d407d
removed assert
2013-06-03 22:08:19 -07:00
ZappoMan
eef0636655
some cleanup
2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
03f79f5cab
fixed delete voxel
2013-06-03 21:04:42 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
ZappoMan
ea965f2290
fixed issue with sendVoxelsOperataion, some other cleanup
2013-06-03 13:46:21 -07:00
ZappoMan
78fe89172a
eyedropper mode, and import work
2013-06-03 12:23:16 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff
Slight fix to capsule/box penetration test: we should use the smaller distance
...
to the diagonal, not the first one we find.
2013-06-03 10:08:42 -07:00
ZappoMan
e5e200345b
more work on copy and paste
2013-05-31 11:52:18 -07:00
Andrzej Kapolka
98759c3ba1
Include <unistd.h> to address a build error experienced by Clement.
2013-05-31 10:27:25 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Andrzej Kapolka
3f6cf08b97
Removed remaining Orientation bits (and class itself), enforce limits on
...
head yaw/pitch/roll.
2013-05-30 15:15:12 -07:00
Andrzej Kapolka
100d10dc9e
Offset camera fix, cleaner frustum transformation.
2013-05-30 11:08:33 -07:00
Andrzej Kapolka
021dce72be
Moved direction vectors to AvatarData, made them align with OpenGL view space
...
(to avoid the 180 degree rotations).
2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235
Merge branch 'master' of https://github.com/worklist/hifi into reorient
...
Conflicts:
interface/src/Avatar.cpp
2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430
Massive changes to orientations: use quaternions rather than Orientation
...
class.
2013-05-29 19:05:33 -07:00
Stephen Birarda
1f4e9f3051
update last heard from time for audio injectors
2013-05-29 18:37:03 -07:00
Stephen Birarda
c259b025db
fix a crash in audio injector when there is no audio mixer
2013-05-29 15:05:39 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936
latest copy and paste
2013-05-29 12:06:58 -07:00
Stephen Birarda
56e0e3882d
kill agents who send NaN bearings
2013-05-29 11:29:38 -07:00
Stephen Birarda
1fb61faded
fix the isnan check for agent bearing
2013-05-29 11:22:25 -07:00
Stephen Birarda
f45062a097
don't use audio when the bearing sent by the agent is garbage
2013-05-29 11:14:50 -07:00
Stephen Birarda
78df9fb2ed
last pieces of debugging for mixer crash
2013-05-29 11:04:46 -07:00
ZappoMan
eb675c8dd7
fix crash when no audio mixer available
2013-05-29 08:25:30 -07:00
ZappoMan
6b1d37599c
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -07:00
Jeffrey Ventrella
82683dbabc
merge
2013-05-28 17:58:02 -07:00
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -07:00
ZappoMan
b3045ea681
working on handPosition optimizations
2013-05-28 16:11:07 -07:00
Stephen Birarda
9f2c0adec7
move audioLoudness to HeadData
2013-05-28 12:22:51 -07:00
Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
ddf4d7c748
removed extra comment
2013-05-27 14:17:55 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Andrzej Kapolka
cfb66bee95
Capsule/box collisions.
2013-05-27 14:05:44 -07:00