Commit graph

256 commits

Author SHA1 Message Date
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
5a5e1ad498 Remove uniforms from polyvox 2018-09-06 08:59:06 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
SamGondelman
7130b5aa7f fixing findRayIntersection bugs 2018-07-05 10:27:12 -07:00
Andrew Meadows
2750f3ee71 remove unused cruft and avoid useless work 2018-03-09 08:35:18 -08:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
humbletim
4fd3d9bf7b cleanup; formalize data structures 2018-02-22 08:18:38 -05:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01: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
Dante Ruiz
9c81909be5 restructures _dirtyFlags name and bits 2018-01-30 16:42:08 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
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
Sam Gateau
d6e771f01d Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid 2018-01-13 10:02:53 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01: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
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05: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