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
Seth Alves
a14ff22df3
update render-land bounds when polyvox moves
2016-11-16 15:10:43 -08:00
Seth Alves
d097fa7982
fix polyvox memory leak
2016-11-16 14:10:50 -08:00
Anthony J. Thibault
066ddad25a
Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20.
2016-11-16 09:39:55 -08:00
Brad Davis
fda2cde006
Fix buffer leak in line entity
2016-11-15 14:16:54 -08:00
Anthony J. Thibault
eb401c125a
Bug fix for blank webEntities during long sessions
...
In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized.
The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext.
The early return did not properly take this into account. Instead we move the increment after the early return and right before the _webSurface is actually created.
2016-11-14 18:01:47 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
samcake
e12040a98a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-04 14:54:18 -07:00
Seth Alves
689fdfb35f
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:42:31 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
Brad Hefta-Gaub
961e17bc48
Merge pull request #8989 from sethalves/fix-polyvox-bitrot
...
fix a couple of minor polyvox problems
2016-11-03 13:43:52 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
Andrew Meadows
cd5826e2ce
load model of new entity with unknown dimensions
2016-11-03 09:03:04 -07:00
samcake
6926cd274c
Merge with upstream
2016-11-02 18:15:08 -07:00
Seth Alves
d0c0cdd82f
polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again
2016-11-02 16:31:34 -07:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
Seth Alves
3ad748cfe2
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 16:41:39 -07:00
Zach Pomerantz
be23668ca8
delete websurfaces on shutdown
2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 11:36:09 -07:00
Anthony J. Thibault
1fc310434e
Fix for crash in QtWebEngineCore when rapidly switching domains
...
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Davis
9523660027
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub
bf732127ca
Merge pull request #8856 from jherico/geometry_ids
...
Remove the use of implicit ids in geometry cache
2016-10-20 08:14:49 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
Brad Davis
61e5e2861e
Rate limit QML web surfaces
2016-10-18 19:29:11 -07:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
samcake
5bb26fdb7f
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-10 15:56:37 -07:00
Brad Hefta-Gaub
798a5cfc9d
Merge pull request #8768 from ZappoMan/nestedSkyboxes
...
fix skybox changing when going between zones
2016-10-10 15:13:33 -07:00
Anthony J. Thibault
e76a7fc577
Crash fix for RenderableWebEntityItem::buildWebSurface
...
Gracefully handle the absence of a gl context. We will continue to retry every render call.
2016-10-10 13:57:54 -07:00
Brad Hefta-Gaub
db5edb530a
fix skybox changing when going between zones
2016-10-09 15:22:35 -07:00
samcake
8a44140e6b
cleaning up the comments from review and trying something to adress the issue that showed up on i5
2016-10-07 16:04:19 -07:00
samcake
92d71a2e37
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-07 10:13:24 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
samcake
e6572a42e3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-05 09:31:55 -07:00
Ryan Huffman
ee50469213
Add collidableOnly arg to findRayIntersection
2016-10-04 20:19:54 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
sam
bda835361a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-03 02:54:11 -07:00
sam
6f2452815c
pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader
2016-10-03 00:08:30 -07:00
Anthony Thibault
a79485f8c2
Fix for crash bug in web entities
...
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
2016-10-01 13:43:49 -07:00
samcake
9b94a025fc
Refining the voxelization of the sphere in the view frustum grid
2016-09-26 18:41:53 -07:00
Seth Alves
dc5e63c4f1
re-enable web entity-items on linux
2016-09-22 10:25:26 -07:00
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
Andrew Meadows
f444b70fdc
fix collision shape for scaled models
2016-06-20 17:29:20 -07:00
Andrew Meadows
ab3548cac0
fix crash
2016-06-20 17:29:20 -07:00
Andrew Meadows
d1752211e6
make implicit casts explict
2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7
add SHAPE_TYPE_MESH and build mesh shapes
2016-06-20 17:29:20 -07:00
Andrew Meadows
9fc77ccfa2
use reference to avoid big copy
2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a
ShapeInfo name changes
2016-06-20 17:29:20 -07:00
SamGondelman
8a682450a9
still trying to fix cmake errors
2016-06-10 17:01:22 -07:00
SamGondelman
53435fc730
removed extra argument
2016-06-10 14:04:33 -07:00
SamGondelman
da98ee0916
reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition
2016-06-10 13:42:19 -07:00
SamGondelman
24e5000aeb
exposed orientation and eye position to procedural entity shaders
2016-06-08 18:26:54 -07:00
Andrew Meadows
2a3da60ed4
remove some magic numbers
2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3
build compound sub meshes shapes with less copying
2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3
don't copy points onto itself
2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c
swap order of if-else blocks
2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88
remove RenderableModelEntityItem::_points
...
use ShapeInfo::_points instead
2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub
c85923c69b
Merge pull request #7956 from jherico/web_entity_crash
...
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Davis
cc85ce9c01
fix crash on click on non-visible web-entity
2016-06-02 16:37:45 -07:00
samcake
1dca62f752
Introducing a new technique for normal packing and fixing a bug on the normal buffer format
2016-06-01 17:51:53 -07:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
Seth Alves
76f4a25694
move code that clears old scale and registration to after model is loaded
2016-05-20 11:40:46 -07:00
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub
67891abf17
Merge pull request #7877 from Atlante45/fix/asset-client
...
Fix Asset Client crash
2016-05-18 11:37:34 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -07:00
Chris Collins
b2ece6f4a7
Merge pull request #7882 from zzmp/fix/script-thread-dtor
...
Wait and cleanly exit the scripting thread
2016-05-16 16:52:54 -07:00
Seth Alves
a0c3224705
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-16 10:56:09 -07:00
Seth Alves
2a5efd3b82
Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta
2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f
Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor
2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c
Mv entities script engine deleter to fn
2016-05-16 10:40:11 -07:00
Seth Alves
3876a8037c
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-16 09:51:20 -07:00
Atlante45
0878d87ac7
remove some unnecessary dependencies
2016-05-14 14:50:02 -07:00
Brad Davis
9509e32928
PR feedback
2016-05-14 08:28:51 -07:00
Zach Pomerantz
2140dc77b3
Rename wait and unload in best thread
2016-05-13 16:14:22 -07:00
Seth Alves
bfac7c6f68
Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 13:33:39 -07:00
Seth Alves
ceb6aa582f
don't crash when a moving model entity is deleted
2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d
don't crash when a moving model entity is deleted
2016-05-13 13:32:00 -07:00
Seth Alves
81af0d0a47
Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 09:41:56 -07:00
Seth Alves
574709824e
oops
2016-05-13 09:41:19 -07:00
Seth Alves
dabecb7cc2
merge from other branch
2016-05-13 07:11:57 -07:00
Seth Alves
79141e3869
dry up some code
2016-05-13 07:06:25 -07:00
Seth Alves
eb19c5be13
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-13 07:04:58 -07:00
Seth Alves
dd2a29aace
when a ModelEntityItem moves, also update its meta-render-item
2016-05-12 18:05:28 -07:00
Seth Alves
30fb9349c4
dry up some code
2016-05-12 17:52:40 -07:00
Zach Pomerantz
806d06b552
Wait on old entity script engines in threadpool
2016-05-12 17:51:40 -07:00
Zach Pomerantz
7e82494a66
Add cap on entities scripting thread stop time
2016-05-12 17:51:37 -07:00
Zach Pomerantz
f40fe88ee7
Clean up entity script engine deletion
2016-05-12 17:51:36 -07:00
Seth Alves
c9c619916c
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-11 19:37:57 -07:00
samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
Seth Alves
356ccdba26
debug icon for clientOnly
2016-05-10 16:16:06 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Andrew Meadows
59c6a6dfea
Merge pull request #7825 from sethalves/linux-qol
...
Linux qol
2016-05-09 15:34:10 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Seth Alves
0ab0409979
revert accidental change
2016-05-07 17:48:37 -07:00
Seth Alves
91ff851bf8
fix call to queueEditEntityMessage
2016-05-07 16:59:54 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Seth Alves
073d845bb5
show with debug icons when someone else is the simulation owner
2016-05-05 18:33:01 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Seth Alves
cb523a3a71
disable webSurface differently
2016-05-05 16:01:05 -07:00
Seth Alves
b5a3baf322
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-05 15:55:37 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
Seth Alves
ef85cc7803
hook up zone flyingAllowed flag to character controller
2016-05-01 14:47:12 -07:00
Zach Pomerantz
13945aa4d9
Annotate all virtual fns with override
2016-04-30 13:48:59 -07:00
Zach Pomerantz
bc8a171fde
Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch
2016-04-27 11:55:24 -07:00
Andrew Meadows
b5ad989811
more optimized uses of EntityItem::getDimensions()
2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub
b597f7001b
fix auto resize
2016-04-26 15:13:11 -07:00
Seth Alves
c9df446879
web-entities don't yet work right on Linux
2016-04-24 08:15:10 -07:00
Seth Alves
e2025b0d1f
lock entity-tree before accessing entities
2016-04-21 15:27:15 -07:00
Zach Pomerantz
c096b0dfa1
Add TextureType to NetworkTexture for reflection
2016-04-20 20:18:22 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
samcake
cadb53b703
Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more
2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub
55010cebb7
remove unhelpful comment
2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
c26115cf2e
one small tweak
2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub
f6c75d0530
cleanup
2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
d1f6b371c9
cleanup
2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
a4f562672a
cleanup
2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11
switch to using QSharedPointer for _entitiesScriptEngine
2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
87078b1ea2
first cut at resetting entities script engine on domain change
2016-04-16 11:09:23 -07:00
Brad Hefta-Gaub
91334d6a39
Merge pull request #7664 from ZappoMan/reduceJointProperties
...
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Brad Hefta-Gaub
b48503a82d
only export joint values if they've been explicitly set by scripts
2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Brad Davis
8e1e11a6f8
Merge pull request #7615 from zzmp/fix/amd-particles
...
Add explicit layout to textured particle shader
2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub
7ba08dd137
Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix
...
Reading animation properties without an entityTree lock is considered harmful
2016-04-08 10:37:17 -07:00
Zach Pomerantz
4e3ab73941
layout std140 in particle shader
2016-04-07 17:27:51 -07:00
Anthony J. Thibault
8f530ceaf9
Reading animation properties without an entityTree lock is considered harmful
...
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
2016-04-07 13:42:40 -07:00
Zach Pomerantz
1e710712cc
Check entities scripting thread before signaling it
2016-04-06 11:19:07 -07:00
Anthony J. Thibault
6a7a572b53
Model: Toggling Physics > Draw Collision Hulls works again
...
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
2016-04-05 11:06:24 -07:00
Zach Pomerantz
0e9b783ca3
Release skybox texs when not rendering
2016-04-01 14:46:50 -07:00
Zach Pomerantz
e4cba14333
Avoid recreating model items when adding to scene
2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983
Use default texs for empty json
2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3
Rearrange model entity render to reduce flicker
2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f
Fixup model on tex load
2016-03-31 10:46:51 -07:00
Brad Hefta-Gaub
03f9a2b46f
more optimization in find best zone
2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
28978c8adb
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-30 17:49:30 -07:00
Zach Pomerantz
01db2be6b8
Avoid JSON parsing texs every render cycle
2016-03-30 14:48:57 -07:00
Zach Pomerantz
e4f12c81e0
Get remap textures through getter
2016-03-30 14:11:36 -07:00
Brad Hefta-Gaub
32308c7810
Merge pull request #7501 from zzmp/fix/parse-tex
...
Respond to error from free in texture parsing
2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
8a47c5a35f
Merge pull request #7504 from zzmp/log/building-web-surface
...
Log OffscreenQml lifetime
2016-03-29 18:11:16 -07:00
Zach Pomerantz
ad9027f9d6
Log OffscreenQml lifetime
2016-03-29 15:26:22 -07:00
Zach Pomerantz
6c7b6cd62e
Return parsed tex directly as variant
2016-03-29 14:16:22 -07:00
Zach Pomerantz
848e7703ee
Test textures emptiness correctly
2016-03-29 10:50:27 -07:00
Zach Pomerantz
29dedd5524
Update model URL on render thread
2016-03-29 10:42:40 -07:00
Zach Pomerantz
2de94e672b
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-28 14:08:30 -07:00
Philip Rosedale
dfb09f134a
Merge pull request #7476 from ZappoMan/bugFixes
...
fix a couple of model bugs
2016-03-25 15:58:52 -07:00
Seth Alves
f3ba16ab3e
fix locking around polyvox state flags
2016-03-25 14:06:57 -07:00
Seth Alves
d97ab1e2fc
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-25 13:53:01 -07:00
Brad Hefta-Gaub
4ebb114a8e
also fix joint simulation from 3rd party editors
2016-03-25 11:43:32 -07:00
Brad Hefta-Gaub
759fac228c
fix the doppelganger
2016-03-25 11:29:14 -07:00
Brad Hefta-Gaub
6c6131c7b3
fix the doppelganger
2016-03-25 11:22:54 -07:00
Brad Hefta-Gaub
984d6ae48f
fix model resizing bug
2016-03-25 10:46:14 -07:00
Zach Pomerantz
5d306a74d5
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 10:09:37 -07:00
Seth Alves
ae6d6f4bb3
added comments, minor cleanups
2016-03-24 21:37:46 -07:00
Zach Pomerantz
413c3b88cf
Accept textures as list or json
2016-03-24 19:40:02 -07:00
Seth Alves
1b88284bf7
more threading cleanups
2016-03-24 19:14:25 -07:00
Seth Alves
f8fe7b5868
add back getMesh call
2016-03-24 17:22:34 -07:00
Seth Alves
6abed67c05
cleanups
2016-03-24 15:46:30 -07:00
Seth Alves
7c910fcf5e
further reworking of polyvox threading
2016-03-24 15:28:19 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Seth Alves
bd178640f1
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 09:51:31 -07:00
Seth Alves
462da3aaf3
don't call getMesh from render
2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554
redo polyvox locking
2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
3fa3b40f43
fix non-animated motor proteins
2016-03-23 15:56:31 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Seth Alves
f8b8877369
coding standard
2016-03-20 17:37:06 -07:00
Seth Alves
d4ed9993b2
don't spam log when a zone is invisible
2016-03-20 15:06:17 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Chris Collins
307a0cf05a
Merge pull request #7349 from zzmp/fix/guard-skybox-tex
...
Guard against failure to load skybox tex
2016-03-16 15:06:52 -07:00
Brad Hefta-Gaub
d840e68f05
Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change
...
Reregister and scale after model change
2016-03-16 08:04:42 -07:00
Brad Hefta-Gaub
870677a223
Merge pull request #7339 from samcake/red
...
Less jittering at far distance
2016-03-15 15:39:33 -07:00
samcake
f3daa9e1c5
Fixing the lighting issue in stereo
2016-03-15 14:35:43 -07:00
howard-stearns
ddc658af5f
After a modelURL change to an existing model, allow the model to be
...
snapped and scaled to the existing entity registration and dimensions.
2016-03-15 12:20:51 -07:00
Howard Stearns
010aaa55c0
const ref
2016-03-14 22:13:26 -07:00
Howard Stearns
d7e3699bc8
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-14 17:45:52 -07:00
Seth Alves
908481d5d4
merge from upstream
2016-03-14 11:15:16 -07:00
Zach Pomerantz
b6322164cf
Guard against failure to load skybox tex
2016-03-14 11:15:06 -07:00
Seth Alves
dbd548a8c7
fix a crash
2016-03-13 11:01:11 -07:00
howard-stearns
8799bf2d55
Alternative implementation, which only selects visible bestZone.
2016-03-11 16:36:13 -08:00
Seth Alves
01659cf93b
try, try again
2016-03-11 16:21:20 -08:00
Seth Alves
2ad15f7568
try harder to get queryAABoxes to be correct
2016-03-11 14:38:31 -08:00
Seth Alves
f611d8f747
if needed, set querryAACube when dimensions are updated
2016-03-11 12:41:18 -08:00
howard-stearns
e538edba0a
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0
Respect zone visibility property.
2016-03-11 10:19:44 -08:00
Zach Pomerantz
40378920b1
Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex
2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834
Merge pull request #7320 from zzmp/feat/shader-includes
...
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Zach Pomerantz
d7d351fc63
Guard against unloaded env cubemaps
2016-03-10 12:50:52 -08:00
Zach Pomerantz
d615e2e83b
Avoid redundant zone updates
2016-03-10 12:27:45 -08:00
Zach Pomerantz
1640314076
Use one procedural for skybox (avoid copies)
2016-03-10 10:12:22 -08:00
Zach Pomerantz
74e1d32221
Reuse procedural on skybox
2016-03-09 19:40:27 -08:00
Zach Pomerantz
40fbe2d1e5
Reuse procedurals on entities
2016-03-09 17:34:03 -08:00
Andrew Meadows
592d29fc7c
Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration
...
fix collisions with non-default registration
2016-03-07 15:46:13 -08:00
Seth Alves
40c953e0b9
fix model hulls
2016-03-07 11:40:18 -08:00
Seth Alves
8b8604f9b0
move offset handling for models back to how it was before this PR
2016-03-07 11:32:25 -08:00
Seth Alves
c95d1f68f6
remove debug print
2016-03-06 14:38:03 -08:00
Seth Alves
5c585acd9a
offset is included in shape key for models
2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832
fix polyvox hull when registration changes.
2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54
cleanups
2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394
this seems to be working now. more cleanups to come
2016-03-06 12:59:33 -08:00
Seth Alves
8bc2c76a8b
change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape
2016-03-05 08:01:30 -08:00
Seth Alves
5bb50c7ea0
track api change in packDeferredFragment
2016-03-04 17:01:54 -08:00
Seth Alves
9346171695
if entity registration isn't default, adjust physics shapes to match
2016-03-04 16:47:30 -08:00
samcake
16ac69315f
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26
Use keyLight in DLE instead of _skyboxTexture
2016-03-01 14:44:34 -08:00
samcake
630c61e61d
Reflection is working correctly with the PBR property, ship t
2016-02-29 18:54:43 -08:00
samcake
99ba011996
Post merge with Zach work for environment map
2016-02-26 16:04:50 -08:00
Andrew Meadows
c4798870d5
Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix
...
Crash fix for RenderableBoxEntityItem::render
2016-02-26 10:25:50 -08:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
samcake
610189ded3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 14:14:04 -08:00
samcake
96fb9c4466
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
2016-02-25 14:13:35 -08:00
Anthony J. Thibault
626b170207
Crash fix for RenderableBoxEntityItem::render
2016-02-25 14:10:23 -08:00
Zach Pomerantz
c20bd6cbbc
Update Scene on ZoneEntity update
...
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.
This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b
Avoid double-update of zone
2016-02-25 10:06:19 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Nex Pro
864f00ee61
Fixed inverted particle rendering.
2016-02-24 01:02:17 +00:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2
Render point/spot lights with surface radii
2016-02-22 15:07:08 -08:00
samcake
377ee5a486
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
2c7c6be6a6
fix build buster
2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-02-21 10:10:24 -08:00
Brad Davis
786747c2d7
Properly preserve and restore the GL context after building a web entity
2016-02-20 12:01:34 -08:00
samcake
39a7852979
MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders
2016-02-19 18:43:07 -08:00
Brad Davis
021b86c3fe
Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds
2016-02-19 15:41:40 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
samcake
71863a1550
Fixing the material names
2016-02-16 09:33:24 -08:00
Andrew Meadows
492c026f78
Merge pull request #7102 from zzmp/fix/model-tex-revert
...
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Zach Pomerantz
0e9d696859
Cache renderable model orig texs as QVariantMap
2016-02-15 11:09:10 -08:00
Zach Pomerantz
0903e14b06
Revert model texs when unset
2016-02-12 15:57:24 -08:00
samcake
c4faa091a1
Fixing initialization syntax
2016-02-12 11:31:21 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
James B. Pollack
2889bdd8b2
Merge pull request #7083 from ZappoMan/fixDoublePreload
...
handle two corner cases where preload would get called twice
2016-02-11 16:08:43 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
samcake
6922c9adf0
updating all the entity types when their bound is changing
2016-02-10 16:41:09 -08:00
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
samcake
5ef7a19d67
Drafting a solution to update the render items when ENtity is moving
2016-02-09 18:29:22 -08:00
Stephen Birarda
93530fca72
fix the last of the current override warnings for OS X
2016-02-03 11:08:41 -08:00
Atlante45
7e8ea4dc77
Update primitive instance rendering calls
2016-02-01 18:50:01 +01:00
Andrew Meadows
d25f54485c
fix crash for emtpy modelUrl in ModelEntityItem
2016-01-22 22:01:30 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Seth Alves
edea0320e6
try again to make this thread safe
2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe
call into correct thread to getJointNames on entity
2016-01-19 15:16:58 -08:00
Seth Alves
f265656e74
expose getJointNames for entities to js
2016-01-19 12:55:17 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -08:00
Seth Alves
4232e400cc
add getJointIndex call
2016-01-18 11:15:03 -08:00
Brad Hefta-Gaub
29b9592c8c
Merge pull request #6838 from ctrlaltdavid/20763
...
Fix reading model's "textures" property
2016-01-15 17:02:14 -08:00
Stephen Birarda
275fa1c5c7
fix for override warnings with clang on OS X
2016-01-15 15:41:34 -08:00
Brad Hefta-Gaub
8f8afabbfe
Merge pull request #6811 from Atlante45/master
...
Fix skybox not always rendering correctly
2016-01-13 21:00:48 -08:00
David Rowe
a59cbd1aca
Merge branch 'master' into 20763
2016-01-14 17:25:44 +13:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Atlante45
e8d7411eea
Indentation/Coding Standard
2016-01-12 20:49:38 -08:00
Atlante45
47586e97a6
Stay closer to the old code (Use early exit)
2016-01-12 20:49:25 -08:00
Atlante45
911375b7a1
Don't change apply zone logic
2016-01-12 20:49:25 -08:00
Atlante45
5e41421f9d
Fix for skybox not always loading
2016-01-12 20:49:25 -08:00
David Rowe
6eed6a0bc3
Merge branch 'master' into 20763
2016-01-08 13:13:39 +13:00
Andrew Meadows
e8e965d548
fix crash mode for empty LineEntityItem
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
David Rowe
25309e84b3
Fix interpreting textures properties
2016-01-07 17:30:28 +13:00
David Rowe
f64481c510
Warn user if cannot evaluate model's textures property
2016-01-07 16:47:48 +13: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 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
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
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
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
David Rowe
16d4234d55
Get rid of a couple of multiplies
2016-01-05 15:23:25 +13: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
ef8673610f
debugging
2016-01-04 14:58:13 -08:00
Seth Alves
6c8eb90ee0
debugging
2016-01-04 14:42:37 -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
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -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
Zach Pomerantz
bea18e91aa
Guard against empty polyline index out of range
2015-12-28 15:09:49 -08:00
ericrius1
390dce4613
Adding blacklist
2015-12-24 11:48:40 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -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
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
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
Zach Pomerantz
5a86f0c23f
Nest JS props in SceneScriptingInterface
2015-12-21 14:32:06 -08:00
Seth Alves
76df582a6c
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 14:29:32 -08:00
ericrius1
1cdee11784
Merge branch 'master' into polylineOptimizations
2015-12-21 12:49:00 -08:00
samcake
492572df45
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-21 11:26:15 -08:00
samcake
6bbc94badc
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-21 10:48:55 -08:00
samcake
aef748b894
Adding linear color in Particule system
2015-12-21 10:40:29 -08:00
Seth Alves
1d9a81d5d4
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 09:14:37 -08:00
Seth Alves
d71cecbc61
Merge pull request #6675 from AndrewMeadows/crash-fix
...
fix crash when visiting new domain with gun in hand
2015-12-20 06:24:44 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Seth Alves
13ad6bf2f7
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 14:52:02 -08:00
Seth Alves
1a534ff645
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 13:43:33 -08:00
samcake
f6c80e01e9
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-18 13:23:09 -08:00
samcake
3014b3bd5b
Adding Gamma correction to all the Color coming for the attribute stream if used as color
2015-12-18 12:50:21 -08:00
David Rowe
9a7c0cb182
Typo noticed in passing
2015-12-18 15:12:03 +13:00
ericrius1
2aaefbcfcb
refactoring, adding headers
2015-12-17 11:32:48 -08:00
Seth Alves
489d4099a7
add locationChanged to model entities
2015-12-16 15:21:20 -08:00
Andrew Meadows
c14433979b
fix crash mode when model late to get collision URL
2015-12-16 15:11:47 -08:00
Seth Alves
10b82945a6
formatting
2015-12-16 10:16:01 -08:00
ericrius1
dca83a054e
Changed additiveBlending to emitterShouldTrail
2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c
Going to change additive blending to world position prop
2015-12-15 09:56:28 -08:00
ericrius1
3d782f1307
fixed merge conflicts
2015-12-14 10:11:49 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Brad Hefta-Gaub
63c3f7c1a7
Merge pull request #6637 from Atlante45/warnings-win
...
Warning cleanup
2015-12-12 13:00:55 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
Atlante45
eb8fc2e156
Fix last of the windows warnings
2015-12-11 17:37:36 -08:00
Seth Alves
8ec84bdde8
don't simulate model until it has geometry
2015-12-11 17:35:18 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Atlante45
a07d7494f0
More OS X warning cleanup
2015-12-11 14:20:36 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Seth Alves
3a35df191a
remove an off-brand change
2015-12-10 11:19:26 -08:00
Seth Alves
1467a9d2eb
handle initial simulation of _model
2015-12-10 11:17:40 -08:00
Seth Alves
2dd40beed5
formatting
2015-12-10 10:42:25 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
James B. Pollack
4e93f3ae81
respect visibility yay
2015-12-09 18:26:13 -08:00
James B. Pollack
b4c272aaa1
sam just left
2015-12-09 17:28:45 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
Seth Alves
47df744552
Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready
2015-12-09 12:40:18 -08:00
Seth Alves
4d60c7bbc0
update model location with SpatiallyNestable's locationChanged call
2015-12-09 10:42:32 -08:00
Brad Hefta-Gaub
1356fb15aa
Merge pull request #6591 from jherico/zaan
...
Add sphere and cube triangle counts to displayed stats
2015-12-08 13:27:37 -08:00
Bradley Austin Davis
011a43d5f2
Add sphere and cube triangle counts to displayed stats
2015-12-08 11:08:22 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Atlante45
18198cb6fb
Fix missing override
2015-12-07 08:36:49 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Atlante45
cb758ca6b4
Fix override warnings on XCode 7
2015-12-04 08:55:43 -08:00
Atlante45
180ffcc456
Typo (English is weird)
2015-12-03 15:01:18 -08:00
Atlante45
591025850b
Fix particle shader
2015-12-03 15:01:18 -08:00
Atlante45
bd23a4137e
Move toGlm to GLMHelpers
2015-12-03 15:01:17 -08:00
Atlante45
9c5486fb4b
More particle work
2015-12-03 15:01:17 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
ericrius1
5f881e7650
polylines now take color as a uniform
2015-12-03 13:46:29 -08:00
ericrius1
07430fb75a
Merge branch 'master' into polylineOptimizations
2015-12-02 15:59:32 -08:00
ericrius1
191f7f2c22
no audio for now
2015-12-01 16:22:11 -08:00
ericrius1
71d361ed3b
fixed hydra paint, adding more interactive brushes
2015-11-30 17:06:35 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
Seth Alves
4b5fec4b00
clean up, minimize diff
2015-11-26 08:36:41 -08:00
Seth Alves
4ab2bfa854
clean up, minimize diff
2015-11-26 08:35:28 -08:00
Seth Alves
c96a09976e
Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate
2015-11-26 08:32:17 -08:00
