Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:27:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

15157 commits

Author SHA1 Message Date
Brad Hefta-Gaub
f0338690c8 whitespace change 2016-01-06 14:54:50 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Brad Hefta-Gaub
edc132efce fix warning 2016-01-06 12:53:57 -08:00
Zach Pomerantz
bcb01feb94 Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape 2016-01-06 11:46:16 -08:00
Atlante45
b68572fdd0 Cleanup renderShapes render loop 2016-01-06 11:43:17 -08:00
Zach Pomerantz
9bc661adc8 Cleanup for style/dead code 2016-01-06 11:42:58 -08:00
Brad Hefta-Gaub
0b43685f1e Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 11:26:05 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
f3aeaec6a9 Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 10:58:50 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Zach Pomerantz
d8ff133cc6 Fix include in gpu-test 2016-01-05 18:11:24 -08:00
Zach Pomerantz
da50eacaad Resolve Hash const function and include per Jenkins 2016-01-05 18:08:28 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab Merge pull request #6775 from sethalves/fix-polyvox-rendering 
update polyvox shader to track changes in packDeferredFragment
 2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809 Merge pull request #6776 from Atlante45/fix/lambda-crash 
Cleanup web entity connections
 2016-01-05 20:23:51 -05:00
Zach Pomerantz
948dc26d24 Add debug statement for invalid ShapeKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
4eff377258 Change Slots->Slot to be congruous with gpu 2016-01-05 17:20:08 -08:00
Zach Pomerantz
258a414404 Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline 2016-01-05 17:20:08 -08:00
Zach Pomerantz
df54d1dcc9 Fix render::Shape::Pipeline ownership by storing shared_ptr in map 2016-01-05 17:20:08 -08:00
Zach Pomerantz
ad329a9331 Return nullptr if no pipeline is found 2016-01-05 17:20:08 -08:00
Zach Pomerantz
63444aac72 Back to shapeContext, compiling 2016-01-05 17:20:08 -08:00
Zach Pomerantz
cf35974f02 Move shapeContext to jobContext 2016-01-05 17:20:08 -08:00
Zach Pomerantz
dfcb74c3be Split renderItems to Lights/Shapes 2016-01-05 17:20:08 -08:00
Zach Pomerantz
7913ca7f3b Render using ShapeRender, pickPipeline in renderItems 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c725fd1520 Add specialized ShapeRender for deferred 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c0800abdc5 Add virtual ~Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
e96b1fa881 Return copies of local vars in Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
74c4930034 Remove DrawBackround task 2016-01-05 17:20:08 -08:00
Zach Pomerantz
1a3a9be605 Use PipelinePointer for rendering Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
59a354ea8c Change payload interface to return ShapeKey, not MaterialKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
16bb861046 Add render::Shape to abstract ModelRender 2016-01-05 17:20:08 -08:00
Seth Alves
722fe46a27 Merge pull request #6777 from AndrewMeadows/whitespace 
nothing but whitespace
 2016-01-05 17:14:19 -08:00
Brad Hefta-Gaub
2435e160a8 only emit collision events if you're the owner 2016-01-05 16:56:24 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
David Rowe
4d7ed6b68f Whitespace 2016-01-06 13:20:44 +13:00
Atlante45
981c6c7af5 Cleanup web entity connections 2016-01-05 16:08:25 -08:00
Seth Alves
1e69f695b4 update polyvox shader to track changes in packDeferredFragment 2016-01-05 16:06:59 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00
Seth Alves
f7041136ff put new property in right place 2016-01-05 13:26:16 -08:00
Brad Hefta-Gaub
c2f2f950fb Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe 
Make Avatar palm position/rotation accessors thread safe
 2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen 
move alert and confirm to use offscreen ui
 2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857 unmangle merge 2016-01-05 12:21:50 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746 Simplified implementation of ThreadSafeValueCache 2016-01-05 11:08:08 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Anthony J. Thibault
9ea6079c64 Merge branch 'master' into tony/get-palm-thread-safe 2016-01-05 10:16:52 -08:00
Stephen Birarda
ddb8b67267 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-01-05 09:56:05 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 19:17:45 -08:00
David Rowe
16d4234d55 Get rid of a couple of multiplies 2016-01-05 15:23:25 +13:00
Seth Alves
3db68e3151 add model joints to debugging 2016-01-04 18:16:20 -08:00
Seth Alves
2d246a840f better packing for qvector of bools 2016-01-04 18:14:29 -08:00
David Rowe
a265ffb631 Get rid of a couple of if statements and duplicate calls 
Courtesy of Clement
 2016-01-05 15:13:22 +13:00
Seth Alves
0b9f92e50f fix quat (un)packing 2016-01-04 18:01:48 -08:00
Seth Alves
69839b4b16 better packing of qvector of quats 2016-01-04 17:50:25 -08:00
Seth Alves
3026415f03 add some missing property handling boilerplate 2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294 debugging 2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772 debugging 2016-01-04 15:52:58 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
5beba58e5f debugging 2016-01-04 15:05:08 -08:00
Seth Alves
bd35532c5d debugging 2016-01-04 15:02:45 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
Seth Alves
cd92a9fa1a adjust timestamps 2016-01-04 14:51:43 -08:00
Seth Alves
9a708f2e74 try splitting edit into 2 packets 2016-01-04 14:48:49 -08:00
Andrew Meadows
164c649a33 Merge pull request #6681 from howard-stearns/pid-render-limits 
Pid render limits
 2016-01-04 14:47:31 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Andrew Meadows
d2b757d6ad Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy 
Optimize getVertexStream() by using a const&
 2016-01-04 14:31:21 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -08:00
David Rowe
f04222b5ac Merge branch 'master' into 20760 2016-01-05 10:29:04 +13:00
Seth Alves
2147b0d78e fix locking 2016-01-04 12:31:58 -08:00
Seth Alves
c9ed36f9a6 include joint data in script properties 2016-01-04 12:31:45 -08:00
Seth Alves
ef7438958b better debugging prints for model joints 2016-01-04 12:30:55 -08:00
Seth Alves
768934ae11 update entity timestamps when sending joint information 2016-01-04 11:29:15 -08:00
Seth Alves
9e49fcf0a4 include model-joints in debugging output 2016-01-04 11:29:01 -08:00
Ryan Huffman
810da77abe Update ScriptEngine signal exception handling to call hadUncaughtExceptions 2016-01-04 10:34:55 -08:00
Seth Alves
8eef1624cb Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 09:27:59 -08:00
Howard Stearns
9c8a04ce1e Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2016-01-04 09:26:14 -08:00
Brad Hefta-Gaub
5b177404d5 Merge pull request #6749 from jherico/resource_override 
Allow a script to set a resource override.
 2016-01-04 09:17:38 -08:00
Ryan Huffman
f60cd09b45 Add logging of signal slot exceptions in ScriptEngine 2016-01-03 21:12:21 -08:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub
c17e8a6d9e Merge pull request #6753 from jherico/sdl_fix 
Fix SDL breakage due to missing init
 2016-01-03 10:11:19 -10:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
63293d5838 remove commented code 2016-01-03 08:07:31 -08:00
Seth Alves
f5bc58f606 back out off-brand change 2016-01-03 08:00:31 -08:00
Seth Alves
40a25f859a cleanups 2016-01-03 08:00:23 -08:00
Seth Alves
2c21092808 be more careful about locking 2016-01-03 07:59:49 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Brad Davis
a0196f0cde Ensure we don't hang if the QML thread doesn't shutdown 2015-12-31 15:23:39 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Zach Pomerantz
c6e6aceb85 Optimize getVertexStream() by using a const& 2015-12-31 11:51:05 -08:00
Brad Davis
7d71a187d8 Fix SDL breakage due to missing init 2015-12-31 08:47:27 -08:00
Brad Davis
000130617e Allow input devices to break up their mappings into multiple files 2015-12-30 22:28:10 -08:00
Brad Davis
c77b66f88c Make navigation directions into axes 2015-12-30 22:28:08 -08:00
Brad Davis
3eddf8d4a4 Allow and conditionals to be initialized from simple pairs 2015-12-30 22:24:34 -08:00
Brad Davis
4c26627622 Add navigation actions and wire them up in the standard controller 2015-12-30 17:14:40 -08:00
Brad Davis
af132e267f Support a 'nav focus' state to allow joystick / hydra navigation of UI 2015-12-30 17:13:20 -08:00
Brad Davis
e863d4edee Fix SDL breakage due to missing init 2015-12-30 16:48:19 -08:00
Seth Alves
d35bbbb9f2 incorporate changes from #6732 2015-12-30 13:15:36 -08:00
Seth Alves
fe0a656d54 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2015-12-30 12:45:32 -08:00
Seth Alves
4e312dd8f8 undo temporary hack 2015-12-30 12:45:19 -08:00
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Anthony J. Thibault
8f71a5fda5 ModelEntityItem: Fix for missing pre-rotations for animated models. 
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
 2015-12-30 10:17:18 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin 
Support for Perception Neuron
 2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Anthony J. Thibault
feb63772f3 ThreadSafeValueCache added class and method descriptions 
Also, changed callback prototype.
 2015-12-29 17:08:17 -08:00
Anthony J. Thibault
17e6a04aa8 Renamed ThreadSafeValue to ThreadSafeValueCache 
Also bug fixes where I was incorrectly swapping left and right hands.
 2015-12-29 16:35:31 -08:00
Anthony J. Thibault
e7f3f549a5 Avatar getPalm* methods are thread-safe and non-blocking 
Uses newly added ThreadSafeValue template class.
 2015-12-29 15:10:38 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
Zach Pomerantz
bea18e91aa Guard against empty polyline index out of range 2015-12-28 15:09:49 -08:00
Stephen Birarda
a0d6001fa5 actually start domain-server check in timer 2015-12-28 10:54:42 -08:00
Stephen Birarda
2799123b55 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-28 10:46:51 -08:00
James B. Pollack
a133dfa8dd Merge pull request #6738 from ericrius1/rayBlacklist 
Ray-pick blacklisting
 2015-12-28 10:19:52 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb Set up controller poses to match hifi standard skeleton 
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
 2015-12-25 09:57:50 -08:00
ericrius1
8e7dfc07c0 Added logic to blacklist entities from raypicking 2015-12-24 11:59:47 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
Zach Pomerantz
dfa2b8d453 Remove redundant clearColorBuffer from Blit 2015-12-24 10:39:29 -08:00
Zach Pomerantz
687eef37da Move final blit into RenderDeferredTask 
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0  to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
 2015-12-23 18:21:08 -08:00
Anthony J. Thibault
c44f69b370 WIP checkpoint 
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
 2015-12-23 17:13:52 -08:00
Seth Alves
175506bbf1 when a script sets joint-data on a model-entity, send an edit packet 2015-12-23 16:06:04 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -08:00
Seth Alves
29e79c0672 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2015-12-22 18:00:42 -08:00
Seth Alves
d878dde952 whitespace 2015-12-22 17:57:25 -08:00
Seth Alves
1a51c9ddbe remove some unused stuff 2015-12-22 17:56:12 -08:00
Seth Alves
84bcfb7d71 hook up a way for scripts to set model-entity joint state 2015-12-22 17:43:01 -08:00
Anthony J. Thibault
6afe3bae5e Copy Neuron joints into controller poses 
This makes the accessible for controller mapping and to JavaScript.

Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar.  NOTE: the rotations are currently in the wrong coordinate frame.
 2015-12-22 17:21:33 -08:00
Brad Hefta-Gaub
7a09582a65 Merge pull request #6729 from zzmp/fix/reorder 
Reorder RenderContext initializer to avoid -Wreorder
 2015-12-22 17:19:32 -08:00
Brad Davis
88d36487f8 Merge pull request #6727 from samcake/hdr 
Clean up shaders removing  glowIntensity and alphaThreshold legacy
 2015-12-22 15:41:08 -08:00
Zach Pomerantz
df78f895a6 Reorder RenderContext initializer to avoid -Wreorder 2015-12-22 14:54:47 -08:00
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
ericrius1
6fc98bd577 fixed ravestick, merged 2015-12-22 12:03:03 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
David Rowe
24f6cfa018 Fix whitespace 2015-12-22 15:26:41 +13:00
David Rowe
58f1371eba Fix particle radius and rgba start, middle, finish interpolation 
Bezier interpolation of 3 points doesn't intersect the middle value.
Instead, use separate Bezier interpolations for start-middle and middle-
finish, so that the interpolated values intersect the middle value as a
user would expect.
 2015-12-22 15:08:03 +13:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
samcake
757e94ed98 Merge pull request #6715 from zzmp/refactor/scene-render-js 
Clean up interfaces for JS Scene/Render
 2015-12-21 16:50:41 -08:00
Stephen Birarda
74d1685617 remove an extra space 2015-12-21 16:45:33 -07:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00