Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:31:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19994 commits 75 branches 59 tags 1.2 GiB
Commit graph

6286 commits

Author SHA1 Message Date
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
0b95403949 cleanup the windows hackery a little 2014-12-15 12:25:20 -08:00
ZappoMan
95d820ee8b more windows hackery 2014-12-15 12:16:01 -08:00
ZappoMan
4e7368b643 more windows hackery 2014-12-15 12:09:30 -08:00
ZappoMan
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
Atlante45
e40961df12 Checking that T is in fact derived from Dependency 2014-12-14 21:34:27 -08:00
Atlante45
28786721a6 Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager 2014-12-13 01:18:33 -08:00
Atlante45
9aea2843ac Remove pointer check 2014-12-12 21:20:26 -08:00
Atlante45
50fd52377f Couple improvements to the dependency manager 2014-12-12 21:10:45 -08:00
Atlante45
14cda00ebc First implementation of the DependencyManager 2014-12-12 20:52:41 -08:00
Stephen Birarda
687072f19c fix for domain failed reconnect after disconnect 2014-12-12 09:47:15 -08:00
David Rowe
20b880ca09 Fix avatar hand state decoding for finger laser 2014-12-11 23:07:05 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
ZappoMan
f2ed1337b5 fix ray picking output distance to be meters 2014-12-10 11:04:32 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
Leonardo Murillo
8d88c537bf Merge pull request #3938 from ZappoMan/fixcrash 
potential fix to crash on windows startup
 2014-12-09 19:12:53 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
ZappoMan
628046f13c potential fix to crash on windows startup 2014-12-09 18:26:59 -08:00
Sam Gateau
cf081f0deb Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 18:13:07 -08:00
AndrewMeadows
9aaaae6759 Merge pull request #3934 from ZappoMan/bugfixes 
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
 2014-12-09 18:08:14 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions 
move emit of collisions to after done moving entities, so that callbacks can delete entities
 2014-12-09 17:46:41 -08:00
Sam Gateau
8617c319d4 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 17:30:26 -08:00
ZappoMan
426517b072 fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities 2014-12-09 17:11:01 -08:00
Andrzej Kapolka
fa8f4e3b06 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-09 12:16:09 -08:00
Andrzej Kapolka
5fb9905186 Rather than reducing rate on first drop, wait until three consecutive packets 
have been dropped.
 2014-12-09 12:14:21 -08:00
Atlante45
36eecf1d15 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 11:53:47 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00
Andrzej Kapolka
343f610442 Use the 1450 limit everywhere, in case other places are running into the issue 
I experienced with metavoxels.
 2014-12-08 18:45:05 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Andrzej Kapolka
d0ca75dd2c Reduce the MTU size to deal with Windows networking issue. 2014-12-08 18:04:45 -08:00
Brad Hefta-Gaub
651e550063 Merge pull request #3925 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-08 16:58:16 -08:00
Andrew Meadows
675a2dd989 add DIRTY_UPDATEABLE flag for changes that need it 2014-12-08 16:32:25 -08:00
Andrew Meadows
27bfc9907f fix bug preventing butterflies from animating 
(forgot to make base method virtual)
 2014-12-08 16:31:36 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
Andrew Meadows
3ce1d4a38d set dirty bit when script changes simulation stuff 
also fixes for linear and angular damping
 2014-12-08 11:21:01 -08:00
Andrew Meadows
6fdfde31d9 whoops, forgot to increment the iterator 2014-12-08 11:20:27 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
Philip Rosedale
7de2256744 Merge pull request #3919 from ZappoMan/enforceDimensionsForLightsAndText 
enforce dimensions for Light and Text entities
 2014-12-08 09:19:06 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash 
Ac entity crash
 2014-12-08 09:16:40 -08:00
ZappoMan
cf98bff28b enforce dimensions for Light and Text entities 2014-12-08 07:23:45 -08:00
ZappoMan
497fbade9b fix crash in entity related AC scripts 2014-12-08 06:48:04 -08:00
ZappoMan
398b5b1f91 Merge branch 'master' of https://github.com/highfidelity/hifi into fixEllipsoidRayPick 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
	libraries/entities/src/SphereEntityItem.h
 2014-12-07 21:03:09 -08:00
ZappoMan
dd4f3a4006 coding standard, added comments 2014-12-07 20:18:30 -08:00
ZappoMan
b9891748e1 remove dead code 2014-12-07 01:32:31 -08:00
ZappoMan
b08d5b87ca implement proper ray picking against ellipsoids 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-07 01:31:40 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
ZappoMan
7011162c70 removed dead code 2014-12-06 15:07:02 -08:00
ZappoMan
08092e7abe removed dead code 2014-12-06 15:06:00 -08:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
ZappoMan
ec907d1d1d removed debug 2014-12-06 09:44:30 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
Andrew Meadows
7d96ad5836 cleanup of EntitySimulation API 
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
 2014-12-05 18:08:53 -08:00
ZappoMan
ae647d39d0 fix models with registrations other than 0,0,0 2014-12-05 16:14:18 -08:00
ZappoMan
0ccbb98bde more work on improved model picking 2014-12-05 15:03:35 -08:00
Sam Gateau
69792178b9 trying to fix the linux compilation 2014-12-05 13:43:04 -08:00
Sam Gateau
c49b753c98 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 13:38:30 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master 
Orbiting sound example, ability to set injector position, better butterflies
 2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
Sam Gateau
0fbdda7582 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 10:13:38 -08:00
Sam Gateau
5bca90163f Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-05 10:12:21 -08:00
Sam Gateau
563cd6f7e3 watch your language... 2014-12-05 10:10:21 -08:00
Philip Rosedale
0ad361fd60 Merge pull request #3902 from samcake/tot 
Adding detection of a "hifi" global light in a FBX file used to pass information
 2014-12-05 10:07:52 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Andrzej Kapolka
dff22b01b6 Allow loading "MDR" files saved by Wilbur, fix for reallocating error. 2014-12-05 01:58:45 -08:00
Sam Gateau
66c10544ae Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-04 17:16:39 -08:00
dev
16da10bf19 compiling the gpu library on mac 2014-12-04 17:15:59 -08:00
dev
da1bb83eb0 compiling the gpu library on mac 2014-12-04 17:14:41 -08:00
Andrzej Kapolka
466d99bcbb Removed unused members. 2014-12-04 17:12:06 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-04 16:46:32 -08:00
Andrzej Kapolka
9819658e20 Spanner subdivision streaming bits. 2014-12-04 16:41:19 -08:00
Sam Gateau
1102b4d633 Moving GPU into it's own library 2014-12-04 16:40:55 -08:00
Sam Gateau
4168993ebe Replace c++11 usage of auto by explicit declaration 2014-12-04 14:23:47 -08:00
ZappoMan
842ee714b8 make text entities correctly ray pick 2014-12-04 13:08:16 -08:00
Sam Gateau
3215957398 better interpretation of the hifi light intensity and fixes for compilation on mac 2014-12-04 12:31:40 -08:00
Andrzej Kapolka
a990b4ae1f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-04 12:19:45 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -08:00
Sam Gateau
592e902f46 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 00:25:15 -08:00
Sam Gateau
30d87ee026 Trying to capture light information in order to get the one GLobal Light object containg the intensity value 2014-12-04 00:24:08 -08:00
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request #3870 from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Andrzej Kapolka
7a81e6c9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 14:30:31 -08:00
Sam Gateau
322dd38322 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-03 14:23:49 -08:00
Sam Gateau
913007939b Trying to read the light attribute 2014-12-03 14:12:50 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
fecb225a06 Prevent erroneous resource download percentages; Qt reports the total bytes as 
-1 before the actual size is available.
 2014-12-03 12:55:58 -08:00
Andrzej Kapolka
e32c214e4d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 12:08:06 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Sam Gateau
fc9dfd8d14 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-03 09:16:43 -08:00
Stephen Birarda
49a087018f fix for delayed heartbeats, late socket lookup 2014-12-03 08:22:50 -08:00
Andrzej Kapolka
1a1b1ca3f3 Fix for voxelizing heightfields. 2014-12-02 19:49:27 -08:00
Andrzej Kapolka
8669398048 Voxelization bits. 2014-12-02 19:14:33 -08:00
Sam Gateau
1aec214138 gabbing the AnbientCOlor value, we will use it as the lighmap global level 2014-12-02 16:23:09 -08:00
Andrzej Kapolka
9753041a1a Height brush bits. 2014-12-02 16:11:29 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Andrzej Kapolka
a022b7fa17 Fix for successive heightfield placements. 2014-12-02 13:12:45 -08:00
Andrzej Kapolka
b4b1559e32 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 12:07:38 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Stephen Birarda
36f716cd61 have script loading be separate from ScriptEngine constructor 2014-12-02 10:13:43 -08:00
Andrzej Kapolka
a46b46b5a2 Fix for merging. 2014-12-01 19:10:10 -08:00
Andrzej Kapolka
46f1fc7c0f More work on spanner heightfield edits. 2014-12-01 18:50:24 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Andrzej Kapolka
3fbbd6c2de Working on transitioning functions to quadtree equivalents. 2014-12-01 16:43:03 -08:00
Sam Gateau
845e687fc5 Adding a Hack for the apaartment model to boost the lightmaps 2014-12-01 11:45:07 -08:00
Philip Rosedale
72ad8061ba Merge pull request #3878 from birarda/master 
changes required for AC to discover a local DS
 2014-11-30 18:44:32 -08:00
Philip Rosedale
e44ca5a7f7 Merge pull request #3876 from ZappoMan/bugFixes 
fixes the stutter in animation when observer moves
 2014-11-30 18:44:21 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Sam Gateau
321d651d77 Hack for avoiding lightmaps loading in starchamber 2014-11-30 12:54:43 -08:00
ZappoMan
5c2cc20313 fixes the stutter in animation when observer moves 2014-11-28 17:36:55 -08:00
Brad Hefta-Gaub
8a86b2d239 Merge pull request #3873 from samcake/tot 
Fix lighmaps for VC demo 12/1/2014
 2014-11-27 13:01:10 -08:00
Andrzej Kapolka
6be1810967 More work on subdivision. 2014-11-26 17:57:03 -08:00
Andrew Meadows
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrzej Kapolka
5710bfcf6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 16:19:16 -08:00
Andrzej Kapolka
0a329bbe3c More work on LOD rendering; now rendering in preview. 2014-11-26 16:18:57 -08:00
Philip Rosedale
91aca51dc6 Merge pull request #3868 from ZappoMan/HMDMode 
First cut at HMD Tools window
 2014-11-26 14:53:25 -08:00
Andrzej Kapolka
790b085307 Rejiggering the heightfield renderer for LOD. 2014-11-26 13:02:11 -08:00
Andrew Meadows
d84f57fafa merge upstream/master into andrew/thermonuclear 2014-11-26 12:18:19 -08:00
Andrew Meadows
b543434a17 EntityTreeHeadlessViewer gets a simulation 2014-11-26 12:16:52 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
Andrzej Kapolka
1d9c7d7c72 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 10:56:23 -08:00
Sam Gateau
fa375539d0 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-26 09:42:31 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
Andrzej Kapolka
7f14a66922 More work on heightfield quadtrees. 2014-11-25 18:27:09 -08:00
Sam Gateau
77077f4e9c hack a separate emissive information in the g-buffer 2014-11-25 18:17:28 -08:00
Andrzej Kapolka
a987e7ce10 When we set heightfield layers, break it up into quadtree. 2014-11-25 15:32:02 -08:00
Andrzej Kapolka
fc16207c08 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-25 14:11:08 -08:00
Andrzej Kapolka
8d3f4a627b Working on quadtree for heightfields. 2014-11-25 14:10:44 -08:00