birarda
0670facdd7
Merge pull request #104 from birarda/master
...
fix incorrect number of bytes per avatar
2013-04-22 16:22:53 -07:00
Stephen Birarda
ea5a247f93
view frustum additions means there are now 94 bytes per avatar
2013-04-22 16:22:06 -07:00
Stephen Birarda
7375932cc7
Merge remote-tracking branch 'upstream/master'
2013-04-22 16:17:54 -07:00
Stephen Birarda
2d8997003a
include avatar ID on log output
2013-04-22 16:16:06 -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
birarda
d92f5b832d
Merge pull request #102 from ZappoMan/view_frustum_work
...
First Cut at View Frustum Culling between server and client
2013-04-22 15:26:45 -07:00
ZappoMan
a79659a5d4
change VoxelAgentData to not include position, use AvatarData _bodyPosition instead
2013-04-22 15:22:41 -07:00
ZappoMan
cea4170270
code review cleanup
2013-04-22 15:14:35 -07:00
ZappoMan
2f6d2469f4
code review cleanup
2013-04-22 15:13:17 -07:00
ZappoMan
436b43ea85
code review cleanup
2013-04-22 15:11:40 -07:00
ZappoMan
7d93f07152
code review cleanup
2013-04-22 15:10:18 -07:00
ZappoMan
7c73964836
code review cleanup
2013-04-22 15:07:46 -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
030f5328f5
First cut at View Frustum Culling between client and server
2013-04-22 14:46:25 -07:00
ZappoMan
893996675a
Derive VoxelAgentData from AvatarData to get access to camera details
...
- Changed base class for VoxelAgentData
- changed parseData() method to call base class implementation
- added avatars library to cmake scripts
2013-04-22 14:15:47 -07:00
ZappoMan
e1da39e2bb
Made several ViewFrustum methods const since they don't modify the class
2013-04-22 14:13:56 -07:00
ZappoMan
9b34427570
Added camera data to AvatarData class, and include it in interface
2013-04-22 14:12:08 -07:00
birarda
f10ec0b391
Merge pull request #101 from birarda/master
...
fix missed reference to AGENT_TYPE_INTERFACE
2013-04-22 14:05:58 -07:00
Stephen Birarda
c00b5f5e8d
fix missed reference to AGENT_TYPE_INTERFACE
2013-04-22 14:05:16 -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
Stephen Birarda
f4d5774e69
change eve's orientation and hand position
2013-04-22 13:55:59 -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
Stephen Birarda
3016e5665f
move eve away from the origin
2013-04-22 13:22:48 -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
a558597b6a
complete an initial version of eve that sits at 0,0,0
2013-04-22 13:10:21 -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
Stephen Birarda
38f8769ff6
stub setup for eve
2013-04-22 11:39:38 -07:00
Jeffrey Ventrella
1c6048e2e9
Merge pull request #97 from Ventrella/master
...
added - and then removed - some tests related to orientation
2013-04-22 10:36:37 -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
Philip Rosedale
6286e1b54f
Merge pull request #96 from ZappoMan/view_frustum_work
...
Working on False Color Support & LOD Bug fix
2013-04-22 08:53:05 -07:00
ZappoMan
400ecf6b86
Convert over to standard glm functions for length, normalize, cross, and dot product
2013-04-21 22:57:01 -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
e93ece0f52
Added support for NO_FALSE_COLOR define.
...
- changed VoxelNode to have implementation option for NO_FALSE_COLOR
Need some help from Stephen and/or Leo on how to make cmake support
building the voxels library in NO_FALSE_COLOR mode for the server
but keep false color support in the client
2013-04-21 19:45:54 -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
a02a75f516
fix bug in definition of frustum planes, and general code cleanup
...
- Fixed bug in definition of frustum planes, namely making sure the points are
given in the correct order so that our plane normals point in correct direction
- general code cleanup to match coding standard
2013-04-21 15:21:03 -07:00
ZappoMan
8a150d27b8
Cleanup for coding standard fix bug in creation of plane from points
...
- cleaned up code to match HiFi Coding standard
- fixed bug in creation of plane related to cross product
2013-04-21 15:18:17 -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
ZappoMan
7dbc6bc986
Added inline getters for camera attributes
2013-04-19 19:56:53 -07:00
ZappoMan
8ad51b6c08
got rid of a bunch of this-> at Stephen's request. Added debuging for box in view
2013-04-19 19:56:03 -07:00
ZappoMan
2752918573
Fixed LOD bug, added recurseTree helper, change tree to use safe/true/false colors
...
- Fixed LOD bug in server side sending
- added recurseTreeWithOperation() helper
- changed tree to use new VoxelNode color related API
2013-04-19 18:15:50 -07:00
ZappoMan
3ec920d1b8
added scale() method to AABox
2013-04-19 18:14:10 -07:00