Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-26 19:38:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18334 commits 25 branches 0 tags 1.1 GiB
Commit graph

436 commits

Author SHA1 Message Date
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Brad Hefta-Gaub
86b455e58f Merge pull request #3680 from stojce/20158 
CR for Job #20158 - Change default field of view from 90 to 45
 2014-10-28 15:26:09 -07:00
Stojce
01b8fa12e2 Change default field of view from 90 to 45 2014-10-28 22:22:50 +01:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
ZappoMan
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -07:00
ZappoMan
770bc919bb added some rendering stats to OctreeRenderer 2014-10-15 09:22:31 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
ZappoMan
c880f00a14 make sure to scale default octree shape collision to meters 2014-09-25 14:54:06 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
ZappoMan
eda168a6d9 first cut at shape collisions 2014-09-24 19:51:37 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
ZappoMan
2148baae21 add boxInFrustum 2014-09-11 16:40:32 -07:00
ZappoMan
31fc5bb4f7 silence some over active debug messages 2014-09-09 13:19:06 -07:00
Andrew Meadows
c9d5508f16 merge upstream/master into andrew/ragdoll 2014-09-08 10:21:32 -07:00
Andrew Meadows
62438bae6a fixed signed/unsigned comparison and unused variable 2014-09-05 16:41:01 -07:00
Andrew Meadows
0ddc8eb448 fix signed/unsigned comparison 2014-09-05 16:40:14 -07:00
Andrew Meadows
6f22ff01d9 merge upstream/master into andrew/ragdoll 2014-09-05 16:04:01 -07:00
ZappoMan
f0d72b83fa CR feedback 2014-09-05 15:39:29 -07:00
Andrew Meadows
b953d880a3 minor optimization on CubeList and VoxelPool 2014-09-05 14:41:18 -07:00
ZappoMan
a19ce6e859 clean up warning 2014-09-05 12:52:04 -07:00
ZappoMan
54a746a846 remove noise 2014-09-05 12:49:23 -07:00
ZappoMan
e1064d8da7 correctly implement data types who assume all child data must be included (e.g. voxels) 2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350 more work on fixing voxels 2014-09-05 11:51:17 -07:00
ZappoMan
f234dbf9a1 converting voxel files to new versioned format with buffer breaks 2014-09-05 10:51:08 -07:00
ZappoMan
5c5658b6e7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave 2014-09-05 09:27:27 -07:00
ZappoMan
3c2b534842 dead code cleanup and comment cleanup 2014-09-05 01:50:43 -07:00
ZappoMan
5ec98b8dec more guards to corrupt voxel files 2014-09-05 01:40:41 -07:00
ZappoMan
a189f077b8 fix huge-mega-voxels and voxel file corruption 2014-09-05 01:13:22 -07:00
Andrew Meadows
faf31f268e use QHash, not QVector, for Octree content query 2014-09-04 15:20:07 -07:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrew Meadows
54463ab668 add findContentInCube() and typedef CubeList 2014-09-03 13:17:47 -07:00
ZappoMan
756840d541 CR feedback 2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7 fix method names for CR feedback 2014-09-03 12:44:57 -07:00
ZappoMan
9a02545d9e useless semicolon removal 2014-09-03 12:26:05 -07:00
ZappoMan
f5b9fabdb9 fix CR feedback 2014-09-03 12:12:08 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
ZappoMan
9fa087571b tweak to save SVO logic 2014-09-02 17:10:41 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions 
so that I don't break anything when this merges with upstream
 2014-08-29 15:53:20 -07:00
ZappoMan
f654fac851 fixed a couple crashes in editing entities 2014-08-29 10:56:07 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00