Olivier Prat
b652d94a43
Added fade on poly line entities
2017-07-19 17:11:06 +02:00
Olivier Prat
0319a16e24
Modified PolyLines to use the new custom pipeline system
2017-07-19 16:40:20 +02:00
Olivier Prat
abc751ef9c
Fade seems to be working on shape items with instanced drawing.
2017-07-18 18:25:54 +02:00
Olivier Prat
3316be4dea
Working fade parameters through instanced draw calls
2017-07-18 17:01:17 +02:00
Olivier Prat
dbf0b64dfb
Refactored Fade.slh to take into account differences between instanced draw and normal draw
2017-07-18 12:49:34 +02:00
Olivier Prat
236270d798
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-18 10:47:21 +02:00
Zach Fox
96f52a9812
First pass at getting overlays to show up on hover
2017-07-17 17:05:16 -07:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
147474e19a
Logging category and filter
2017-07-17 11:17:59 -07:00
Olivier Prat
1f14b6ef38
Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering
2017-07-17 17:50:59 +02:00
Olivier Prat
f8b2ffe359
Removed transparency on fading shapes
2017-07-17 15:06:32 +02:00
Olivier Prat
db7871fca7
Merge branch 'fadevoxel' into fadeshape
2017-07-17 14:33:00 +02:00
Olivier Prat
95059e26c1
Fading working on voxels
2017-07-17 14:32:05 +02:00
Olivier Prat
76dd421ecd
Merge branch 'fade' into fadevoxel
2017-07-17 12:00:10 +02:00
Olivier Prat
146f934019
Cleaned up shader code as fade position is now world position
2017-07-17 11:59:10 +02:00
Olivier Prat
290d106cf4
Shapes are working again. Had to re-specialize all the payload hooks for ShapePayload::Pointer...
2017-07-17 11:37:50 +02:00
Olivier Prat
5e5148ca91
Merge branch 'fade' into fadeshape
2017-07-17 09:53:26 +02:00
Olivier Prat
61de99dfe8
Merge branch 'fade' into fadevoxel
2017-07-17 09:42:14 +02:00
Zach Fox
e602d3610e
Initial commit for HoverOverlayInterface
2017-07-14 17:26:53 -07:00
Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Olivier Prat
93218da473
Fixed compilation errors on Mac and Linux
2017-07-13 17:51:16 +02:00
Olivier Prat
1b8696fdda
First draft of custom pipeline on geometry cache
2017-07-13 17:09:49 +02:00
Olivier Prat
c583de4d96
Fade working on voxel objects
2017-07-13 15:22:10 +02:00
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
Sam Gateau
49779754ff
Remove unecessary shaders and apply the custom shader pipeline to polyvox
2017-07-12 15:50:06 +02:00
Sam Gateau
98cc8c0683
Refining the custom shader pipeline design and registration mechanism
2017-07-12 14:13:58 +02:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
Olivier Prat
aba8be595e
Separated fade categories from transition event types
2017-07-11 11:37:24 +02:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
Olivier Prat
cc4e168369
Working fade again
2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c
Some objects fade and fixed crash due to invalid meta item id
2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a
First working fade
2017-07-10 15:27:09 +02:00
Sam Gateau
0c3755483b
adding assert or checks whenever getting a scene stage
2017-07-10 12:37:26 +02:00
Sam Gateau
c3dd25e499
Drafting the mechanism to add shape pipeline
2017-07-07 18:26:10 +02:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Olivier Prat
4256a1f2a7
Preparing for merge with stage. DOESN'T COMPILE!
2017-07-07 15:16:20 +02:00
Olivier Prat
5ab093dc38
Preparing to introducte TransitionStage
2017-07-07 11:01:47 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Olivier Prat
69a7ec42fd
Added fade state in render::Item
2017-07-07 09:16:54 +02:00
Olivier Prat
5cee2cff9f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-07-04 17:48:07 +02:00
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +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
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Brad Davis
28d727153b
PR feedback
2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Sam Gateau
904f22985c
CLeaning up comments
2017-06-26 16:43:04 +02:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
Sam Cake
07e18eb3a8
Keep cleaning up the DeferredLightingEffect , removing stage s from there...
2017-06-22 01:12:32 -07:00
Atlante45
49623fefd8
Fix Skyboxes sometimes not showing
2017-06-21 11:40:32 -07:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Olivier Prat
ef60f78d2b
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-14 10:16:02 +02:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
howard-stearns
3d4f9be05b
fix teleport vs stuck-in-floor work
2017-06-12 17:01:13 -07:00
Olivier Prat
cba70e6be0
Fade working on voxel objects
2017-06-08 14:57:09 +02:00
Olivier Prat
20d4fcbbc7
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
2017-06-08 09:24:12 +02:00
howard-stearns
fa74daf875
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-07 16:43:25 -07:00
Brad Davis
171d3212fe
Merge pull request #10623 from jherico/qml_engine_singleton
...
Migrate to single QML engine
2017-06-06 15:00:43 -07:00
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Howard Stearns
3d62900daf
When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.
2017-06-03 16:49:16 -07:00
samcake
14f9a9848e
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-01 18:05:47 -07:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
Sam Cake
d19956f93c
Fixing warnings
2017-05-31 22:02:47 -07:00
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -07:00
samcake
cba913c068
Fixing the case when the bound changes without the rest of the properties
2017-05-25 13:01:54 -07:00
Zach Fox
f2fab57187
Update conditional to handle 'other unowned' case
2017-05-25 13:01:40 -07:00
Zach Fox
be39874999
Changes after discussion with Brad
2017-05-25 13:01:40 -07:00
Zach Fox
f6195cdb1e
Committing checkpoint changes, then testing
2017-05-25 13:01:40 -07:00
Zach Fox
4d791211ee
Make the changes - big thanks to Andrew!
2017-05-25 13:01:40 -07:00
Sam Cake
3eb95d2d19
cleaning the commented code
2017-05-25 01:16:45 -07:00
samcake
575d4abdf7
bad include fixed maybe
2017-05-24 17:25:21 -07:00
samcake
c256893575
some clean up:
2017-05-23 18:00:22 -07:00
samcake
e7b808cbc1
Merging with upstream
2017-05-23 12:12:31 -07:00
Sam Gateau
589bcc19ce
Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer
2017-05-19 17:50:19 -07:00
Andrew Meadows
f80e7a3743
less obfuscation
2017-05-19 15:58:54 -07:00
Andrew Meadows
bb4d366c40
use SmartPointer for Zone _model
2017-05-19 15:33:23 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
samcake
2cd2c95940
Adding more debugging tool
2017-05-16 16:12:31 -07:00
samcake
db4387e55d
Trying to mess with the defautl texture for skybox
2017-05-15 17:31:29 -07:00
samcake
8626e1f3d1
Keep fixing the cascading behavior to the zone render item
2017-05-15 17:19:46 -07:00
samcake
bc41be7ec1
Introucing the BackgroundStage to manage the background / skybox in one place
2017-05-09 17:10:05 -07:00
samcake
bbb513220b
Moving forward
2017-05-08 17:33:24 -07:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
samcake
b6c966ef39
Keep iterating on the zones
2017-05-05 18:07:21 -07:00
Sam Cake
db3d634840
Adding the change notifications
2017-05-05 00:11:22 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
samcake
64317f5fd0
Adding a light item per zone
2017-05-04 16:47:03 -07:00
Andrew Meadows
ac6d4969d6
Merge pull request #10270 from Atlante45/fix/unload
...
Fix entity script unloads
2017-04-26 11:42:14 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Atlante45
ad16a935e9
Texture::create returns shared pointer
2017-04-25 15:56:23 -07:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
Atlante45
24f4107c92
Unload script when replaced with empty URL
2017-04-24 15:56:37 -07:00
Atlante45
d292451f91
Remove unnecessary const
2017-04-24 15:43:36 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
samcake
79bcf95792
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-11 10:00:34 -07:00
Seth Alves
b99959c73d
munge collision-hull at last minute rather than store munged url as a property
2017-04-11 07:00:22 -07:00
Seth Alves
8a3a52cbcf
make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool
2017-04-10 13:54:24 -07:00
Seth Alves
6bd841857f
added a comment
2017-04-10 13:50:36 -07:00
Seth Alves
717436e0fd
use QUrl rather than just munging the url with a string-append
2017-04-10 10:54:30 -07:00
Seth Alves
554b23357c
add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls
2017-04-10 10:14:36 -07:00
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
Seth Alves
03065ee6c8
Merge pull request #9938 from kunalgosar/jsRenderBug
...
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Brad Davis
15f7e895aa
More thread safety
2017-04-04 15:09:21 -07:00
kunalgosar
19ab7526d3
apply profile to relevant entities
2017-04-04 11:54:21 -07:00
Brad Davis
d89104f69c
Use getters instead of direct member access
2017-04-04 10:50:55 -07:00
Seth Alves
6080c4782a
fix polyvox shader
2017-03-28 16:44:31 -07:00
Seth Alves
4516ddf855
Merge pull request #9847 from highfidelity/tablet-ui
...
Tablet ui
2017-03-28 14:48:02 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
6f6343420c
don't crash if entity dimensions somehow include a zero
2017-03-28 10:56:33 -07:00
Seth Alves
7641677902
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-28 10:14:49 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Seth Alves
8da91695df
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-27 20:15:54 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Seth Alves
d0c8994a8c
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 09:51:40 -07:00
Seth Alves
5ed0ff729b
cleanups
2017-03-27 07:25:40 -07:00
Seth Alves
2682586c38
some clean-ups and a bug fix in PolyVox to mesh code
2017-03-27 06:50:06 -07:00
Seth Alves
c21b8b4eac
raise max mesh count for static collision entities from 500 to 1000
2017-03-26 08:48:08 -07:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Seth Alves
59da607d07
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-24 15:08:23 -07:00
Seth Alves
0d2e0eb9c3
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
...
Avoid deadlock on 10k mesh fbx
2017-03-24 12:34:37 -08:00
Seth Alves
8f7f5efade
new javascript call: Model.newMesh()
2017-03-24 12:51:00 -07:00
Seth Alves
aaa78d108b
if a model has too many meshes, give up.
2017-03-24 11:17:24 -07:00
Clément Brisset
5ff7dbb254
Merge pull request #9991 from Atlante45/fix/entity-bad-url
...
Show entity bounding box for bad URLs
2017-03-24 10:56:06 -07:00
ZappoMan
ddd0645453
fix merge issue
2017-03-24 09:59:11 -07:00
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
aa1883ba85
Merge pull request #9979 from jherico/crash_fix
...
Fix crash in render-perf-test
2017-03-24 08:10:37 -07:00
Atlante45
4f8d9b190b
Show green box when model entity has bad url
2017-03-23 17:56:33 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Seth Alves
ba0c9e405a
cleanup
2017-03-23 10:38:57 -07:00
Seth Alves
f5680def55
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-23 09:55:41 -07:00
Seth Alves
93992bb427
Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2
2017-03-23 09:55:35 -07:00
Seth Alves
ce9bb439b3
change Model api in anticipation of more than just PolyVox being able to give meshes to javascript
2017-03-23 09:55:30 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Brad Davis
944255a37b
Fix crash in render-perf-test
2017-03-22 22:44:05 -07:00
Seth Alves
df875ab504
make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches
2017-03-22 16:21:45 -07:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
ac309df3d1
Merge pull request #9946 from sethalves/model-scripting-1
...
Model scripting
2017-03-21 09:26:32 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Seth Alves
67507f1f05
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-20 09:37:53 -07:00
Seth Alves
98cae8d152
added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript
2017-03-20 09:37:46 -07:00
Chris Collins
308c134119
Merge pull request #9686 from humbletim/21114-part3
...
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-19 21:17:30 -08:00
Seth Alves
b876d22e46
fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels
2017-03-18 22:36:24 -07:00
Seth Alves
35c38b8130
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1
2017-03-18 10:18:27 -07:00
samcake
e1a0984fed
Merge pull request #9906 from samcake/red
...
Expose rendering in wireframe mode
2017-03-17 17:09:44 -07:00
Seth Alves
b3603ce8b3
Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now
2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub
a75acd139b
Merge pull request #9885 from sethalves/model-scripting
...
Model scripting
2017-03-17 13:13:17 -07:00
Seth Alves
16c3eb62b1
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1
2017-03-17 08:54:32 -07:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
Seth Alves
200550aba9
ModelScriptingInterface::appendMeshes
2017-03-16 15:22:34 -07:00
humbletim
87d62ad1eb
Merge branch 'master' into 21114-part3
2017-03-16 16:39:37 -04:00
humbletim
758c07c7d4
Merge branch 'master' into 21114-part3
2017-03-16 14:29:17 -04:00
samcake
0399249a03
Expeand the wireframe to the primitive entities and the polyvox
2017-03-15 16:58:31 -07:00
Stephen Birarda
0c657a1d55
add parameter to unload to remove entityID from map
2017-03-15 10:57:12 -07:00
Seth Alves
816b0b5cfd
unmangle merge
2017-03-15 09:02:32 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Seth Alves
40b87171a9
quiet warnings
2017-03-14 17:49:39 -07:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
Brad Davis
3bef5ad528
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-13 14:30:25 -07:00
Brad Davis
e94f803b84
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-08 09:03:21 -08:00
Seth Alves
509ce3f2d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub
8ae6f2727d
add support for double click messages to overlays and entities
2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d
Merge pull request #9811 from ZappoMan/triangleSet
...
Cleanup how Models do ray-picking and determination of point inside of convex hull
2017-03-07 14:12:56 -08:00
humbletim
40ba8185a0
* Update per 21114-part2 changes.
...
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
ZappoMan
2a663cbcb1
cleanup
2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409
cleanup use of triangleSet for picking
2017-03-05 19:23:55 -08:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
Seth Alves
cf37845f9e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-02 10:06:38 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Stephen Birarda
b586926d09
Merge pull request #9755 from birarda/master
...
increase max renderable web entity FPS to 30 for Youtube.com
2017-03-01 18:09:16 -08:00
Bradley Austin Davis
fa5b315e09
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-01 15:16:18 -08:00
Stephen Birarda
8562a294fa
cleanup some extra spacing
2017-02-28 13:24:41 -08:00
Seth Alves
6b230bad14
oops
2017-02-27 20:56:25 -08:00
Stephen Birarda
80af749b69
change max FPS for youtube on URL change
2017-02-27 11:09:17 -08:00
Stephen Birarda
d18936ea18
only force youtube web entities to 30 FPS
2017-02-27 09:44:34 -08:00
Stephen Birarda
2ceb3d85bd
increase max renderable web entity FPS to 30
2017-02-27 09:33:49 -08:00
Seth Alves
88c850afa2
voxel-paint paints with capsules rather than spheres
2017-02-26 12:56:17 -08:00
Seth Alves
542cb7ab85
optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket
2017-02-26 09:03:34 -08:00
Seth Alves
6227db9fc0
optimize RenderablePolyVoxEntityItem::setSphere
2017-02-26 08:30:29 -08:00
Seth Alves
422b0bb952
don't set _dirtyFlags if polyvox is collisionless
2017-02-25 21:14:13 -08:00
Seth Alves
7a31a99e3c
back out previous experiment
2017-02-25 21:13:20 -08:00
Seth Alves
1e81edbaea
make a copy of volData before computing the visual mesh
2017-02-25 15:32:08 -08:00
Seth Alves
0e4b0332dd
avoid a rare crash
2017-02-25 11:35:27 -08:00
Seth Alves
76c873ce81
don't compute polyvox shapes if they are collisionless
2017-02-25 11:34:48 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
humbletim
b15956278c
separate out supporting changes into 21114-part2 branch
2017-02-16 07:40:19 -05:00
Seth Alves
792c7ff51f
PointerEvent will now relay keyboard modifiers
2017-02-15 10:41:56 -08:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
Seth Alves
24510ee3fe
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 18:42:56 -08:00
Seth Alves
bb3155ee61
obj file is now produced in /tmp
2017-01-31 14:29:42 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
5131d1edf2
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 09:22:16 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Seth Alves
7d80679652
Merge pull request #9566 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Seth Alves
17514a5022
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 04:57:16 -08:00
Seth Alves
88948fa2b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting
2017-01-30 19:54:50 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Andrew Meadows
6ef4420f37
remove commented out cruft
2017-01-30 13:21:23 -08:00
Andrew Meadows
31861d3192
use inverted collision for B-A event
2017-01-30 13:21:23 -08:00
Andrew Meadows
aa8e7d27db
move depth filtering closer to source
2017-01-30 13:21:23 -08:00
Andrew Meadows
2541bfb1a8
only create collision events for owned entities
2017-01-30 13:21:23 -08:00
Andrew Meadows
8cf7aee009
fix bug: second collision event with bad data
2017-01-30 13:21:23 -08:00
Andrew Meadows
b7cd8827f9
collision events for owned objects only
...
also: fewer entityID lookups for scripted collision sounds and events
2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16
fix an old typo about when to send collision event
2017-01-30 13:19:38 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Seth Alves
d158f6afd1
hook up a way to get mesh out of polyvox
2017-01-28 20:42:14 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Stephen Birarda
a8118e83ff
cleanup debug for safe web entity URLs
2017-01-23 13:54:43 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7
use fromUserInput in web entity URL set to avoid crashable URLs
2017-01-23 11:37:54 -08:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
Atlante45
29b5daba3a
Revert input events script callbacks
2017-01-20 15:30:25 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Atlante45
ff3f175fb7
Fix typos
2017-01-17 15:39:54 -08:00
Ryan Huffman
340eeb94fa
Add return type to lambdas in EntityTreeRenderer
2017-01-17 15:24:14 -08:00
Atlante45
8d199ded15
Check collision against the right owner
2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95
More entity script server work
2017-01-17 13:47:45 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Seth Alves
f0248275ec
Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui
2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2
load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.
2017-01-15 17:04:51 -08:00
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Anthony J. Thibault
6794ed7cc4
Merge remote-tracking branch 'upstream/master' into tablet-ui
2017-01-09 10:37:46 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Anthony J. Thibault
01a96347a5
Updated Web3dOverlay.cpp to work with TabletRoot.qml
2016-12-20 14:40:29 -08:00
Anthony J. Thibault
ec38c4e319
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6
Make tablet.qml work on Web3DOverlay
2016-12-20 12:16:11 -08:00
Brad Davis
d0d6b1f87e
tracing polish
2016-12-20 07:45:35 -08:00
Andrew Meadows
e03e57a480
adding profile stats relating to avatar CPU costs
2016-12-20 07:45:35 -08:00
Ryan Huffman
21bab49f79
Add chrome tracing support
2016-12-20 07:45:35 -08:00
David Rowe
5b8a9c0bcd
Add extra logging for Clara.io asset resizing
2016-12-20 07:43:48 -08:00
David Rowe
e85bc50333
Tidying
2016-12-20 07:38:25 -08:00
David Rowe
e0922cdf4d
Add missing entity hover signal
2016-12-20 07:38:25 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Anthony J. Thibault
a791ddcc22
Tablet can switch to a web url.
...
Help button has been updated to switch to the help.html. It doesn't look good because
the content was authored expecting landscape window, not portrait.
The API is by no means final. But it exposes two methods to JS.
* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.
tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -08:00
Anthony J. Thibault
856791c11d
Made TabletRoot.qml the main tablet qml file.
...
This file uses a Loader node to load, Tablet.qml.
2016-12-19 15:15:16 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
Seth Alves
819e3dc41d
remove some unneeded html special-casing
2016-12-09 10:18:30 -08:00
Seth Alves
6c99b5e9ca
code review
2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Anthony J. Thibault
319bb9ce78
Prototype of Tablet.qml hacked to appear on ALL web entities.
2016-12-08 15:31:00 -08:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
David Rowe
71de106594
Tidying
2016-12-04 15:14:47 +13:00
David Rowe
c6f19b1c4e
Add missing entity hover signal
2016-12-03 20:37:47 +13:00
Brad Davis
12ccbdac0b
Actually render polylines
2016-12-01 19:46:08 -08:00
Brad Davis
5bade2ef9a
Add locking around the code that reads polyline entity data and builds GPU structures for them
2016-12-01 14:14:17 -08:00
samcake
9478f242d8
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-23 10:35:32 -08:00
samcake
3d0b557af6
Fix the bad binding for polyline
2016-11-22 13:01:02 -08:00
samcake
dfc0b7beac
adressed reveiw comments
2016-11-22 10:15:49 -08:00
samcake
31232a1078
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-21 11:30:26 -08:00
Seth Alves
8ee1fac367
don't try to render until mesh is ready
2016-11-18 16:33:48 -08:00
Seth Alves
b2a28147c0
more time
2016-11-18 15:36:29 -08:00
Seth Alves
47062d29f5
cleanups
2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60
cleanups
2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e
hack to avoid crash
2016-11-18 15:24:19 -08:00
Seth Alves
1714d4fe06
fix build
2016-11-18 05:40:57 -08:00
samcake
a07523ca31
Merge with Upstream
2016-11-17 18:31:05 -08:00
Seth Alves
8530156227
experimenting
2016-11-17 16:06:35 -08:00
Seth Alves
028be0f830
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size
2016-11-17 14:14:08 -08:00
Seth Alves
1eb17b9786
fix bug that caused polyvox rendering to mishandle its gpu buffers
2016-11-17 14:11:09 -08:00
Brad Hefta-Gaub
36d8e6d64d
Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix
...
Bug fix for blank webEntities during long sessions
2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub
91f90400a9
Merge pull request #9088 from sethalves/fix-polyvox-memory-leak
...
fix polyvox memory leak
2016-11-17 12:23:13 -08:00
Seth Alves
1f9598f295
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak
2016-11-17 08:44:52 -08:00
samcake
7c003ce865
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-16 19:13:22 -08:00
Seth Alves
697369dece
avoid crash on startup
2016-11-16 16:11:17 -08:00
