Commit graph

67 commits

Author SHA1 Message Date
SamGondelman
15070f6374 fixing fading 2018-08-10 10:52:58 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
Dante Ruiz
d8834af749 make requested changes 2018-06-26 11:53:45 -07:00
Dante Ruiz
568ba6f777 fixing shape entity 2018-06-19 14:14:16 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
2018-02-27 11:33:05 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
humbletim
145a0df082 interim checkin 2018-02-15 14:14:07 -05:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Seth Alves
9bdb89df2e trying to get mirror to work 2018-01-12 07:26:09 -08:00
SamGondelman
4f5727e6b0 add _needsRenderUpdate flag 2018-01-08 17:10:44 -08:00
Andrew Meadows
111480f630 fix bad conflict resolution 2017-11-14 15:57:17 -08:00
Andrew Meadows
809ff7928e sort and throttle UpdateRenderables 2017-11-14 15:57:17 -08:00
Sam Gateau
45e5d91b9d Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model 2017-11-04 20:49:55 -07:00
Bradley Austin Davis
4f5851f420 Reducing needless render updates 2017-10-23 15:31:25 -07:00
Atlante45
6dd49f5c32 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-10 16:53:34 -07:00
SamGondelman
a6b7578c3c start fixing asynch issue, fixes model loading! 2017-10-05 12:30:00 -07:00
SamGondelman
215193ad90 try to improve performance
(cherry picked from commit a5f5f9fc5d)
2017-10-04 13:50:35 -07:00
SamGondelman
a5f5f9fc5d try to improve performance 2017-10-04 12:05:13 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -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
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Olivier Prat
1b8696fdda First draft of custom pipeline on geometry cache 2017-07-13 17:09:49 +02: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
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08: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
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -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
Seth Alves
356ccdba26 debug icon for clientOnly 2016-05-10 16:16:06 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -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
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
samcake
c4faa091a1 Fixing initialization syntax 2016-02-12 11:31:21 -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