Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 20:10:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30667 commits 76 branches 59 tags 1.2 GiB
Commit graph

11822 commits

Author SHA1 Message Date
Anthony J. Thibault
77b857031b Take timeScale into account during interps & setCurrentFrame() 2015-08-31 11:01:15 -07:00
Anthony J. Thibault
54aa0677f6 Merge branch 'master' into ajt/new-anim-system 2015-08-31 10:47:50 -07:00
Raffi Bedikian
ff2a58b3eb Add FXAA effect class, modeled after AO effect 2015-08-30 20:49:03 -07:00
Raffi Bedikian
1001cf9000 Add shader files for FXAA 2015-08-30 20:48:06 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Seth Alves
41a2ff2fff working on stitching marching-cube polyvoxs together 2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Anthony J. Thibault
9d983e0614 Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader. 
Also updated avatar.json to test nested graphs under a SM.
 2015-08-28 17:16:32 -07:00
Brad Davis
08e4fe2dc2 Revert "Add common vector constants to JS" 2015-08-28 16:26:56 -07:00
Seth Alves
f6fbf4f324 fix whitespace 2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub
1e2374da87 Merge pull request #5677 from jherico/bart 
Add common vector constants to JS
 2015-08-28 13:43:13 -07:00
Seth Alves
7614cababb adjust whitespace 2015-08-28 13:21:34 -07:00
Brad Davis
2aa1976b5d Add common vector constants to JS, add some missing quaternionin functionality 2015-08-28 13:05:39 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Seth Alves
540af4afcb remove unneeded call to computeShapeInfoWorker 2015-08-28 12:47:04 -07:00
Seth Alves
a5cd3ff046 release _threadRunning if decompressVolumeDataAsync exits early 2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44 if someone else changes a polyvox, we need to localy recompute the collision shape 2015-08-28 10:39:23 -07:00
Seth Alves
92b5fe3457 fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags 2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5 remove no-longer-used #define 2015-08-28 10:30:56 -07:00
Brad Davis
b7dd47efcb Merge pull request #5674 from birarda/master 
cleanup of some warnings
 2015-08-27 23:34:43 -07:00
Anthony J. Thibault
19e91bb392 Added basic interpolation support to AnimStateMachine 2015-08-27 21:26:31 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine. 
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
 2015-08-27 20:41:53 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Stephen Birarda
c5c73b7809 remove _ipd variable from OculusLegacyDisplayPlugin 2015-08-27 18:26:55 -07:00
Stephen Birarda
8ea20b5e5e fix warning on string literal call to qFatal 2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c wrap OVR variables in ifdef for MAJOR_VERSION >= 6 2015-08-27 18:26:55 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892 remove PhysicsEntity class 2015-08-27 18:22:12 -07:00
Philip Rosedale
d0db56a4a6 Merge pull request #5667 from howard-stearns/rig-menu-toggle 
Rig Menu Toggle and new animations
 2015-08-27 13:52:12 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Leonardo Murillo
dd5d58a5e1 Merge pull request #5663 from birarda/master 
don't request a cert from peer in HTTPSManager
 2015-08-27 12:46:24 -07:00
Stephen Birarda
783bc4dafb Merge branch 'master' of https://github.com/highfidelity/hifi 2015-08-27 12:44:42 -07:00
Howard Stearns
96c74ebbd5 Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. 
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
 2015-08-27 12:25:40 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
Anthony J. Thibault
637e3b0a15 Added triggers to AnimVariantMap. 2015-08-27 10:41:01 -07:00
Anthony J. Thibault
778521f664 Improvement to bone link rendering when bones are large. 2015-08-27 10:21:23 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Seth Alves
b09de4ff65 fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there. 2015-08-26 21:51:28 -07:00
Seth Alves
435863d1f0 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 17:33:59 -07:00
Anthony J. Thibault
b7a9b54628 Better AnimDebugDraw rendering 2015-08-26 16:42:08 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33 Merge pull request #5646 from birarda/ds-cleanup 
de-bloat the domain-server by adding a gatekeeper
 2015-08-26 15:42:43 -07:00
Seth Alves
f53704051f ifdef out debug prints in OBJ reader 2015-08-26 15:09:58 -07:00
Seth Alves
8646900dda Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 13:08:41 -07:00
Stephen Birarda
0fc2713be1 don't request a cert from peer in HTTPSManager 2015-08-26 12:40:09 -07:00
Anthony J. Thibault
c1333e16ed Merge branch 'master' into ajt/new-anim-system 2015-08-26 11:59:03 -07:00
Andrew Meadows
f857ccfe16 fix Vectors::MIN 2015-08-26 11:46:50 -07:00
ericrius1
5586c2ff17 fixed ordering of bitsream reading for old svo files with particle entities 2015-08-26 11:45:19 -07:00
Seth Alves
696e34b996 Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox 2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc Merge branch 'master' into ajt/new-anim-system 2015-08-26 10:37:39 -07:00
ericrius1
f25b75093c cleaned up conditional bitstream parsing 2015-08-26 09:44:29 -07:00
Seth Alves
23dbbcc7bb Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 09:42:20 -07:00
Brad Hefta-Gaub
aa80fc9127 Merge pull request #5653 from jherico/homer 
Remove items from the VR menu properly
 2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie 
Fixing problems reported by static analysis tool
 2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
029c59fb77 Merge pull request #5654 from jherico/barney 
Fix stereo modes aspect ratio
 2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3 Merge pull request #5659 from jherico/nelson 
Fix UserInputMapper event generation
 2015-08-25 22:14:37 -07:00
Seth Alves
6f46832069 clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct 2015-08-25 21:30:38 -07:00
Anthony J. Thibault
0c02a338f2 Added support for setting Variants in the json file. 
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
 2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63 AnimVariantMap is used in eval, MyAvatar loads avatar.json via url 2015-08-25 20:28:17 -07:00
samcake
fda9827100 Merge pull request #5529 from SeijiEmery/gputest 
gputest
 2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
073567558e Fix UserInputMapper event generation 2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Seth Alves
da6a1c958b clean up debugging prints 2015-08-25 16:40:58 -07:00
Seth Alves
3c35d90908 don't recompute meshes if nothing changed 2015-08-25 13:13:01 -07:00
Anthony J. Thibault
496c706bba Added AnimVariantMap argument to evaluate. 2015-08-25 11:59:24 -07:00
Seth Alves
f6c440756c do slow polyvox operations on a thread 2015-08-25 11:46:51 -07:00
Seth Alves
caafea6e3b allow compound collision shapes with less than 2 sub-shapes 2015-08-25 11:46:34 -07:00
Anthony J. Thibault
62f86e6a46 Added AnimVariant, renamed AnimClipTests to AnimTests. 
* Added test for AnimVariant.
 2015-08-25 11:33:57 -07:00
David Rowe
a98a867b06 Delete Interface.ini.lock before accessing to check crash option 2015-08-25 11:07:20 -07:00
Anthony J. Thibault
4bdb00bbc5 Added setCurrentFrame interface to AnimClip. 
This will recurse the tree and call setCurrentFrameInternal on each node.
This method can be overriden, currently the only meaningful implementation is AnimClip.
 2015-08-25 09:58:36 -07:00
Seth Alves
7cb9968864 more work on polyvox threading 2015-08-25 05:53:36 -07:00
Seth Alves
91254245e4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-24 20:21:24 -07:00
Anthony J. Thibault
7a2ca047cb Added network resource download support to AnimNodeLoader. 2015-08-24 19:00:12 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController 
Fix a couple crashes in the Controller scripting interface
 2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
53ae958c74 Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix 
Fix for RenderableParticleEffectEntity crash.
 2015-08-24 17:44:39 -07:00
Anthony J. Thibault
bde75e9e51 AnimDebugDraw rendering works again. 
I had to port AnimDebugDraw shader to GLSL 4.1.
 2015-08-24 17:36:21 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -07:00
Anthony J. Thibault
5a73aef1f8 AnimSkeleton more accurate bind pose generation. 2015-08-24 16:19:16 -07:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub
6549e47dbc fix crash in Controller when asking for device name out of bounds 2015-08-24 14:35:19 -07:00
Anthony J. Thibault
fa5256eefd Merge branch 'master' into ajt/new-anim-system 2015-08-24 14:32:28 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
David Rowe
f6cf77ae68 Add Developer > Display Crash Options menu item 
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
 2015-08-24 13:24:31 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -07:00
Anthony J. Thibault
47b8ab373c Fix for RenderableParticleEffectEntity crash. 
The render item payload now keeps a shared_ptr to the entity.
 2015-08-24 11:15:30 -07:00
ericrius1
5fa27a7cf1 added back computeAndUpdate mmethod for particles, and now handling parsing old streams 2015-08-24 10:59:38 -07:00
Brad Davis
78a08ed7c7 Merge pull request #5641 from thoys/20660 
CR for Job #20660 - Render the world Axis markers into negative space, add view option
 2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314 Merge pull request #5634 from hyperlogic/tony/animation-resource-fix 
Fix for animation resources
 2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0 Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084 Added overload for renderDashedLine 2015-08-24 16:07:07 +01:00
Thijs Wenker
0f8cf80d45 Merge branch 'master' of https://github.com/worklist/hifi into 20660 2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a Merge branch '20660' of github.com:thoys/hifi into 20660 
Conflicts:
	interface/src/Util.cpp
 2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369 Modified the world box to render axes in negative space 
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
 2015-08-23 16:21:20 +01:00
Seth Alves
dc31c7e233 back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about 2015-08-23 08:14:05 -07:00
Brad Hefta-Gaub
53f9815f69 Merge pull request #5639 from jherico/maggie 
Stereo rendering work
 2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b Merge pull request #5635 from samcake/punk 
Improve the light attenuation formulae
 2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
fe44442ffe Merge pull request #5577 from vastcharade/horizAmbOcclPerf 
Horiz amb occl performance updates
 2015-08-22 12:39:51 -07:00
Anthony J. Thibault
80d3ae68c2 Removed redundant ends with ‘fbx’ check. 2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743 Resource fix for textures in FBX files. 
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
 2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929 Merge pull request #5594 from thoys/20638 
CR for Job #20638 - Scripting: WebSocket Implementation
 2015-08-21 19:13:43 -07:00
Thijs Wenker
d84cf1859c hook up the WebSocket error event directly 2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e properly exposed WebSocketClass::ReadyState to the ScriptEngine 2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97 Merge pull request #5632 from birarda/master 
force the HTTPManager to listen on IPv4
 2015-08-21 16:56:55 -07:00
Seth Alves
92c1d62b7b Merge branch 'master' of github.com:birarda/hifi into polyvox 2015-08-21 16:55:39 -07:00
Anthony J. Thibault
5e31d423b9 Removed some debugging statements 2015-08-21 16:55:08 -07:00
Thijs Wenker
9edba451eb - remove webSockets from List after disconnect. 
- leave it up to the QtScript to delete the WebSocket / WebSocketServer objects
 2015-08-22 01:33:22 +02:00
Sam Gateau
518cf3be15 Improve the light attenuation formulae 2015-08-21 16:28:38 -07:00
Anthony J. Thibault
b7009b4631 Fix for animation resources 
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.

So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
 2015-08-21 16:09:06 -07:00
Stephen Birarda
4b95d54955 remove the explicit failure test 2015-08-21 14:55:24 -07:00
Stephen Birarda
0fbbfb77d1 exit with a code to indicate error 2015-08-21 14:42:05 -07:00
Stephen Birarda
3e4a05a57b leave the listen check but queue Application quit 2015-08-21 14:30:41 -07:00
Stephen Birarda
34b3fb1c0c Revert "force the HTTPManager to listen on IPv4" 
This reverts commit 220ad189a0.
 2015-08-21 14:27:17 -07:00
Howard Stearns
ad0df3a47c Make sixense work in dev builds (if you put the library in the documented place). 2015-08-21 14:21:49 -07:00
Seth Alves
5474902b0b Merge branch 'master' of github.com:birarda/hifi into polyvox 2015-08-21 14:20:30 -07:00
Stephen Birarda
220ad189a0 force the HTTPManager to listen on IPv4 2015-08-21 14:16:34 -07:00
Thijs Wenker
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Seth Alves
fdad8fc651 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 13:19:19 -07:00
Seth Alves
9937416729 attempt to move some time-consuming polyvox stuff off of the main thread 2015-08-21 11:23:13 -07:00
Thijs Wenker
d3a6833133 delete WebSockets on ScriptEngine finish 2015-08-21 20:20:50 +02:00
Seth Alves
105470bf26 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-21 11:02:16 -07:00
Seth Alves
6db0442fda allow for asynchronous building of collision shape 2015-08-21 10:48:26 -07:00
Thijs Wenker
c7346209fb fix memory leak 2015-08-21 19:44:43 +02:00
Thijs Wenker
fd82f05307 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-21 19:29:38 +02:00
Thijs Wenker
e581a57320 WebSocket constructor could allow more then one parameter now, only the first one is used though. 2015-08-21 19:13:57 +02:00
Thijs Wenker
55fd847636 removed unused code, renamed UnitTest.ready() to UnitTest.done() 2015-08-21 19:07:33 +02:00
ZappoMan
270463fc4e restore new oculus detect code from master 2015-08-21 09:29:25 -07:00
ZappoMan
75aff2f281 fix atmosphere rendering 2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828 Fix culling calculations in HMD with new stereo mechanism 2015-08-21 00:29:27 -07:00
ZappoMan
62e8ec3fdf add fullscreen menu item and rename side by side stereo plugin 2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Brad Davis
f6f189c4b8 Merge pull request #5609 from murillodigital/master 
Better handling of socket binding
 2015-08-21 00:22:19 -07:00
Brad Davis
c3991dbb8c Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor 
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
 2015-08-20 23:57:16 -07:00
Brad Davis
8c7711168c Merge pull request #5603 from sethalves/linux-memory-debugger 
memory debugging on linux
 2015-08-20 19:19:24 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Stephen Birarda
e93b360908 expose options property to AI script interface 2015-08-20 12:12:43 -07:00
Thijs Wenker
7f5fc64f6c Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-20 21:09:22 +02:00
Seth Alves
f9fb65bb4b Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox 2015-08-20 10:15:16 -07:00
Seth Alves
f61fe46f18 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-20 10:14:56 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Leonardo Murillo
129761c002 making qtimer interval a const 2015-08-20 08:10:19 -06:00
Leonardo Murillo
2c23dab2e7 More specific logging 2015-08-20 08:03:37 -06:00