Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 19:36:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33467 commits 74 branches 59 tags 1.2 GiB
Commit graph

186 commits

Author SHA1 Message Date
Andrew Meadows
0f586cc0fb fix warning about unused variable 2014-03-04 12:03:48 -08:00
ZappoMan
493648b56e reversing some changes 2014-03-03 17:06:46 -08:00
ZappoMan
3684359c5f removed some debug 2014-03-03 13:57:05 -08:00
ZappoMan
98bf85173a more octree locking cleanup 2014-03-03 13:54:07 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
f245aa6ac5 remove more cruft from VoxelSystem, move getElementEnclosingPoint() to Octree class where it belongs 2014-03-02 20:12:52 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -08:00
ZappoMan
ded7328959 clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly 2014-03-02 15:17:49 -08:00
matsukaze
9e5c8b1634 Merging upstream master 2014-02-12 12:32:53 -05:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
matsukaze
259b285841 Merging upstream 2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8 Completed worklist job #19486 
Job #19486  Don't render the duplicate triangles between adjacent
voxels.

Added checkable item to "developer" menu to activate/deactivate cull
shared faces.

Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.

Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.

Added some useful classes for queue and lock management.

Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
 2014-02-03 09:45:12 -05:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
ZappoMan
3d0d5f130a fix particle-server spinning out at 100% cpu% 2014-01-23 10:02:04 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Brad Hefta-Gaub
5787d3d9e9 more cast coding standard fixes 2014-01-09 19:00:57 -08:00
Andrew Meadows
6e661e05e5 minor cleanup and enforcement of coding standards 2013-12-31 09:30:01 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
7a4f9cf722 particle to particle collisions 2013-12-13 10:23:37 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
ZappoMan
c9da89cde7 fix compiler warning 2013-12-12 15:50:25 -08:00
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -08:00
ZappoMan
072ced0185 first cut at PACKET_TYPE_PARTICLE_ADD implementation 2013-12-05 15:38:36 -08:00
ZappoMan
188d52c06e get client working in refactored mode 2013-12-04 10:05:37 -08:00
ZappoMan
d7ae023492 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:40 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00