humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Olivier Prat
b296b96e5e
Merged with master
2018-01-06 10:01:00 +01:00
Olivier Prat
29485b65e5
Fixed potential crash when getting mesh from voxel item
2017-12-22 14:35:19 +01:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
ZappoMan
e5becba4e9
migrate away from updateXXX standardize on setXXX
2017-10-26 20:38:07 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Olivier Prat
e85bb6fd08
Fixed compilation warnings on Mac
2017-07-31 19:19:00 +02:00
Olivier Prat
5f1d45d4de
Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines"
...
This reverts commit 8a2fd01e81
2017-07-31 18:06:51 +02:00
Olivier Prat
8a2fd01e81
Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines
2017-07-31 15:31:37 +02:00
Olivier Prat
e7282c67e6
Removed fade transition on poly voxel entities.
2017-07-31 13:02:42 +02:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
Seth Alves
47ea32f4d3
vertex color support in ModelScriptingInterface
2017-07-23 08:06:26 -07:00
Olivier Prat
dbf0b64dfb
Refactored Fade.slh to take into account differences between instanced draw and normal draw
2017-07-18 12:49:34 +02:00
Olivier Prat
1f14b6ef38
Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering
2017-07-17 17:50:59 +02:00
Olivier Prat
95059e26c1
Fading working on voxels
2017-07-17 14:32:05 +02:00
Olivier Prat
c583de4d96
Fade working on voxel objects
2017-07-13 15:22:10 +02:00
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
Sam Gateau
49779754ff
Remove unecessary shaders and apply the custom shader pipeline to polyvox
2017-07-12 15:50:06 +02:00
Olivier Prat
4256a1f2a7
Preparing for merge with stage. DOESN'T COMPILE!
2017-07-07 15:16:20 +02:00
Olivier Prat
5ab093dc38
Preparing to introducte TransitionStage
2017-07-07 11:01:47 +02:00
Olivier Prat
69a7ec42fd
Added fade state in render::Item
2017-07-07 09:16:54 +02:00
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
Olivier Prat
8a12d0c106
Fade effect working again for basic enter domain but with various Fade jobs
2017-06-29 08:54:23 +02:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
Olivier Prat
cba70e6be0
Fade working on voxel objects
2017-06-08 14:57:09 +02:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -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
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
Seth Alves
6f6343420c
don't crash if entity dimensions somehow include a zero
2017-03-28 10:56:33 -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
ba0c9e405a
cleanup
2017-03-23 10:38:57 -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
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
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
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
