2501 commits

Author	SHA1	Message	Date
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
SamGondelman	5bbd5b9e52	vec2 conversion	2018-07-10 16:32:49 -07:00
David Back	c4236d7442	allow rendering empty web entity	2018-07-10 13:53:18 -07:00
SamGondelman	ca5ce888f4	parabola triangle intersection	2018-07-09 18:11:57 -07:00
Dante Ruiz	ae03dcb57a	fix parent grab dropping and cullig flickering	2018-07-06 15:42:21 -07:00
SamGondelman	7130b5aa7f	fixing findRayIntersection bugs	2018-07-05 10:27:12 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
John Conklin II	e7d5ea561b	Merge pull request #13469 from hyperlogic/safeLandingFix4 ... Fix for landing on the roof of some domains.	2018-06-27 10:23:35 -07:00
Dante Ruiz	d8834af749	make requested changes	2018-06-26 11:53:45 -07:00
Dante Ruiz	17f4a27ceb	Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2	2018-06-26 10:55:27 -07:00
Anthony J. Thibault	328a485ad1	Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.	2018-06-25 10:38:53 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
Sam Gondelman	afc64a18a1	Merge pull request #13362 from SamGondelman/modelTextures ... Fix transparent textures rendering wrong sometimes	2018-06-21 14:23:49 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
Dante Ruiz	f891c37ac8	fix particle entity	2018-06-20 10:59:19 -07:00
Dante Ruiz	3d4f164a9f	fixing web entity and whitespace cleanup	2018-06-19 16:53:36 -07:00
Dante Ruiz	694c272424	fixed text entity	2018-06-19 16:27:10 -07:00
Dante Ruiz	568ba6f777	fixing shape entity	2018-06-19 14:14:16 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
SamGondelman	9ea65950d5	particles: threadsafe, cleanup, rework initialized logic	2018-06-15 15:45:06 -07:00
SamGondelman	0b79e9f6c7	whoops	2018-06-15 15:13:29 -07:00
Sam Gondelman	225a98129a	Merge branch 'master' into modelTextures	2018-06-15 15:09:32 -07:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
sabrina-shanman	b2ec7f78c1	Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer	2018-06-14 15:49:40 -07:00
SamGondelman	5ac7ced306	cleanup renderable model entity item, fix crash on reload, fix different transparent bug	2018-06-13 17:14:52 -07:00
Ryan Huffman	a558f71fcd	Fix resoruces path URLs not working with Script.resolvePath ... Depending on the context, "/~/" means different things. The ScriptEngine resolves this path to `/scripts`, but everywhere else it resolves to `/resources`. This change forces us to expand those paths instead of storing the "/~/" path, which will be incorrectly resolved once the ScriptEnging is using it.	2018-06-12 16:55:31 -07:00
sabrina-shanman	4c39d08358	Remove "Draw Collision Shapes" option from developer physics menu	2018-06-11 11:03:57 -07:00
sabrina-shanman	440c77905a	Remove functionality for rendering collision meshes directly in the Model class	2018-06-11 11:03:57 -07:00
Brad Davis	380137a660	Fix particle entity shader	2018-06-10 12:15:00 -07:00
SamGondelman	c18602d22e	fix models starting as green boxes	2018-06-07 13:03:56 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
SamGondelman	e6741a363e	add local-only isVisibleInSecondaryCamera flag to entities	2018-05-23 16:35:21 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
SamGondelman	de4a2ca3b2	update procedural skybox on user data change	2018-05-10 18:44:53 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	32086def18	Merge pull request #13091 from samcake/blue ... Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights	2018-05-04 10:25:57 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
samcake	767e6b15f3	Fixing the local lighting on translucents bug	2018-05-03 11:42:06 -07:00
samcake	60a49c3f7c	applying the local lights on translucent fix	2018-05-03 10:37:29 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
Brad Davis	8e42bb8c87	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
Bradley Austin Davis	acb21cc96a	Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"	2018-04-27 10:50:47 -07:00
Brad Davis	e892694bf5	Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity	2018-04-27 08:13:35 -07:00
samcake	5db3eee4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 15:21:43 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
samcake	382161659e	Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork	2018-04-24 11:37:00 -07:00
Sam Gateau	2cae294ab4	Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate ... LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it	2018-04-24 11:22:48 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
Andrew Meadows	e36dbab838	remove unused data member	2018-04-23 12:08:40 -07:00
samcake	3d651de797	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 13:20:19 -07:00
Seth Alves	ba43640950	Merge pull request #12785 from birarda/bug/xcode-warnings ... fix some xcode warnings for unnecessary captured this	2018-04-20 10:30:27 -07:00
Olivier Prat	46a1ff4dd2	Set jitter to O on RenderableWebEntityItems	2018-04-20 12:02:17 +02:00
samcake	d6b6645630	exposing feedback of timing	2018-04-17 18:03:45 -07:00
samcake	b32be91bb1	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-16 13:22:58 -07:00
Sam Gateau	19aa49832b	Merge pull request #12750 from SamGondelman/androidPrimitives ... Forward pipelines for primitives	2018-04-16 11:18:56 -07:00
samcake	bfdde6513f	Mergin with master	2018-04-12 15:45:27 -07:00
SamGondelman	e0b2c076ef	cleanup and fix forward procedural rendering	2018-04-11 13:03:57 -07:00
SamGondelman	d841eeb6e9	Merge remote-tracking branch 'upstream/master' into androidPrimitives	2018-04-10 16:52:08 -07:00
SamGondelman	0c069574c5	forward pipelines for primitives	2018-04-10 15:56:08 -07:00
SamGondelman	bba47ba2b4	materials on client only entities	2018-04-10 11:35:24 -07:00
Sam Gateau	9cb918a4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-09 20:03:26 -07:00
Sam Gateau	476b75488c	Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate ... Workload: low hanging fruit optimization: don't unneccessarily update() entities	2018-04-06 17:38:54 -07:00
Andrew Meadows	b515fd50fc	remove unused data member	2018-04-06 16:52:49 -07:00
SamGondelman	d38dadaf58	possible fix for qml texture leak	2018-04-06 09:34:00 -07:00
Andrew Meadows	ed1761945c	add/remove entities to physics using workload output	2018-04-06 07:22:05 -07:00
samcake	a5ee211dbf	Dirty attempt to capture the owner typefor a payload	2018-04-05 18:04:35 -07:00
Andrew Meadows	4f0980b94b	hook up prototype PhysicsBoundary job	2018-04-05 12:11:57 -07:00
Stephen Birarda	3a8c9de4fb	fix some xcode warnings for unnecessary captured this	2018-04-04 10:38:32 -07:00
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
SamGondelman	5a7e9d8e3e	fix shadows on primitives	2018-03-30 09:48:04 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex ... Materials on primitives	2018-03-21 12:08:24 -07:00
Cristian Luis Duarte	17fddd9e0e	RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface	2018-03-19 15:33:14 -03:00
Cristian Luis Duarte	ee6c65c1ac	Android - Prevent crash when setting the url property to _webSurface.	2018-03-16 12:03:26 -03:00
Andrew Meadows	3a3bc62bd0	Merge pull request #12636 from samcake/workload ... Workload: Applying the transaction model to the Space & Proxies	2018-03-14 16:53:24 -07:00
Brad Davis	baa4dc3383	Don't leave trash web processes when changing web entity urls	2018-03-14 11:38:46 -07:00
samcake	2af88c11f2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 13:35:31 -07:00
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
samcake	7f8948fcce	Merge branch 'workload-master' of github.com:samcake/hifi into workload	2018-03-13 10:49:31 -07:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Sam Gateau	a2993c7cdb	First version wof space working with Transaction & Collection	2018-03-13 01:45:21 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Sam Gateau	e3c8b9c62d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis	2018-03-09 22:24:58 -08:00
Andrew Meadows	2750f3ee71	remove unused cruft and avoid useless work	2018-03-09 08:35:18 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
SamGondelman	19e4fb2355	materials on primitives	2018-03-07 12:22:17 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
Andrew Meadows	7a852a0e31	clear the Space	2018-03-01 12:11:30 -08:00
Andrew Meadows	67c78a2df1	remember list of stale proxies	2018-03-01 10:21:25 -08:00
Andrew Meadows	3ca21dda67	Merge hifi/master of into hifi/workload	2018-02-28 10:28:31 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -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
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Brad Davis	5aa15b5422	Fixing build warnings	2018-02-26 10:17:07 -08:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
humbletim	ec4f9fdc11	fix displayName	2018-02-22 08:31:05 -05:00
humbletim	4fd3d9bf7b	cleanup; formalize data structures	2018-02-22 08:18:38 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -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
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
samcake	33b47f9ae2	Merging with the actual worloadspace managed from the EntityTreeRenderer	2018-02-21 10:34:58 -08:00
Olivier Prat	f53c2f41a5	Merge branch 'master' of http://github.com/highfidelity/hifi into prev	2018-02-21 09:46:38 +01:00
Andrew Meadows	9246f6c24a	render-perf depdends on workload library	2018-02-20 19:15:54 -08:00
Andrew Meadows	c3d08d06ff	remove cruft	2018-02-20 17:50:12 -08:00
Andrew Meadows	e7495d830b	maintain Space proxies for entities	2018-02-20 17:39:05 -08: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
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	9921217807	Shapes casting shadows OK.	2018-02-19 12:32:11 -08:00
Nissim Hadar	6a9bbaf0a5	WIP - clean-up.	2018-02-19 12:00:30 -08:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
David Rowe	9e37230aa1	Miscellaneous code tidying	2018-02-19 12:21:56 +13:00
Nissim Hadar	dc3b03c9bc	Added shadows to shapes - still sucks...	2018-02-16 18:37:47 -08:00
Nissim Hadar	4c1f22f84e	Models and Avatar cast shadows (box doesn't, yet).	2018-02-16 14:01:33 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00