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
