Commit graph

140 commits

Author SHA1 Message Date
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
Andrew Meadows
e93c10b5ee remove cruft 2017-11-14 15:57:17 -08:00
Andrew Meadows
809ff7928e sort and throttle UpdateRenderables 2017-11-14 15:57:17 -08:00
SamGondelman
64665c87b2 replace ids with unsigned ints 2017-10-31 17:07:48 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Brad Davis
27350bd7de Don't add items to the scene graph until they have a valid parent chain 2017-09-20 16:52:23 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
Sam Gateau
589bcc19ce Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer 2017-05-19 17:50:19 -07:00
Atlante45
d292451f91 Remove unnecessary const 2017-04-24 15:43:36 -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
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -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
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
Andrew Meadows
6ef4420f37 remove commented out cruft 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
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -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 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
Andrew Meadows
e5b63aa18f remove cruft from updateModel() arguments 2016-08-31 10:54:02 -07:00
Zach Pomerantz
abde84b068 fix async skybox tex loading 2016-08-30 17:00:02 -07:00
Zach Pomerantz
f30308b68c add deeply nested skyboxes 2016-08-29 13:57:14 -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
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
15ce40ecf4 merge from upstream 2016-08-18 11:46:02 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Zach Pomerantz
8c559bc65d use lights from nontextured skyboxes 2016-08-16 13:27:22 -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
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
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Zach Pomerantz
f40fe88ee7 Clean up entity script engine deletion 2016-05-12 17:51:36 -07:00
Seth Alves
ef85cc7803 hook up zone flyingAllowed flag to character controller 2016-05-01 14:47:12 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -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
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00