Stephen Birarda
e7e7bd290a
remove debugging on voxel deletion
2013-04-16 12:04:56 -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
ZappoMan
dcca1699d3
Adding first cut at ViewFrustum pointIn,SphereIn,BoxIn code.
...
- Added Plane class
- Added AABox class
- Removed some experimental "slightly inside" code from view frustum
2013-04-16 11:29:31 -07:00
ZappoMan
a3fabaf300
Merge pull request #50 from tschw/19188
...
19188
2013-04-16 08:25:07 -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
Stephen Birarda
861c8e76ee
grab jeffrey's changes to Util consts
2013-04-15 18:35:46 -07:00
Stephen Birarda
61cf17da73
update agent-mixer to use new AvatarData class
2013-04-15 18:19:01 -07:00
Stephen Birarda
a5a93443c6
re-work AvatarData to handle body position and rotation
2013-04-15 18:05:22 -07:00
ZappoMan
3b994cbdcf
Latest work on ViewFrustum
...
- added support for specifying lens attributes (fov, near, far, ratio)
- changed constructor and calculate methods to be separate
- coding standard cleanup
2013-04-15 17:54:44 -07:00
Stephen Birarda
ed3f308a0e
pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM
2013-04-15 16:08:35 -07:00
Stephen Birarda
af1071b374
comments to AvatarData and avatar-mixer before pack/unpack refactor
2013-04-15 16:07:46 -07:00
Stephen Birarda
a4011934c6
move Orientation class to avatars library, constants to SharedUtil
2013-04-15 15:39:23 -07:00
Stephen Birarda
2dfe49a885
moved AvatarAgentData to AvatarData
2013-04-15 15:05:55 -07:00
Stephen Birarda
4702e6ade0
remove the unecessary trailing slash when setting root dir
2013-04-15 14:59:48 -07:00
Stephen Birarda
d0eed92699
add an avatars library and move AvatarAgentData there
2013-04-15 14:51:34 -07:00
Stephen Birarda
d094c6fc3b
refactor LinkHifiLibrary, add SetupHifiLibrary macro
2013-04-15 14:41:59 -07:00
Stephen Birarda
24689e97ab
fix packing and unpacking of agent IDs
2013-04-15 11:12:31 -07:00
ZappoMan
27165be902
tweak starting fov adjust to 1.65 which seems correct
2013-04-13 13:19:48 -07:00
ZappoMan
4cb986b3f9
tweaks to ViewFrustum's default FOV, added comments
2013-04-13 13:09:20 -07:00
ZappoMan
1264bdf63d
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 18:28:17 -07:00
ZappoMan
505b2db935
some spacing cleanup
2013-04-12 17:27:54 -07:00
Stephen Birarda
cb233e843c
Merge branch 'master' of github.com:worklist/hifi into reorganize
2013-04-12 17:25:41 -07:00
ZappoMan
54ba0d0224
cleaned up spacing for code review
2013-04-12 17:23:23 -07:00
ZappoMan
ca4286590e
fixed column width to match codeing standard
2013-04-12 17:14:08 -07:00
ZappoMan
5a8c5ff011
coding standards clean up
2013-04-12 16:55:57 -07:00
Stephen Birarda
787bebb5fc
don't call constructor and assignment operator
2013-04-12 16:51:59 -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
Stephen Birarda
1415a25302
fix for warnings produced by CounterStats refactor
2013-04-12 16:22:35 -07:00
Stephen Birarda
cc2f35ca89
pass a ROOT_DIR to LinkHifiLibrary
2013-04-12 15:59:16 -07:00
ZappoMan
2ea8ce8ef8
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 15:37:54 -07:00
Stephen Birarda
f6adac1399
change a couple more long ints
2013-04-12 15:35:06 -07:00
Stephen Birarda
d30512e273
remove another long int
2013-04-12 15:25:41 -07:00
Stephen Birarda
83ee450759
change long int to long in CounterStats
2013-04-12 15:18:04 -07:00
Stephen Birarda
9b73d2559d
Revert "add dependency to shared library from voxel library"
...
This reverts commit e9d71c9406
.
2013-04-12 15:15:19 -07:00
Stephen Birarda
e9d71c9406
add dependency to shared library from voxel library
2013-04-12 15:06:51 -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
Stephen Birarda
13cde69da2
include the shared headers to the voxel library
2013-04-12 15:03:02 -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
Stephen Birarda
c3b457febb
moved MarkerNode from shared to voxel library
2013-04-12 14:51:12 -07:00
ZappoMan
862ee47fbb
moving voxellib to libraries/voxels
2013-04-12 13:40:33 -07:00
ZappoMan
cf6b8fe72f
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 13:37:34 -07:00
Stephen Birarda
b0ff960e37
use MACRO_DIR variable to find glm in root externals dir
2013-04-12 13:20:46 -07:00
Stephen Birarda
c2cb7cf397
rename MACRO_DIRECTORY variable to MACRO_DIR in voxels lib
2013-04-12 13:13:58 -07:00
Stephen Birarda
31f3f0c31c
add a MACRO_DIRECTORY variable to voxels CMakeLists
2013-04-12 13:09:22 -07:00
Stephen Birarda
67efc12e59
move shared to libraries, DRY library macro, rename libs
2013-04-12 12:38:34 -07:00