Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 23:13:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86676 commits 6 branches 1 tag 1.1 GiB
Commit graph

932 commits

Author SHA1 Message Date
Sam Gateau
66199e9aab Cleaning up the isENabled interface andthe qml 2018-07-11 11:57:18 +02:00
Sam Gateau
07299291fc clarifying the engine inspector and engine profiler 2018-07-06 19:29:06 +02:00
Sam Gateau
2eec5b01fa debugging and fixing the problem to get Config for complex path 2018-07-06 10:53:09 +02:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Sam Gateau
24c5525a90 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-06-27 15:31:00 +02:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID 
Include shapeID in RayPick results
 2018-06-26 10:25:39 -07:00
humbletim
b73a957935 changes per PR 2018-06-25 14:17:33 -04:00
Sam Gateau
f34bdfa12c Merge 2018-06-24 11:51:24 -07:00
Sam Gateau
3a910489c8 Regfining 2018-06-20 16:56:35 -07:00
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
Sam Gateau
6011ef5390 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-06-18 12:50:19 -07:00
Sam Gateau
11a240e2db Exploring the performance profile of the render engine 2018-06-18 12:47:13 -07:00
Andrew Meadows
222756371e set max region radiuses in workload UI 2018-06-18 10:31:41 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
John Conklin II
b43d5287e2
Merge pull request #13286 from ElderOrb/spinbox-bugs 
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
 2018-06-14 10:21:17 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
Alexander Ivash
8d213efa75 introduce test 'controls gallery' application for controls testing 2018-06-04 21:26:56 +03:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
samcake
e4048c8f23 remove extra comments 2018-05-23 15:12:21 -07:00
Sam Gateau
e1690a28e1 Merging with master 2018-05-20 23:04:11 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
samcake
adc8a07d3c Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn 2018-05-16 13:14:14 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
samcake
02be965271 more stuff fixed 2018-05-10 18:10:01 -07:00
Sam Gateau
bf85034f36 Tree view comming together for the engine! 2018-05-10 02:08:19 -07:00
samcake
f08f77098d Adding a true ListView for the engine 2018-05-09 18:28:47 -07:00
samcake
859b187db6 Separate panel for inspecting the engine 2018-05-08 18:17:52 -07:00
samcake
6424b91e86 Templatizing the timeProfiler for the task 2018-05-04 17:58:21 -07:00
Sam Gateau
e1d063e908 Adding the scripts for Jet 2018-05-04 00:01:48 -07:00
samcake
17f8e789fc less warning maybe ? 2018-04-25 15:53:50 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Sam Gateau
f50b2fab2b Exposing timing and regulated radiuses 2018-04-23 22:38:50 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
samcake
9b1a887469 Starting to move dynamically yeah 2018-04-19 17:43:14 -07:00
samcake
9b3d546dad Exposing the on off to use the distance configs 2018-04-19 09:35:57 -07:00
Olivier Prat
3497c93e9a Updated ambient occlusion debug script to be a tablet app 2018-04-19 18:02:31 +02:00
Sam Gateau
fd752a07c1 Proposing a more flexible design for the engine 2018-04-17 02:05:35 -07:00
samcake
2008c61368 more ui test features 2018-04-16 17:58:13 -07:00
samcake
bfdde6513f Mergin with master 2018-04-12 15:45:27 -07:00
Sam Gateau
2ca24485e0 and again 2018-04-12 02:11:47 -07:00
Sam Gateau
d0ed5466be Better experimentation 2018-04-12 01:32:20 -07:00
Sam Gateau
9c4c1bf10f Better experimentation 2018-04-12 00:03:04 -07:00
Olivier Prat
5978158358 Updated debugAmbientOcclussionPass script to tablet app 2018-04-11 17:21:44 +02:00
Olivier Prat
2974e05cf2 Tweaked bloom intensity mix 2018-04-10 11:13:37 +02:00
Sam Gateau
6acda83f5c Bringing the test to the workload ui 2018-04-09 23:13:39 -07:00
samcake
87b3f9bd1f More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:55 -07:00
samcake
72649f5c06 More featuers for the view of the workload and test scrtpts to stress the system) 2018-04-09 17:27:40 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate 
Workload: low hanging fruit optimization: don't unneccessarily update() entities
 2018-04-06 17:38:54 -07:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
samcake
ff5b418ddf Starting to buiuild on the jet component and adding the widget to luci and workload inspectors 2018-04-03 17:21:37 -07:00
samcake
54e2ad06b8 GOing over the jet lib ui and the nightmare that is the js/qml family 2018-04-02 17:59:28 -07:00
Sam Gateau
dada0b9024 Exploring better task job config api that work 2018-04-02 01:09:35 -07:00
Sam Gateau
9e2295525d merging with upstream workload after it s been updated with master 2018-03-31 13:31:20 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Olivier Prat
0c2c09e77b Fixed layout in HMD 2018-03-30 15:22:48 -04:00
Dante Ruiz
420672a769 fix-qml-confict 2018-03-29 11:24:08 -07:00
Olivier Prat
ef63651b2b Duration and timing controls are disabled when event is not time based 2018-03-29 12:07:56 -04:00
Olivier Prat
648e6a6c9b Added description for each event 2018-03-29 10:47:18 -04:00
Olivier Prat
07cb1c1f9e Moved gradient invert checkbox 2018-03-29 10:19:24 -04:00
Olivier Prat
9a7f88cd78 Moved save / load buttons to top 2018-03-28 19:23:09 -04:00
Olivier Prat
6639a245df Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden 2018-03-28 18:20:10 -04:00
Olivier Prat
e4416db06f Added save/file dialog for transition configurations in transition editor 2018-03-28 16:54:53 -04:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
samcake
025730a329 Just merging with master and trying to see the ui working again... 2018-03-26 18:24:01 -07:00
Olivier Prat
6b44d79f90 Proposal to improve fade editing with some extra visual cues 2018-03-20 17:48:41 -07:00
samcake
a678a38211 Merge with master 2018-03-20 17:35:57 -07:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash 
Fix invalid QML surface cache interaction
 2018-03-20 14:26:39 -07:00
samcake
816e7a21c2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-03-20 09:07:41 -07:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa 
Temporal Anti-Aliasing
 2018-03-13 09:03:50 -07:00
Olivier Prat
bafd6340a2 Removed unused fonts in scripts 2018-03-12 14:21:48 -04:00
Sam Gateau
f087bb7623 Adjust the freeze view and start drawing the views better 2018-03-09 01:38:00 -08:00
samcake
4dc3685e35 Cosmetic change to the ui and adding more feature to the ConfigSlider 2018-03-08 14:50:07 -08:00
samcake
87b159e491 merge with upstream, fixed a smal typo bug and clean up the ui 2018-03-07 17:30:11 -08:00
samcake
4a91ac11c9 Adding controls of the regions 2018-03-06 18:19:02 -08:00
samcake
b6b7cb3394 Adressing warnings issue and implementing the independent intersection test per region spheres 2018-03-06 12:39:28 -08:00
samcake
660c4c30e9 Representing the view spheres 2018-03-02 18:22:51 -08:00
samcake
5b8e18f15d Adding the pipeline to render the view spheres 2018-03-01 17:57:44 -08:00
samcake
3a9a93f502 Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item 2018-03-01 13:40:58 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Olivier Prat
d288ebe79e Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased 2018-02-26 18:07:44 +01:00
Olivier Prat
ee253143ff Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-23 14:53:14 +01:00
Olivier Prat
c9a6d6bf14 Added adjustable post sharpen filter 2018-02-23 11:53:05 +01:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Olivier Prat
f53c2f41a5 Merge branch 'master' of http://github.com/highfidelity/hifi into prev 2018-02-21 09:46:38 +01:00
Olivier Prat
9cfe53be3e Merged from orgin taa 2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Sam Gateau
040710807d
Merge pull request #12346 from Zvork/scripts 
Fix transition (ex-fade) debugging scripts
 2018-02-13 09:08:35 -08:00
Olivier Prat
733d36df47 Fixed save / load of fade effect configurations 2018-02-06 17:57:04 +01:00
Olivier Prat
fc1d9319bd Finished correcting transition.qml layouts 2018-02-06 16:31:53 +01:00
Olivier Prat
8c12ab9b76 Used color selectors in transition.qml 2018-02-06 16:19:15 +01:00
Olivier Prat
51ea89ffea Renamed fade scripts to transition scripts and still working on layout 2018-02-06 15:16:50 +01:00
Olivier Prat
2896c32bda Switched debug fade script to app but still working on broken layout 2018-02-05 17:49:31 +01:00
David Rowe
0c0734a255 Remove unused Overlays property, borderSize, and associated code 2018-02-04 14:54:14 +13:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511 
FB11511 - position of log windows should be persistent between invocations of interface
 2018-02-01 12:11:30 -08:00
Alexander Ivash
1ed7d164c4 FB11511 - position of log windows should be persistent between invocations of interface 2018-02-01 01:15:03 +03:00
Olivier Prat
3fa2babec2 Moved cascade frustum pre-computation to single ShadowSetup job 2018-01-31 11:55:46 +01:00
Olivier Prat
f344e44d26 Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time 2018-01-31 10:19:17 +01:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Olivier Prat
6b0b17ff63 Working on better adaptive bias algorithm for shadow 2018-01-26 17:57:20 +01:00
Olivier Prat
9cb5c95fe3 Added velocity buffer to deferredLighting.qml 2018-01-26 15:05:46 +01:00
Olivier Prat
5af4337b0e Merged with master 2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5 Merged with samcake/black 2018-01-25 09:27:48 +01:00
humbletim
51d8b9aea6 update and expand on js unit tests 2018-01-23 03:12:50 -05:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI 
Updated UI to fit Toolkit Standards
 2018-01-22 10:30:48 -08:00
RebeccaStankus
5db5f24043 Updated UI to fit Toolkit Standards 2018-01-19 14:52:44 -08:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
Andrew Meadows
82cab5e4a1 add scripted/qml debug UI for render LOD 2018-01-18 08:53:45 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695 
Remove old ToolWindow code
 2018-01-17 13:43:59 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI 
Fix and improve currentAPI.js
 2018-01-10 17:55:08 -08:00
Nissim Hadar
8e03ecedb9 Added user data for lat/lon. 2018-01-08 11:50:49 -08:00
nissim.hadar
b6bbf1abe1 Added sun intensity modulation as a function of altitude. 2017-12-29 23:47:42 -08:00
Nissim Hadar
9b9295aaec Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight. 2017-12-27 14:17:05 -08:00
luiscuenca
38bfddf786 Added filter for QT autogenerated functions and integrated it to Developers menu 2017-12-21 16:26:06 -07:00
luiscuenca
d93828f2f0 Fix an improve currentAPI.js 2017-12-21 11:50:02 -07:00
samcake
403e77b023 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-12-21 09:17:23 -08:00
humbletim
8c7a8f0df3 expanded Assets scripting interface 2017-12-21 12:04:47 -05:00
samcake
df3b4421f4 Merging 2017-12-18 12:20:56 -08:00
Olivier Prat
0fc496d44c Fixed merge conflicts with master 2017-12-18 15:23:11 +01:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Sam Gateau
013d2e808d Adding the hovering from the mouse from the debugHighlight.js 2017-12-08 03:53:56 -08:00
samcake
1c3b4b0c9b Merging and adding Olivier's fixes to taa 2017-12-07 17:54:58 -08:00
samcake
4c1dea2b30 Remove uneeded files 2017-12-07 17:54:14 -08:00
samcake
ace8e153c2 making sure the ID of an object in the Selection list is unique and more refined debugging 2017-12-07 17:45:40 -08:00
samcake
298b9be0c2 Reinstall highlight debug tool 2017-12-07 16:13:32 -08:00
samcake
65f22f498a remove previous version of debug highlight 2017-12-07 16:09:06 -08:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
samcake
e0110ff7e6 Merging with upstream 2017-12-07 09:23:38 -08:00
Olivier Prat
e0f398dcab Fixed TAA debug script 2017-12-07 10:35:53 +01:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
samcake
5500a6d11c More to come 2017-12-06 18:02:30 -08:00
samcake
1483195285 almost complete setup working, yeah 2017-12-05 18:27:53 -08:00
Sam Gateau
1c5548b77b Color picker in qml 2017-12-05 01:25:30 -08:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
samcake
de410b6833 I need a color editor 2017-12-04 17:29:01 -08:00
luiscuenca
390c59b45c Change menu and minor fixes 2017-12-04 15:29:01 -08:00
luiscuenca
5bf8367126 add resources 2017-11-22 18:17:50 -07:00
samcake
1514cdfb2f extend the set of interface for multi highlight 2017-11-21 17:59:45 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
Olivier Prat
d98dfff0a8 Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage) 2017-11-17 19:25:21 +01:00
Olivier Prat
f8c241c429 Merged disappearing shadow bug fix from pcf branch 2017-11-16 12:19:19 +01:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom 
Bloom
 2017-11-15 15:11:31 -08:00
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow 
Shadow caster culling fix
 2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587 
7587 Lasers resize with avatar
 2017-11-15 09:31:45 -08:00
Olivier Prat
f47a3e7d2c Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake 2017-11-15 09:42:57 +01:00
Olivier Prat
5102c8e1b1 Merged with master 2017-11-14 21:56:00 +01:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
Olivier Prat
ac0e816f8c Cascade selection working on shadow but not in Luci debug mode 2017-11-13 18:42:34 +01:00
Olivier Prat
7515c341ad Merged with PCF fix with dithered filtering 2017-11-13 14:47:35 +01:00
Olivier Prat
dd6b7b04c2 Merged with master 2017-11-13 14:33:59 +01:00
Olivier Prat
fa58cf2e60 Merged with master 2017-11-13 14:07:48 +01:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline 
Multiple Outline Groups
 2017-11-10 15:45:03 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Brad Davis
92a3c209aa Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-10 11:44:29 -08:00
Olivier Prat
103e036b70 Shadow maps rendered in cascades 2017-11-10 18:30:37 +01:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
vladest
02625a6e28 Remove script from engine 2017-11-08 21:53:42 +01:00
vladest
5e32298183 Rework as script=only solution 2017-11-08 18:43:59 +01:00
Olivier Prat
9817cb4c44 Added highlight configuration in HighlightStageSetup job 2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02 Renamed outline to highlight 2017-11-07 11:07:25 +01:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
Olivier Prat
fcf1c301b6 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom 2017-11-03 18:12:15 +01:00
Olivier Prat
fbcb2924e8 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-03 15:08:15 +01:00
Olivier Prat
4b598a6e24 Working stencil mask with object bounding boxes 2017-11-03 14:26:36 +01:00
Olivier Prat
f2444f9a30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-02 09:25:07 +01:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
samcake
7e149fe30d Remove unecessary comments 2017-10-27 15:18:50 -07:00
samcake
715cf301d5 cleaning the layout finally 2017-10-27 12:00:10 -07:00
Sam Gateau
a2765cffbd adjusting the qml again ? i just hate the layout / anchor system 2017-10-26 23:22:06 -07:00
samcake
1dbeac7b88 Adding the idons for Luci and cleaning up the scripts 2017-10-26 19:55:59 -07:00
samcake
79338f4316 removing the the unecessary files and trying using qrc:///qml 2017-10-26 17:12:49 -07:00
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02:00
Olivier Prat
7011fd3731 Removed Mac and Ubuntu warnings 2017-10-23 15:46:11 +02:00
Olivier Prat
43f9db5b70 Fixed small bug due to half texel offset in outline shader 2017-10-23 11:08:13 +02:00
Olivier Prat
2d49cc1a75 Fixed bug in debugOutline script 2017-10-20 12:04:20 +02:00
Olivier Prat
732fe3b8db Improved outline debugging script for easier test plan 2017-10-20 11:32:43 +02:00
samcake
902334e1ec Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-19 12:04:01 -07:00
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
Olivier Prat
410b1904cd Fixed bug in outline.qml that associated outline tab to wrong outline job config 2017-10-19 17:36:16 +02:00
Olivier Prat
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
samcake
b29f276db3 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-18 16:42:30 -07:00
Olivier Prat
f63b4a64b0 Working debugging script with tabs 2017-10-18 16:02:38 +02:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
Nissim
afa93f46e5 Merge branch 'master' into hazeZone 2017-10-17 09:28:07 -07:00
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Olivier Prat
9ed5185a3e Multiple outline group config working 2017-10-17 10:01:06 +02:00
Sam Gateau
74b02a3e9b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-16 20:58:11 -07:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
milad
97c255c59e Fix for fogbugz:8382 to shutdown debug window on reload scripts 2017-10-16 16:12:54 -04:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
Olivier Prat
2658d65814 Preparing for outline color mask 2017-10-13 12:02:21 +02:00
Sam Gateau
18287ed45b Banging my head against qml... 2017-10-13 01:06:40 -07:00
samcake
8994200d01 Trying to integrate the tool scripts as an app 2017-10-12 17:57:30 -07:00
Nissim Hadar
7eb9dade6a Added hazeTestInitialPose.js 2017-10-12 17:03:33 -07:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Olivier Prat
76305c5285 Better debugging options for bloom 2017-10-10 14:49:04 +02:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Olivier Prat
0261265330 Working bloom but still visually unstable with geometry aliasing 2017-10-09 19:17:51 +02:00
Olivier Prat
98d39ff9e0 Merged with master 2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3 Multiple gaussians as Unreal. First draft 2017-10-09 09:35:38 +02:00
David Rowe
596ce8e9c1 Add script that tests setting your listening position and orientation 2017-10-07 21:46:56 +13:00
SamGondelman
b4a3ab9204 fix debugDeferredLighting 2017-10-06 15:46:10 -07:00
Sam Gateau
328d900533 Trying a simpler technique to find the best velocity candidate and cleaning default config 2017-10-05 00:57:17 -07:00
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
Nissim Hadar
d1488ebfad Added .qml and .js for debug 2017-10-02 10:10:29 -07:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
samcake
3adeb80858 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-20 10:18:49 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Cain Kilgore
794f3ca69f Indentation 2017-09-15 06:09:03 +01:00
Cain Kilgore
e86b37f949 Added script for testing 2017-09-15 06:07:50 +01:00
Sam Gateau
c7b8a3ff23 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-10 20:40:20 -07:00
Sam Gateau
278b954d98 Merge branch 'black' of https://github.com/samcake/hifi into black 2017-09-10 20:39:52 -07:00
Sam Gateau
7a3466a200 Adding fonts just because 2017-09-10 20:39:33 -07:00
druiz17
5d1a5eea4c added test file 2017-09-08 13:45:45 -07:00
samcake
05f039a251 Almost there 2017-09-07 17:50:55 -07:00
Sam Gateau
965118aa47 Introducing covariance clipping and it works better, cleaning the controls and debugs 2017-09-07 02:05:06 -07:00
samcake
dbdcef3d33 making the 9 fetch the default for the constraining pass 2017-09-06 17:40:59 -07:00
Olivier Prat
fe357671e1 Removed qmlc files 2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
samcake
3e1c2bdb48 Adding the full code path, starting debugging the problems in hmd, 2017-09-05 18:17:27 -07:00
samcake
e70f261de4 Adding the full code path, starting debugging the problems in hmd, 2017-09-05 18:09:46 -07:00
Sam Gateau
78fee71524 seprating the constraint function 2017-09-05 10:04:49 -07:00
samcake
2035940cc9 Duplicating the qml hif stuff to be able to use the same objects 2017-09-01 15:33:17 -07:00
samcake
b243475cc9 New stuff for better rendering f ui 2017-09-01 15:32:23 -07:00
Sam Gateau
a3f1c487f1 adding disabling of jittering for comparison 2017-08-31 23:42:43 -07:00
samcake
ddb598203e COmparing against fxaa 2017-08-31 18:27:47 -07:00
Sam Gateau
16fbe00ef5 FIxing the jittering projection modification 2017-08-30 22:42:55 -07:00
samcake
af09ae0686 Some more refinment, no clear changes though 2017-08-29 18:12:05 -07:00
samcake
66d35118cb Refining the debugging to better understand the issues 2017-08-28 18:14:46 -07:00
Sam Gateau
0f67f9bc52 Eposing the jitter sequence and debugging it 2017-08-27 22:08:33 -07:00
samcake
878ac64721 adding the qml styles 2017-08-25 17:00:27 -07:00
samcake
21987c4c5d Adding the code for the color clamping 2017-08-25 16:58:05 -07:00
samcake
914db1d5a6 adding the tablet apps 2017-08-24 18:06:07 -07:00
samcake
9335acc887 Merge and a lot of rewriting the color conversion 2017-08-24 18:02:11 -07:00
samcake
051f8c5b40 AH ah moment and exploring using the tablet with html 2017-08-23 18:48:20 -07:00
samcake
4cdbefc440 MOre debugging, adding the find the closest fragment 3x3 2017-08-22 17:44:14 -07:00
samcake
767cccbbb2 Sharing the common resource and shader componenet and introducing debuging feature 2017-08-21 17:43:03 -07:00
samcake
d6e0fd758f Better debugging but now trying to check the velocity buffer fetch point 2017-08-18 18:31:27 -07:00
Sam Gateau
cbf5c25f35 Adding the velocity factor 2017-08-17 01:29:12 -07:00
samcake
2f0eee5e4a introducing the Velocity buffer pass generation 2017-08-15 18:11:23 -07:00
samcake
dfc0bb8bcc Setting up taa job and debug ui 2017-08-14 17:24:08 -07:00
Olivier Prat
1763ecd4c6 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-11 09:38:00 +02:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Olivier Prat
392a99f038 Added some fill parameters. Still need to fix issues with blur changing with screen aspect ratio 2017-08-09 19:18:16 +02:00
Olivier Prat
0f2c41b009 Added outline intensity 2017-08-09 18:27:39 +02:00
Olivier Prat
01a028cbb6 First alpha working version of outline 2017-08-09 18:03:52 +02:00
Olivier Prat
44ee7c4bf1 Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete 2017-08-08 18:41:57 +02:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects 
Added Vive pucks as an input channel and added new puck-attach script
 2017-08-03 17:03:45 -07:00
seefo
67b5921079 Changed puck-attach to make tracked entities collisionless 2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab Updated version of puck-attach.js 2017-08-03 15:08:06 -07:00
seefo
82654c7cda Made requested changed to puck-attach.js 2017-08-02 15:28:26 -07:00
seefo
961f748d87 Fixed a potential bug with puck-attach parenting 2017-08-02 13:08:44 -07:00
seefo
620f1a65c0 New puck-attach script 2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
Leander Hasty
d155c02640 [WL21389] wip and modifications based on comments 
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518

Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.

Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
 2017-07-25 15:20:35 -04:00
LaShonda Hopper
75403124b6 [WL21389] Addresses physics library dependency and has some other fixes (details below). 
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting

NOTE(s):
  This compiles and runs.  Cylinder is spawned and treated as CYLINDER_Y.

TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0 [WL21389] Collision Shapes need to be updated (details below). 
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision.  The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.

ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.

ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system.  This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.

Note(s):
    This is similar to the original approach save translation between entity::Shape and ShapeType
    isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
    directly solves the issue of getting the actual ShapeType used by the time it's needed
    to determine the bullet collision object type created when initializing the physic information.

    Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
    ShapeFactory which handles creating the bullet collision objects when setting up
    physics on the ShapeEntityItems.

Known Issue(s):
    This doesn't compile.  It appears that the Entity Library needs to know about
    the Physics Library.  The naive attempt at providing that link failed to resolve
    all compilation issues.

    Current Error:
    C1083: Cannot open include file: btBulletDynamicsCommon.h:
    No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
       C:\projects\cusack\libraries\physics\src\ShapeFactory.h	15	1	entities

	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/physics/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
	new file:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:07 -04:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
Olivier Prat
b125fba2e1 Removed untested avatar bubble fade code. Made changes as requested by Andrew 2017-07-13 23:04:55 +02:00
Andrew Meadows
de21391062 add script to measure cost of entity lookup by id 2017-07-13 13:30:57 -07:00
Olivier Prat
53a92c1506 Fade edit is working again and time based transitions are garbage collected 2017-07-13 12:31:10 +02:00
Olivier Prat
9758a6ded0 Edition picking again (but without bounding box highlighting) 2017-07-10 17:57:02 +02:00
Olivier Prat
2525fe5869 Working save and load 2017-07-04 17:31:24 +02:00
Olivier Prat
7d851c1cbd Added timing parameters and visual debug of threshold 2017-07-04 12:01:28 +02:00
Olivier Prat
af7957491b Working avater enter/leaves + manual threshold 2017-07-03 12:40:58 +02:00
Olivier Prat
c5ca23f4ea Changing edited fade category properly updates widgets in edit window 2017-06-29 17:14:20 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +02:00
Olivier Prat
8a12d0c106 Fade effect working again for basic enter domain but with various Fade jobs 2017-06-29 08:54:23 +02:00