ZappoMan
043a284d4d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:36:31 -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