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
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
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
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