Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:13:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12704 commits 25 branches 0 tags 1.1 GiB
Commit graph

237 commits

Author SHA1 Message Date
ZappoMan
ce6af9ecb8 added debug destructor to persist thread 2014-03-28 11:04:27 -07:00
ZappoMan
c6c4b58699 adds reset of octree element population statistics 2014-03-27 02:31:39 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
ZappoMan
f3968679d3 cleanup isInView() to use inFrustum() directly 2014-03-19 15:44:18 -07:00
ZappoMan
3d0207b926 optimize OctreeElement::calculateShouldRender() 2014-03-19 13:54:06 -07:00
ZappoMan
adaa01c13e optimize isLeaf() to just check the child mask instead of counting children 2014-03-19 13:15:28 -07:00
ZappoMan
f3bd8925d9 optimized OctreeElement::furthestDistanceToCamera() 2014-03-19 12:48:11 -07:00
ZappoMan
252bc3b3ee optimized ViewFrustum::getFurthestPointFromCamera() 2014-03-19 11:51:47 -07:00
ZappoMan
28766bebc8 pass down parents inFrustum() state to recursion to allow further optimization 2014-03-17 18:30:08 -07:00
ZappoMan
c09974bcda use parents inFrustum status to optimize children 2014-03-17 17:51:09 -07:00
ZappoMan
aab2ca826f Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:01:25 -07:00
ZappoMan
f8e38382a8 Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-16 19:37:41 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
61a905961e darnit I hate casts.. 2014-03-14 22:48:32 -07:00
Brad Hefta-Gaub
1f77505871 more unix warnings cleanup 2014-03-14 18:35:34 -07:00
Brad Hefta-Gaub
711e6ca3f5 clean up casts and types to fix warnings in a cleaner way 2014-03-14 17:43:55 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
ZappoMan
0d4066a347 added note 2014-03-14 10:07:26 -07:00
ZappoMan
af71359c60 remove encode/deleting/start/done guards 2014-03-14 00:49:33 -07:00
ZappoMan
1f88ede1aa switch OctreeElementBag to use QSet as it's underlying data store 2014-03-14 00:47:50 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing 
Voxel/Particle Server Scaling Work
 2014-03-12 15:24:29 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
ZappoMan
86feabee99 add last scene packets, bytes and pps 2014-03-12 02:22:24 -07:00
ZappoMan
025da315c6 removed dontSleep from JurisdictionListener 2014-03-11 21:11:47 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
ZappoMan
0017625442 fix unix compiler issue 2014-03-11 16:48:49 -07:00
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Stephen Birarda
ede32b5f1a resolve conflicts on merge with upstream master 2014-03-05 15:31:00 -08:00
ZappoMan
cba55282db cleanup headers 2014-03-05 02:42:49 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
Stephen Birarda
b78e723253 fix a NaN in ViewFrustum and BuckyBalls 2014-03-04 15:53:05 -08:00
ZappoMan
c90d4a9514 fix failed lock causing particle collisions to not work 2014-03-04 15:07:30 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
0f586cc0fb fix warning about unused variable 2014-03-04 12:03:48 -08:00
Andrew Meadows
1b2db1f7ab fix for warnings about signed/unsigned comparison 2014-03-04 11:07:15 -08:00
Andrew Meadows
78b92516d9 fix warning about signed/unsigned comparison 2014-03-04 10:43:49 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
ZappoMan
493648b56e reversing some changes 2014-03-03 17:06:46 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -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
ZappoMan
fd47602945 various particle crash and deadlock fixes 2014-03-03 12:49:34 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -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
176270f639 more VoxelSystem vs VoxelTree cleanup 2014-03-02 16:51:40 -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
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
d361c75b50 more work on seeing voxels 2014-02-26 14:16:22 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
ZappoMan
dee9d48b5f adding OctreeHeadlessViewer::queryOctree() 2014-02-26 01:55:04 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00
ZappoMan
5fdfee4cd5 cleaning up some stuff 2014-02-26 00:48:38 -08:00
ZappoMan
cbca298717 cruft cleanup 2014-02-26 00:31:05 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
matsukaze
8aa645b6de Merge and resolve conflicts of remote-tracking branch 'upstream/master' 2014-02-18 22:45:25 -05:00
Andrew Meadows
b28a18dab0 Remove warning about null-op sprintf() in g++ 2014-02-17 09:17:34 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
ZappoMan
dbd6cb71c9 fixed crash on shutdown with multiple scripts 2014-02-13 20:55:16 -08:00
matsukaze
a89f3bb9e5 Fixes for style conformance 2014-02-13 11:23:50 -05:00
matsukaze
9e5c8b1634 Merging upstream master 2014-02-12 12:32:53 -05:00
ZappoMan
4bb7bb2b77 make pending packets thread safe 2014-02-10 12:48:45 -08:00
matsukaze
ab0b7bba00 Fixes for style conformance: tabs to spaces 2014-02-07 22:52:08 -05:00
matsukaze
52290266b0 Fixes for style conformance: replace constants with enums 2014-02-07 22:11:47 -05:00
Stephen Birarda
05f086ae74 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-07 13:48:28 -08:00
Stephen Birarda
3ad8e7260e fix an accidental DOS and remove getNodeActiveSocketOrPing API 2014-02-07 13:42:52 -08:00
Andrzej Kapolka
d3b005112e Changes from Philip's code review. 2014-02-07 10:03:23 -08:00
Stephen Birarda
b988308a8d leverage writeDatagram helper in NodeList, ping if no active socket 2014-02-07 09:49:54 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
ZappoMan
1b9cc4f5a5 more fixup to octree packets 2014-02-04 23:02:56 -08:00
ZappoMan
b0c41b086d fix voxel packet corruption 2014-02-04 22:54:55 -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
ZappoMan
00e98ee42b make tryLock actually return a bool 2014-01-31 15:44:48 -08:00
ZappoMan
7a3ce7c89d Merge pull request #1805 from birarda/master 
remove unused UUID from OctreeQuery
 2014-01-31 13:48:49 -08:00
Stephen Birarda
9b549723d3 remove unused UUID from OctreeQuery 2014-01-31 13:47:59 -08:00
ZappoMan
599e57b5c2 Merge pull request #1804 from birarda/master 
remove a double push in OctreeQuery parsing
 2014-01-31 13:45:03 -08:00
Stephen Birarda
254a0c0aed remove a double push on UUID in OctreeQuery 2014-01-31 13:44:24 -08:00
ZappoMan
5caaf0dc7f check against NULL node from nodeWithUUID() 2014-01-31 13:28:56 -08:00
Stephen Birarda
59a528f096 remove another unneeded line 2014-01-31 10:06:26 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
fe410ae3e9 fix packet header size constraints 2014-01-28 12:56:05 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
568d5bc05d first cut at particle meshes 2014-01-28 09:26:47 -08:00