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

1541 commits

Author SHA1 Message Date
Seth Alves
8899c0b790 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-10 10:43:07 -07:00
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -07:00
samcake
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07:00
Seth Alves
dd39d46883 fold WebEntityAPIHelper members into OffscreenQmlSurface 2016-09-09 13:41:09 -07:00
Seth Alves
123ac541ea started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 11:31:48 -07:00
Seth Alves
02dba2fe49 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 11:23:37 -07:00
Seth Alves
ef8c2a2888 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 10:46:54 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Anthony J. Thibault
594640f8b4 coding standard fixes 2016-09-08 11:53:23 -07:00
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -07:00
Anthony J. Thibault
41e0b8732f fix for occasional crash when deleting web entity 2016-09-07 10:59:16 -07:00
Anthony J. Thibault
774509ba9e Changed punctuation button to &123 2016-09-06 17:41:56 -07:00
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -07:00
samcake
0c45627d94 CLeaning up the code for the RenderableLightEntityItem 2016-09-06 12:39:48 -07:00
Anthony J. Thibault
787bb58c1a osx warning fix 2016-09-02 17:22:13 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
Anthony J. Thibault
a54c3bf8c0 support for backspace, carriage return, space and period. 2016-09-02 16:23:46 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213 First pass of keyboard raising and lowering 2016-09-02 12:15:30 -07:00
samcake
7b68f1439f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 09:28:35 -07:00
Brad Hefta-Gaub
667137f951 Merge pull request #8552 from AndrewMeadows/invoke-updateModel 
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
 2016-09-02 09:17:57 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats 
add support for renderInfo properties to model entities
 2016-09-02 09:04:56 -07:00
Anthony J. Thibault
21bf931559 eventBridge for web entities. 2016-09-01 16:32:06 -07:00
samcake
ed12b5ffb9 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 12:10:40 -07:00
Anthony J. Thibault
823420ae0a Working web entity keyboard 
* Missing many keys
* Does not dynamically appear and disappear
 2016-08-31 17:57:13 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
samcake
b563e280e4 Commuting the LIghtEntityItem changes correctly to the LightRenderItem 2016-08-31 13:55:41 -07:00
Anthony J. Thibault
2c5bdecca9 Bug fix for touch event crash in qt. 
This was due to a missing touchDevice().
Also, touch events work for non-full screen qml widgets.
 2016-08-31 11:11:49 -07:00
Andrew Meadows
e5b63aa18f remove cruft from updateModel() arguments 2016-08-31 10:54:02 -07:00
Zach Pomerantz
0e9ff04c4c fix layered zone applications 2016-08-30 17:00:02 -07:00
Zach Pomerantz
bb39cdafda fix applyPartial for last zone 2016-08-30 17:00:02 -07:00
Zach Pomerantz
abde84b068 fix async skybox tex loading 2016-08-30 17:00:02 -07:00
samcake
3755a3fc32 Add batch timing information vs gpu 2016-08-29 17:54:17 -07:00
Zach Pomerantz
f30308b68c add deeply nested skyboxes 2016-08-29 13:57:14 -07:00
samcake
165cb8bc39 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-29 09:42:33 -07:00
samcake
4bf93f66df Cleaning up the lights and the light stage 2016-08-26 17:47:20 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00
Zach Pomerantz
996346980d clear the skybox between scenes 2016-08-25 18:08:22 -07:00
Brad Hefta-Gaub
10c465f591 Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering 
Improved web entity rendering
 2016-08-25 16:49:00 -07:00
Anthony J. Thibault
e82f6a90af Improved web entity rendering 
* fading now works properly
* web browsers are now fully opaque.
 2016-08-25 11:04:23 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
e4317adcf1 remove cruft 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
e554712259 remove entities-renderer dependency on physics lib 2016-08-24 22:26:56 -07:00
Andrew Meadows
83426fd5a8 handle transitions to/from STATIC_MESH 
when rendering collision geometry
 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
eb65be5478 remove cruft argument from allocateModel() 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
191b7f0f39 variable namechange: Hull --> Mesh 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Andrew Meadows
499150bbed finish hook alert for new entity collision shape 2016-08-24 22:25:45 -07:00
Andrew Meadows
b2dfa49a6f stubbery for alerting entity that shape changed 2016-08-24 22:25:45 -07:00
Anthony J. Thibault
b2dff8aa77 Easier to click buttons on web entities with shaky hand controllers 
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees.  See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE

* Fix for warnings when clicking on window.open() links in WebEntity
 2016-08-23 10:19:49 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js 
Also, cap the maximum webEntity texture size to 4096
 2016-08-23 10:10:27 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration 
handControllerGrab and web entity input integration
 2016-08-23 09:59:25 -07:00
Brad Hefta-Gaub
0397c6b6ca Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data 
workaround bad FBXMesh data rather than assert
 2016-08-22 14:21:48 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Anthony J. Thibault
8bb6bb7c6f generalized keyboard focus interface 
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.

* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
 2016-08-19 10:56:52 -07:00
Andrew Meadows
c3f165d9da BufferView::Iterator doesn't support operator< 2016-08-19 10:15:37 -07:00
Andrew Meadows
2ba35e6398 skip non-existant meshes 2016-08-18 11:48:56 -07:00
Seth Alves
15ce40ecf4 merge from upstream 2016-08-18 11:46:02 -07:00
Andrew Meadows
cb9a5466d5 workaround bad FBXMesh data rather than assert 2016-08-18 11:09:48 -07:00
Clément Brisset
d1fb723b01 Merge pull request #8444 from zzmp/fix/skybox 
fix flashing in default skybox, and allow skybox lighting without textures
 2016-08-18 11:07:09 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Ryan Huffman
dae8461773 Fix transparency on procedural shapes 2016-08-16 15:42:17 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
Zach Pomerantz
d6d9871a96 unused var nits 2016-08-16 14:36:54 -07:00
Zach Pomerantz
8c559bc65d use lights from nontextured skyboxes 2016-08-16 13:27:22 -07:00
Brad Davis
d548da02d9 Expose whether nsight is running to the app, disable some stuff under nsight 2016-08-12 22:28:50 -07:00
Anthony J. Thibault
1be434342b Work In Progress snapshot 
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
 2016-08-12 17:11:59 -07:00
James B. Pollack
6da2ea1932 Merge pull request #8409 from SamGondelman/loadingFade 
Fix procedural entity transparency
 2016-08-11 12:02:57 -07:00
SamGondelman
d8545bc7a3 fix procedural transparency 2016-08-10 13:49:35 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
f2ee57f2de light fade 2016-08-05 11:17:02 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Brad Hefta-Gaub
566e0f5dbf Merge pull request #8287 from AndrewMeadows/fix-simple-compound 
fix bug breaking simple-compound shape type
 2016-07-21 18:18:04 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Andrew Meadows
25fdea6bac fix for change of API after rebase 2016-07-13 15:13:35 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Andrew Meadows
72175ae09e fix warnings about implicit casts 2016-07-09 22:55:55 -07:00
Andrew Meadows
207ddcea38 wrap hull about each mesh part 2016-07-09 22:25:28 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Brad Davis
5220b52cd9 Don't trigger entity scripts without scripting interface 2016-07-06 18:13:15 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
Andrew Meadows
15ff7bc731 final hack tweak 2016-07-06 14:35:57 -07:00
Andrew Meadows
301a9f4434 improved hack logging 2016-07-06 14:31:43 -07:00
Andrew Meadows
11ef245671 temp hack for debugging 2016-07-06 14:28:09 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
Andrew Meadows
6cbc566a77 remove debug cruft 2016-07-06 11:53:26 -07:00
Andrew Meadows
33d732c446 construct geometry for new shape types 2016-07-06 10:51:15 -07:00
samcake
9281b28d43 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-01 13:39:12 -07:00
Andrew Meadows
74781c0786 boxify static meshes with too many vertices 2016-06-28 16:36:10 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00