2769 commits

Author	SHA1	Message	Date
Bradley Austin Davis	55d819d7e3	Merge pull request #11699 from SamGondelman/ui ... Pointers generate PointerEvents (WIP)	2017-10-31 10:01:15 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -07:00
Nissim Hadar	349e12c065	Merge branch 'master' into hazeZone	2017-10-30 10:08:35 -07: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
Nissim Hadar	420b0f321c	Merge branch 'master' into hazeZone	2017-10-27 09:14:53 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Olivier Prat	dc8c75f403	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-27 15:56:40 +02:00
ZappoMan	e5becba4e9	migrate away from updateXXX standardize on setXXX	2017-10-26 20:38:07 -07:00
SamGondelman	f0c15e874c	merge with master	2017-10-26 14:52:17 -07:00
samcake	b9112024b8	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-26 14:27:23 -07:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
Olivier Prat	186b531be6	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-26 15:12:09 +02:00
Olivier Prat	9eed69d7ef	Trying to pin point a zone bug	2017-10-26 15:11:42 +02:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
samcake	5b0bbbb21e	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-25 13:14:47 -07:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 ... WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -07:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
Sam Gateau	f38fa14a39	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-24 21:00:44 -07:00
Andrew Meadows	29efe53f74	repair debug rendering of collision shapes	2017-10-24 13:23:46 -07:00
LaShonda Hopper	a9fea4c7d3	[WL21389] Minor fix to RenderableShapeEntityItem::doRender (details below). ... Shape isn't guaranteed to be permanent and thus the triangle count isn't guaranteed to be the same since inception, so grab it each time. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp	2017-10-24 14:16:24 -04:00
LaShonda Hopper	5b50b362f1	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). ... This commit adds support for the polyhedrons and polygons sans Torus and Quad which aren't currently supported within GeometryCache. * Moves GeometryCache::_shapes from public to private scope * Nothing aside from the class should be directly altering this, only querying * Updated instances of direct referencing which looks to have been limited to prior testing of instancing and shapes. * Adds an accessor function for ShapeData to GeometryCache * Consolidates point list generation to helper function * GeometryCache::computeSimpleHullPointListForShape * Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from RenderableShapeEntityItem * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape * Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier. * This helps circumvent the issue with library inclusion. entity-render knows about entity; however, entity doesn't know about entity-renderer; however, GeometryCache data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data. * This callback is set up within Application::init of the Interface as it knows about both halves of the equation, and the callback needs to be setup prior to any entities collision data getting generated. * Removes _type reset within ShapeInfo::setPointCollection * This should avoid any issues due to subversively setting the type or incorrectly setting the type as a tangential operation. * Audited instances of ShapeInfo::setPointCollection and all seemed to be calling the function immediately after having set the type via ShapeInfo::setParams * Adds new ShapeType: SHAPE_TYPE_CIRCLE * This type is reserved for the circle which is now treated as a special type of Cylinder_Y with regard to collision as opposed to a simple hull. * Fixes the issue where jumping on a circle, at times, would result in the avatar sliding off towards an edge as if atop a squished cone. * Also updates ShapeInfo::getType() to return ShapeType as opposed to int * Auditing calls showed that majority of places were comparing against ShapeType * ShapeType::_type is a ShapeType so returning the type explicitly is more consistent. * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of ShapeType enumeration. * entity::Quad defaults to SHAPE_TYPE_ELLIPSOID * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within GeometryCache::buildShapes. * Also it appears that a Quad shape can't be created within world via the creation menu. * There's no explicit option at present to create one. * Trying subvert the Cube/Box creation option to generate one results in an enforced stubby box as opposed to a quad. * Given the aforementioned points, entity::Shape::Quad will default to SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX. * Added Todo regarding the shape being unsupported along with a notation to create a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future. * Adds some comments and has some minor clean up. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: interface/src/Application.cpp modified: interface/src/Util.cpp modified: interface/src/Util.h modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/render-utils/src/GeometryCache.cpp modified: libraries/render-utils/src/GeometryCache.h modified: libraries/shared/src/ShapeInfo.cpp modified: libraries/shared/src/ShapeInfo.h modified: tests/gpu-test/src/TestInstancedShapes.cpp	2017-10-24 14:16:17 -04:00
Olivier Prat	a34db5f26d	Shadows are now cast by the current zone key light (sun)	2017-10-24 11:09:36 +02:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Bradley Austin Davis	4f5851f420	Reducing needless render updates	2017-10-23 15:31:25 -07:00
SamGondelman	9bbb2eb692	austin's comments, send events directly to selected web entity	2017-10-23 10:17:45 -07:00
Sam Gateau	50a3ccdbca	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-21 10:01:07 -07:00
Brad Hefta-Gaub	87294b8e67	Merge pull request #11638 from ZappoMan/fixWireframe ... fix the rendering of wireframe for model entities with bad model URLs	2017-10-20 14:29:01 -07:00
Brad Hefta-Gaub	d6ad389dab	Merge pull request #11611 from AndrewMeadows/faster-update-renderables ... Faster renderables update	2017-10-20 13:43:08 -07:00
ZappoMan	ef0ff96a44	fix the rendering of wireframe for model entities with bad model URLs	2017-10-20 11:46:28 -07:00
Andrew Meadows	c79bf3bc04	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
samcake	b29f276db3	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-18 16:42:30 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
Sam Gateau	74b02a3e9b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-16 20:58:11 -07:00
Andrew Meadows	339edc67c8	ifdef out more per-frame-per-entity profiling	2017-10-16 17:27:53 -07:00
Andrew Meadows	1f09c10fb1	comment out more profiling stuff	2017-10-16 16:43:16 -07:00
Andrew Meadows	102a1cb36b	ifdef out detailed profiling	2017-10-16 16:02:11 -07:00
Andrew Meadows	fb1c075a12	fix animating entities	2017-10-16 15:55:25 -07:00
SamGondelman	c6b636901a	fewer undesirable couplings	2017-10-16 13:46:23 -07:00
SamGondelman	d274d99411	merge from master	2017-10-16 12:17:37 -07:00
Andrew Meadows	23bb8608b1	minor optimizations in updateModelBounds()	2017-10-16 11:52:30 -07:00
Andrew Meadows	e109101acc	update profiling timers	2017-10-16 11:52:30 -07:00
Nissim	0a5302ce25	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-10-16 11:01:13 -07:00
Sam Gateau	ec934335dc	CLeaning up the pr regarding the scripts with my branch blue	2017-10-15 22:34:58 -07:00
samcake	a852d5040d	FIxing the zone entity not stacked properly when created	2017-10-13 16:04:48 -07:00
samcake	918e13b2fc	fixing the zone entity not rendering when created or when avatar appears in one	2017-10-13 15:03:23 -07:00
Nissim Hadar	afb8b2d8e7	Merge branch 'master' into hazeZone	2017-10-13 13:40:06 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Nissim Hadar	5bfbaf4860	Renamed HazeMode to ComponentMode.	2017-10-13 11:24:56 -07:00
samcake	8994200d01	Trying to integrate the tool scripts as an app	2017-10-12 17:57:30 -07:00
SamGondelman	cc8ecdc596	put back entity signals for scripts	2017-10-12 17:28:00 -07:00
SamGondelman	0d164363af	cleanup mousePressOffEntity signal	2017-10-12 15:29:29 -07:00
SamGondelman	1a047613bf	fix pointerevents on entities from scripts	2017-10-12 12:31:36 -07:00
SamGondelman	53fde83922	cleaning up pointerevents, wip	2017-10-12 11:21:50 -07:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
Nissim Hadar	832f9fb6e3	Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.	2017-10-11 19:10:51 -07:00
Nissim Hadar	ea6b9ed28e	Removed ...ALTITUDE_MODE from combo.	2017-10-11 18:58:59 -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
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Daniela	a46ef56af9	Merge with hifi:master. Packet Headers version were increased.	2017-10-10 17:26:33 +01:00
Nissim Hadar	c9be5ea100	Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone	2017-10-09 18:01:48 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
SamGondelman	ee02fa9a91	model asks for renderUpdate if animating ... (cherry picked from commit 873ae9b9d6)	2017-10-09 13:55:48 -07:00
SamGondelman	873ae9b9d6	model asks for renderUpdate if animating	2017-10-09 13:36:38 -07:00
Bradley Austin Davis	c92588685b	Merge pull request #11533 from SamGondelman/modelMaster ... Fix model loading for real this time	2017-10-08 10:23:13 -07:00
Nissim Hadar	e02876f1ea	Zone position/direction sent to haze uniform.	2017-10-06 17:24:20 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	3afab3c1d3	Keylight attenuation implemented.	2017-10-05 18:25:02 -07:00
Nissim Hadar	414cae8df7	Implemented haze colours.	2017-10-05 13:29:32 -07:00
SamGondelman	a6b7578c3c	start fixing asynch issue, fixes model loading!	2017-10-05 12:30:00 -07:00
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
Nissim Hadar	ad03301df8	WIP - implementing range+altitude mode.	2017-10-04 23:03:21 -07:00
Nissim Hadar	8b72e3044a	WIP - implementing range+altitude mode.	2017-10-04 22:26:53 -07:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Sam Gateau	69e68ef5ad	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-10-04 18:58:33 -07:00
SamGondelman	3a6e84e681	trying to fix model issue	2017-10-04 17:26:12 -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
Nissim Hadar	2ce86ebfae	WIP - working on byte order in server messages.	2017-10-04 11:56:35 -07:00
Nissim Hadar	c1f4735468	Replaced HazeMode with uint8_t in transport protocol.	2017-10-03 19:39:34 -07:00
Nissim Hadar	48e5b9d1bc	Haze enable/disable from UI works.	2017-10-03 17:42:04 -07:00
Andrew Meadows	46e809bbb2	use a better variable name	2017-10-03 12:35:03 -07:00
Andrew Meadows	ef326a3851	expose performance hot spot in stats details	2017-10-03 12:35:02 -07:00
Nissim Hadar	1cf7f5a732	For testing.	2017-10-03 09:54:44 -07:00
Daniela	1d6985a9eb	Fix Animation hue bug.	2017-10-03 15:25:54 +01:00
Nissim Hadar	93a2776cb5	Changes for debug	2017-10-02 18:13:23 -07:00
samcake	6639287418	Merging with master	2017-10-02 17:03:09 -07:00
Nissim Hadar	cdbf067a24	Rename (haze)getParametersBuffer to getHazeParametersBuffer. ... Add corrections from Sam	2017-10-02 16:54:02 -07:00
Nissim Hadar	29d5e772d4	Removed "..Is.." from various methods.	2017-10-02 12:42:46 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
Nissim Hadar	0acf4b9de9	Working on adding zone to haze.	2017-09-28 23:53:53 -07:00
Nissim Hadar	9d0cf16c20	Fixed Ubuntu warnings.	2017-09-27 19:33:04 -07:00
Nissim Hadar	784f928433	After merge.	2017-09-27 18:46:55 -07:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Nissim Hadar	55fafeacb1	Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!	2017-09-27 17:43:09 -07:00
Daniela	c22d2add17	Resolve conflict with hifi/master.	2017-09-27 17:06:12 +01:00
Nissim Hadar	4d501d6510	Adding HazeStage	2017-09-27 08:01:19 -07:00
Nissim Hadar	2394d0931c	Adding HazeStage	2017-09-26 19:05:11 -07:00
Nissim Hadar	f92707a00c	WIP	2017-09-26 18:08:41 -07:00
Sam Gateau	9317ad38aa	Merge pull request #11462 from highfidelity/game-render-interface ... Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing	2017-09-26 17:40:23 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
samcake	510b446409	mergine with master, resolving conflict	2017-09-26 13:13:46 -07:00
Seth Alves	7397a123c5	Merge pull request #11345 from SamGondelman/textAA ... Text3D Overlays and Entities fixes and no-AA	2017-09-26 12:26:08 -07:00
samcake	b5c942f7f6	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-26 10:47:59 -07:00
Daniela	e264503b9f	Merge remote-tracking branch 'upstream/master'	2017-09-26 17:49:15 +01:00
Daniela	179a426389	Address QA comments.	2017-09-26 17:44:46 +01:00
Andrew Meadows	67481287ff	comment out asserts that fail to compile in Debug	2017-09-26 09:29:43 -07:00
Nissim Hadar	1a9625d272	Merge branch 'master' into hazeZone	2017-09-24 18:27:36 -07:00
Nissim Hadar	543bc5a71b	HazeMode calls Haze::setIsHazeActive.	2017-09-24 18:25:20 -07:00
Nissim Hadar	6cbf087708	First version with combo for Haze Mode.	2017-09-24 15:08:22 -07:00
Nissim Hadar	678b4e35b1	Before replacing "Haze Active" checkbox with "Haze Mode" combo.	2017-09-24 14:06:00 -07:00
Brad Hefta-Gaub	bafb59e691	Merge pull request #11436 from SamGondelman/missingModels ... Fix missing models	2017-09-23 13:56:50 -07:00
Nissim Hadar	c2eea7d40b	Minor cleanup.	2017-09-22 18:37:21 -07:00
Nissim Hadar	736a6aa311	Haze checkbox in UI doesn't disable the UI.	2017-09-22 18:20:35 -07:00
SamGondelman	86198606e0	add _modelJustLoaded and updateTransforForSkinnedMesh on creation	2017-09-22 17:12:44 -07:00
Anthony Thibault	20cb02dabb	Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering ... Fix for TextEntity rendering, the translation was incorrect	2017-09-22 11:19:24 -07:00
SamGondelman	be27376c52	add comment about bottleneck	2017-09-22 10:21:32 -07:00
Anthony J. Thibault	d3c60f3057	Fix for TextEntity rendering, the translation was incorrect ... This was caused by the removal of _dimensions from the SpatiallyNestable scale component.	2017-09-22 09:44:51 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
SamGondelman	9f12d3a365	fix missing models	2017-09-21 17:57:25 -07:00
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Daniela	d054c6dc36	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-21 18:29:45 +01:00
samcake	9a9d13e519	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-21 09:05:46 -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
samcake	3adeb80858	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-20 10:18:49 -07:00
samcake	fd8868f609	Moving the render transform evaualtion in game loop for Models	2017-09-19 17:30:20 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Daniela	1426e10024	Fix texture loading issue with upstream master. Tune amount of points.	2017-09-19 17:47:00 +01:00
Anthony J. Thibault	73ad9051a4	Shapes now render at the correct size.	2017-09-18 15:27:58 -07:00
Sam Gateau	84dfe53fee	Merge pull request #11362 from jherico/crash/model-race ... Ensure thread-safety for model pointer access	2017-09-16 10:45:09 -07:00
Seth Alves	d968bbad6c	Merge pull request #11364 from sethalves/rework-scriptengine-lifetime ... Rework scriptengine lifetime	2017-09-15 12:17:51 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Brad Davis	688ee68cf9	Ensure thread-safety for model pointer access	2017-09-14 12:29:23 -07:00
Brad Davis	aef85eb69d	Fix polyline rendering using default texture	2017-09-14 10:48:14 -07:00
Seth Alves	cf2979dc78	Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime	2017-09-14 10:42:26 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Brad Davis	501eee8b10	Fix transform of polylines with high update rates	2017-09-14 08:45:37 -07:00
Brad Davis	75e7146c5b	Fix polyline crash and flicker	2017-09-14 08:45:36 -07:00
Brad Davis	f4d8216501	Fix race condition accessing QString sub-properties in zones	2017-09-13 18:06:21 -07:00
Andrew Meadows	5741699bab	Merge pull request #11301 from Menithal/21484-Fix ... WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons	2017-09-13 08:05:53 -07:00
Artur Gomes	b65520e788	Merge remote-tracking branch 'upstream/master'	2017-09-13 12:32:17 +01:00
SamGondelman	a955381726	Merge remote-tracking branch 'upstream/master' into textAA	2017-09-12 16:50:16 -07:00
SamGondelman	1b85a453ab	working on text3d overlays and entities	2017-09-12 16:49:51 -07:00
samcake	dbeb4e9b27	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-11 15:25:58 -07:00
Menithal	40d339a831	21484: Updated code to go with PR feedback	2017-09-11 20:36:29 +03:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Bradley Austin Davis	37b184d982	Fix crashes in entity rendering on OSX	2017-09-07 14:32:50 -07:00
Daniela	608e4858fc	Add Fix polyline crash and flicker	2017-09-06 19:06:05 +01:00
Menithal	856452405e	Made Code abit more concise for better compilation	2017-09-05 08:46:37 +03:00
Menithal	119a2703f7	Removed Debug Joints that wasnt used anylonger	2017-09-04 22:20:00 +03:00
Menithal	03e076046b	Added Joint Name check for translations ... This way if there is a mismatch in the skeleton, the translations are applied to the models correctly	2017-09-04 22:16:02 +03:00
Sam Gateau	fd2d246f05	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-02 09:28:24 -07:00
Menithal	5506520226	Fixed missing semi colon	2017-09-01 08:20:54 +03:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Menithal	0e3fc64f63	Fixed Inverse logic and Cleanup	2017-09-01 00:35:56 +03:00
Daniela	42be6434af	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 18:03:39 +01:00
samcake	f031bf5661	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 09:22:19 -07:00
samcake	3a18d09bec	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 08:49:12 -07:00
Zach Fox	fdcc149c34	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 13:27:18 -07:00
Menithal	ea79748ed3	Some adjustments	2017-08-29 23:59:36 +03:00
Seth Alves	7220a6998a	remove unneeded bind-by-ref thing from lambdas	2017-08-28 17:08:59 -07:00
Seth Alves	b9c68f9156	give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup	2017-08-28 17:01:01 -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
samcake	7d8356686c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-28 09:28:00 -07:00
samcake	46c6d52036	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 08:51:06 -07:00
samcake	9335acc887	Merge and a lot of rewriting the color conversion	2017-08-24 18:02:11 -07:00
Sam Gondelman	4e7818180b	Merge branch 'master' into tabletLayer2	2017-08-24 17:56:44 -07:00
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
Zach Fox	edb64b047f	It compiles!	2017-08-22 16:00:44 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
SamGondelman	a904ae1a8a	can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API	2017-08-22 11:41:20 -07:00
Menithal	dc5e374485	Merge remote-tracking branch 'upstream/master' into 21484	2017-08-17 22:28:43 +03:00
Artur Gomes	482924266c	Fix brush texture stretching at start. ... Add some code refactoring.	2017-08-16 18:35:21 +01:00
Artur Gomes	83cdd1739d	Add hue, saturation and brightness dynamic brushes. ... Add continuous drawing mode. Add new brushes. Remove some brushes. Fix animation play distance for when painting in Desktop mode. Fix Hue animation not starting from the chosen color (would always start from red). Fix multiple color polyline.	2017-08-16 18:35:15 +01:00
Artur Gomes	03b70ed492	Do not test! ... Add color qvector to polyline entity to allow for multiple colors through the line. Add some new icons to the tabs of the app.	2017-08-16 18:32:17 +01:00
Artur Gomes	5c40a6810e	Add drawing in Desktop mode. ... Remove dynamic rotation and translation brushes since the movement would be unsynced after a while, resulting in a poor user experience. Fix restoring last used settings taking to long, which caused the user to see the values to change after the tablet application was open. Fix using a different brush after restarting the app, if drawing before the brush was reset.	2017-08-16 18:28:55 +01:00
Artur Gomes	dffbc442be	Add new Interface (more similar to the ui used on other apps) ... Fix brush on repeat mode (keeps the the aspect ratio of the texture)	2017-08-16 18:28:55 +01:00
Delanir	0a97cfd736	Change UVMode updateGeometry Function	2017-08-16 18:25:01 +01:00
Delanir	ed5515a2d4	Add new Property to polyline to enable different uv modes. 2	2017-08-16 18:25:00 +01:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Zach Fox	b8c45b0c30	Don't always do precision picking inside mouseMoveEvent	2017-08-09 14:23:43 -07:00
Menithal	982d4a451f	Updated Protocol to add allowTranslation ... There still is a bug for the value no actually updating	2017-08-08 23:47:37 +03:00
Menithal	34d9e9b371	Preliminary Research Complete ... Found the part that needs updating with the AnimationProperty	2017-08-08 00:03:24 +03:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
Andrew Meadows	e465186511	Merge pull request #11048 from 1P-Cusack/21389 ... WL21389 PR1: Representation of collision shapes need updating (details below).	2017-08-03 09:04:31 -07:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
LaShonda Hopper	0b79809f54	[WL21389] PR1 Feedback: Small change missed last commit (details below). ... Until they're properly implemented, default the hedrons and polygons to SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo. Changes committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp	2017-07-31 17:08:30 -04: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	1336582c6b	Removed fade transition on model entities.	2017-07-31 15:06:24 +02:00
Olivier Prat	e7282c67e6	Removed fade transition on poly voxel entities.	2017-07-31 13:02:42 +02:00
Olivier Prat	027c82c341	Removed fade transition on polyline entities.	2017-07-31 12:44:23 +02:00
Olivier Prat	0415364c0e	Removed fade transition on shape entities. Fixed broken custom shaders on shapes	2017-07-31 12:29:11 +02:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
LaShonda Hopper	cc4fbc97cd	[WL21389] PR1 Update based on code review discussion & feedback (details below). ... * Removed some left overs from prior approach. * Moved _collisionShapeType & getShapeType override from ShapeEntityItem to RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903) * Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID ** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909 Note(s): * Retested and the cylinder behaves as expected along with the Box & Sphere shapes save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048) * Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to ellipsoid behavior given default change. Changes Committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/shared/src/ShapeInfo.cpp	2017-07-28 15:59:17 -04:00
Zach Fox	62f6c10b2b	Renaming things; bugfixes; improvements	2017-07-26 12:45:10 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
LaShonda Hopper	6b5cabf00a	[WL21389] Minor: Mark RenderableShapeEntityItem::computeShapeInfo as an override. ... Changes Committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h	2017-07-25 18:12:07 -04:00
LaShonda Hopper	ef1e426273	[WL21389] Some code and todo cleanup in prep for PR1. ... Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp	2017-07-25 15:27:02 -04:00
Leander Hasty	d155c02640	[WL21389] wip and modifications based on comments ... https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518 Cleans up tabs, moves new functionality out of ShapeFactory directly to RenderableShapeEntityItem's computeShapeInfo override, begins to break down where we will need pointlists. Still need to determine how rotation is handled for pointlists, and check for axis alignment on cylinders before deciding on a shape. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js	2017-07-25 15:20:35 -04:00
LaShonda Hopper	75403124b6	[WL21389] Addresses physics library dependency and has some other fixes (details below). ... * Addresses physics library dependency by moving computeShapeInfo override from ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem (which is in Entities-Renderer Library). ** Entities-Renderer library already links against the physic library. ** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be utilized the library dependency between the Entity and Physics library would need to be resolved to avoid the cyclical reliance which isn't in the scope of this ticket. * Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js ** Objects now have a finite lifetime ** Script now cleans up the objects created when the script ends ** Also moved some adjustable properties out into var aliases at the top of the file for easier/less error prone tweaking. Should probably add one for the shapeType. * Fixes some issues with validateShapeType helper function * Removed naive attempt at including physics library within entities library. * Transferred some todos from notes * Fixed some formatting NOTE(s): This compiles and runs. Cylinder is spawned and treated as CYLINDER_Y. TODO(s): * Add tweakable var for shapeType within shapeSpawner.js * Vet and verify other shapes. * Add in edge case handling. * Add in support for other shapes to ShapeInfo infrastructure. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:39 -04:00
LaShonda Hopper	5bc38bd7f0	[WL21389] Collision Shapes need to be updated (details below). ... Revised approach involves creating a helper function within ShapeFactory to aid in devising the ShapeType to be used by an ShapeEntityItem for collision. The ShapeFactory is currently doing this for creating the actual Bullet Library collision shapes. ShapeEntityItem overrides its virtually inherited computeShapeInfo which in turn calls the new ShapeFactory helper function. ShapeEntityItem has a new memvar _collisionShapeType to cache its actual ShapeType used by the physics system. This memvar is returned via the getShapeType accessor which is expected to return an object's ShapeType. Note(s): This is similar to the original approach save translation between entity::Shape and ShapeType isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more directly solves the issue of getting the actual ShapeType used by the time it's needed to determine the bullet collision object type created when initializing the physic information. Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by ShapeFactory which handles creating the bullet collision objects when setting up physics on the ShapeEntityItems. Known Issue(s): This doesn't compile. It appears that the Entity Library needs to know about the Physics Library. The naive attempt at providing that link failed to resolve all compilation issues. Current Error: C1083: Cannot open include file: btBulletDynamicsCommon.h: No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp) C:\projects\cusack\libraries\physics\src\ShapeFactory.h 15 1 entities modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/physics/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js new file: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:07 -04:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +02:00
Seth Alves	72e5fecb4e	do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex	2017-07-20 16:34:34 -07:00
Olivier Prat	8f9deb3b0d	Modified fade version of voxel shaders to use real world position	2017-07-20 14:44:01 +02:00
Olivier Prat	a50c267d0b	Fading on polyline now works when the polyline is added to the scene	2017-07-20 12:45:14 +02:00
Seth Alves	a8698c2fbc	EntityScriptingInterface::getMeshes support for Model entities	2017-07-19 08:59:09 -07:00
Olivier Prat	b652d94a43	Added fade on poly line entities	2017-07-19 17:11:06 +02:00
Olivier Prat	0319a16e24	Modified PolyLines to use the new custom pipeline system	2017-07-19 16:40:20 +02:00
Olivier Prat	abc751ef9c	Fade seems to be working on shape items with instanced drawing.	2017-07-18 18:25:54 +02:00
Olivier Prat	3316be4dea	Working fade parameters through instanced draw calls	2017-07-18 17:01:17 +02: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	236270d798	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-18 10:47:21 +02:00
Zach Fox	96f52a9812	First pass at getting overlays to show up on hover	2017-07-17 17:05:16 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	147474e19a	Logging category and filter	2017-07-17 11:17:59 -07: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	f8b2ffe359	Removed transparency on fading shapes	2017-07-17 15:06:32 +02:00
Olivier Prat	db7871fca7	Merge branch 'fadevoxel' into fadeshape	2017-07-17 14:33:00 +02:00
Olivier Prat	95059e26c1	Fading working on voxels	2017-07-17 14:32:05 +02:00
Olivier Prat	76dd421ecd	Merge branch 'fade' into fadevoxel	2017-07-17 12:00:10 +02:00
Olivier Prat	146f934019	Cleaned up shader code as fade position is now world position	2017-07-17 11:59:10 +02:00
Olivier Prat	290d106cf4	Shapes are working again. Had to re-specialize all the payload hooks for ShapePayload::Pointer...	2017-07-17 11:37:50 +02:00
Olivier Prat	5e5148ca91	Merge branch 'fade' into fadeshape	2017-07-17 09:53:26 +02:00
Olivier Prat	61de99dfe8	Merge branch 'fade' into fadevoxel	2017-07-17 09:42:14 +02:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
Olivier Prat	b125fba2e1	Removed untested avatar bubble fade code. Made changes as requested by Andrew	2017-07-13 23:04:55 +02:00
Olivier Prat	93218da473	Fixed compilation errors on Mac and Linux	2017-07-13 17:51:16 +02:00
Olivier Prat	1b8696fdda	First draft of custom pipeline on geometry cache	2017-07-13 17:09:49 +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
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Olivier Prat	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Olivier Prat	cc4e168369	Working fade again	2017-07-10 16:45:13 +02:00
Olivier Prat	66d09a4c3c	Some objects fade and fixed crash due to invalid meta item id	2017-07-10 16:02:12 +02:00
Olivier Prat	267531cc1a	First working fade	2017-07-10 15:27:09 +02:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +02:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +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
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Sam Gateau	ca7e782566	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-29 10:54:27 +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
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Davis	28d727153b	PR feedback	2017-06-27 19:22:07 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
samcake	17e2140826	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 13:28:58 -07:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Sam Cake	07e18eb3a8	Keep cleaning up the DeferredLightingEffect , removing stage s from there...	2017-06-22 01:12:32 -07:00
Atlante45	49623fefd8	Fix Skyboxes sometimes not showing	2017-06-21 11:40:32 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Olivier Prat	ef60f78d2b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-14 10:16:02 +02:00
Olivier Prat	24d45e0f5b	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
howard-stearns	3d4f9be05b	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
Olivier Prat	cba70e6be0	Fade working on voxel objects	2017-06-08 14:57:09 +02:00
Olivier Prat	20d4fcbbc7	Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL	2017-06-08 09:24:12 +02:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Howard Stearns	3d62900daf	When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.	2017-06-03 16:49:16 -07:00
samcake	14f9a9848e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-01 18:05:47 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
samcake	cba913c068	Fixing the case when the bound changes without the rest of the properties	2017-05-25 13:01:54 -07:00
Zach Fox	f2fab57187	Update conditional to handle 'other unowned' case	2017-05-25 13:01:40 -07:00
Zach Fox	be39874999	Changes after discussion with Brad	2017-05-25 13:01:40 -07:00
Zach Fox	f6195cdb1e	Committing checkpoint changes, then testing	2017-05-25 13:01:40 -07:00
Zach Fox	4d791211ee	Make the changes - big thanks to Andrew!	2017-05-25 13:01:40 -07:00
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
samcake	c256893575	some clean up:	2017-05-23 18:00:22 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -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
Andrew Meadows	f80e7a3743	less obfuscation	2017-05-19 15:58:54 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
samcake	db4387e55d	Trying to mess with the defautl texture for skybox	2017-05-15 17:31:29 -07:00
samcake	8626e1f3d1	Keep fixing the cascading behavior to the zone render item	2017-05-15 17:19:46 -07:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
samcake	bbb513220b	Moving forward	2017-05-08 17:33:24 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
samcake	b6c966ef39	Keep iterating on the zones	2017-05-05 18:07:21 -07:00
Sam Cake	db3d634840	Adding the change notifications	2017-05-05 00:11:22 -07:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
samcake	64317f5fd0	Adding a light item per zone	2017-05-04 16:47:03 -07:00
Andrew Meadows	ac6d4969d6	Merge pull request #10270 from Atlante45/fix/unload ... Fix entity script unloads	2017-04-26 11:42:14 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Atlante45	24f4107c92	Unload script when replaced with empty URL	2017-04-24 15:56:37 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
Seth Alves	b99959c73d	munge collision-hull at last minute rather than store munged url as a property	2017-04-11 07:00:22 -07:00
Seth Alves	8a3a52cbcf	make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool	2017-04-10 13:54:24 -07:00
Seth Alves	6bd841857f	added a comment	2017-04-10 13:50:36 -07:00
Seth Alves	717436e0fd	use QUrl rather than just munging the url with a string-append	2017-04-10 10:54:30 -07:00
Seth Alves	554b23357c	add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls	2017-04-10 10:14:36 -07:00
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -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
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -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
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
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
Brad Davis	d89104f69c	Use getters instead of direct member access	2017-04-04 10:50:55 -07:00
Seth Alves	6080c4782a	fix polyvox shader	2017-03-28 16:44:31 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -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	7641677902	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-28 10:14:49 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Seth Alves	8da91695df	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-27 20:15:54 -07:00
Andrew Meadows	18544581e6	remove warnings about implicit float cast	2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub	3bdcfd8b78	Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick ... remove properties from RayToEntityIntersectionResult	2017-03-27 14:26:51 -07:00
Seth Alves	d0c8994a8c	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-27 09:51:40 -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	c21b8b4eac	raise max mesh count for static collision entities from 500 to 1000	2017-03-26 08:48:08 -07:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	0d2e0eb9c3	Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx ... Avoid deadlock on 10k mesh fbx	2017-03-24 12:34:37 -08:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	aaa78d108b	if a model has too many meshes, give up.	2017-03-24 11:17:24 -07:00
Clément Brisset	5ff7dbb254	Merge pull request #9991 from Atlante45/fix/entity-bad-url ... Show entity bounding box for bad URLs	2017-03-24 10:56:06 -07:00
ZappoMan	ddd0645453	fix merge issue	2017-03-24 09:59:11 -07:00
ZappoMan	bc331af6a0	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-24 08:46:43 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	aa1883ba85	Merge pull request #9979 from jherico/crash_fix ... Fix crash in render-perf-test	2017-03-24 08:10:37 -07:00
Atlante45	4f8d9b190b	Show green box when model entity has bad url	2017-03-23 17:56:33 -07:00
ZappoMan	246f377a07	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-23 10:40:37 -07:00
Seth Alves	ba0c9e405a	cleanup	2017-03-23 10:38:57 -07:00
Seth Alves	f5680def55	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-23 09:55:41 -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	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Brad Davis	944255a37b	Fix crash in render-perf-test	2017-03-22 22:44:05 -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
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Seth Alves	67507f1f05	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-20 09:37:53 -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
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -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
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Seth Alves	16c3eb62b1	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-17 08:54:32 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Seth Alves	200550aba9	ModelScriptingInterface::appendMeshes	2017-03-16 15:22:34 -07:00
humbletim	87d62ad1eb	Merge branch 'master' into 21114-part3	2017-03-16 16:39:37 -04:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
samcake	0399249a03	Expeand the wireframe to the primitive entities and the polyvox	2017-03-15 16:58:31 -07:00
Stephen Birarda	0c657a1d55	add parameter to unload to remove entityID from map	2017-03-15 10:57:12 -07:00
Seth Alves	816b0b5cfd	unmangle merge	2017-03-15 09:02:32 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
Seth Alves	40b87171a9	quiet warnings	2017-03-14 17:49:39 -07:00
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -07:00
Brad Davis	3bef5ad528	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-13 14:30:25 -07:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Seth Alves	71c2b4215d	Merge pull request #9811 from ZappoMan/triangleSet ... Cleanup how Models do ray-picking and determination of point inside of convex hull	2017-03-07 14:12:56 -08:00
humbletim	40ba8185a0	* Update per 21114-part2 changes. ... * Add explicit thread safety guards. * Add Entities.queryPropertyMetdata for unit testing Entity script module support. * Cleanup / commenting pass.	2017-03-07 16:36:07 -05:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 ... CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
ZappoMan	2a663cbcb1	cleanup	2017-03-05 19:28:15 -08:00
ZappoMan	87bcced409	cleanup use of triangleSet for picking	2017-03-05 19:23:55 -08:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
ZappoMan	9e71801ae1	remove properties from RayToEntityIntersectionResult	2017-03-01 18:21:04 -08:00
Stephen Birarda	b586926d09	Merge pull request #9755 from birarda/master ... increase max renderable web entity FPS to 30 for Youtube.com	2017-03-01 18:09:16 -08:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Stephen Birarda	8562a294fa	cleanup some extra spacing	2017-02-28 13:24:41 -08:00
Seth Alves	6b230bad14	oops	2017-02-27 20:56:25 -08:00
Stephen Birarda	80af749b69	change max FPS for youtube on URL change	2017-02-27 11:09:17 -08:00
Stephen Birarda	d18936ea18	only force youtube web entities to 30 FPS	2017-02-27 09:44:34 -08:00
Stephen Birarda	2ceb3d85bd	increase max renderable web entity FPS to 30	2017-02-27 09:33:49 -08:00
Seth Alves	88c850afa2	voxel-paint paints with capsules rather than spheres	2017-02-26 12:56:17 -08:00
Seth Alves	542cb7ab85	optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket	2017-02-26 09:03:34 -08:00
Seth Alves	6227db9fc0	optimize RenderablePolyVoxEntityItem::setSphere	2017-02-26 08:30:29 -08:00
Seth Alves	422b0bb952	don't set _dirtyFlags if polyvox is collisionless	2017-02-25 21:14:13 -08:00
Seth Alves	7a31a99e3c	back out previous experiment	2017-02-25 21:13:20 -08:00
Seth Alves	1e81edbaea	make a copy of volData before computing the visual mesh	2017-02-25 15:32:08 -08:00
Seth Alves	0e4b0332dd	avoid a rare crash	2017-02-25 11:35:27 -08:00
Seth Alves	76c873ce81	don't compute polyvox shapes if they are collisionless	2017-02-25 11:34:48 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
humbletim	b15956278c	separate out supporting changes into 21114-part2 branch	2017-02-16 07:40:19 -05:00
Seth Alves	792c7ff51f	PointerEvent will now relay keyboard modifiers	2017-02-15 10:41:56 -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	24510ee3fe	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-01 18:42:56 -08:00
Seth Alves	bb3155ee61	obj file is now produced in /tmp	2017-01-31 14:29:42 -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
Seth Alves	5131d1edf2	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-01-31 09:22:16 -08:00
Seth Alves	7c2957cfa7	merge from upstream	2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub	b597f3e098	Merge pull request #9267 from AndrewMeadows/report-all-collision-events ... fix for missed START collision events	2017-01-31 08:54:58 -08:00
Seth Alves	7d80679652	Merge pull request #9566 from sethalves/tablet-ui ... Tablet ui	2017-01-31 05:03:51 -08:00
Seth Alves	39d195fce2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-31 05:02:07 -08:00
Seth Alves	17514a5022	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-01-31 04:57:16 -08:00
Seth Alves	88948fa2b4	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting	2017-01-30 19:54:50 -08:00
Atlante45	c65e884151	Don't set joint "set" flags for animation values	2017-01-30 16:04:54 -08:00
Anthony J. Thibault	0962a15a06	Fix for one-frame lag in the tablet stylus.	2017-01-30 15:39:55 -08:00
Andrew Meadows	6ef4420f37	remove commented out cruft	2017-01-30 13:21:23 -08:00
Andrew Meadows	31861d3192	use inverted collision for B-A event	2017-01-30 13:21:23 -08:00
Andrew Meadows	aa8e7d27db	move depth filtering closer to source	2017-01-30 13:21:23 -08:00
Andrew Meadows	2541bfb1a8	only create collision events for owned entities	2017-01-30 13:21:23 -08:00
Andrew Meadows	8cf7aee009	fix bug: second collision event with bad data	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
Andrew Meadows	ed17c4fa16	fix an old typo about when to send collision event	2017-01-30 13:19:38 -08:00
Anthony J. Thibault	39d68828ab	Disable FXAA on tablet overlay in desktop mode. ... This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is essential in 2D desktop mode. Two new shaders were introduced. simple_opaque_web_browser_overlay.slf simple_transparent_web_browser_overlay.slf These are tailored to write into the main framebuffer instead of the g-buffer.	2017-01-30 11:24:59 -08:00
Seth Alves	d158f6afd1	hook up a way to get mesh out of polyvox	2017-01-28 20:42:14 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Stephen Birarda	a8118e83ff	cleanup debug for safe web entity URLs	2017-01-23 13:54:43 -08:00
Seth Alves	c958314918	merge from upstream	2017-01-23 13:52:01 -08:00
Stephen Birarda	d7651e9838	move value sanitizing to WebEntityItem	2017-01-23 11:45:21 -08:00
Stephen Birarda	99e0c8c0e7	use fromUserInput in web entity URL set to avoid crashable URLs	2017-01-23 11:37:54 -08:00
Ryan Huffman	9b1cd52fb4	Add the ability to get the context that a script is running in	2017-01-23 08:58:01 -08:00
Atlante45	29b5daba3a	Revert input events script callbacks	2017-01-20 15:30:25 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Atlante45	ff3f175fb7	Fix typos	2017-01-17 15:39:54 -08:00
Ryan Huffman	340eeb94fa	Add return type to lambdas in EntityTreeRenderer	2017-01-17 15:24:14 -08:00
Atlante45	8d199ded15	Check collision against the right owner	2017-01-17 13:47:45 -08:00
Atlante45	5db37fff95	More entity script server work	2017-01-17 13:47:45 -08:00
samcake	69f9053e61	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-17 10:55:10 -08:00
samcake	83d1c3ad01	Adding support for the meta rendering	2017-01-16 17:47:58 -08:00
Seth Alves	f0248275ec	Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui	2017-01-16 06:47:15 -08:00
Seth Alves	050a7e87d2	load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.	2017-01-15 17:04:51 -08:00
Anthony J. Thibault	26a5b5ed91	Fix for rendering of tablet ModelEntity in desktop mode. ... The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough in the update loop to have the most up-to-date camera transform used for rendering.	2017-01-11 18:37:57 -08:00
Seth Alves	bacc796730	Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again	2017-01-11 09:54:26 -08:00
Brad Davis	1dd2747ef9	Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.	2017-01-10 10:44:04 -08:00
Anthony J. Thibault	6794ed7cc4	Merge remote-tracking branch 'upstream/master' into tablet-ui	2017-01-09 10:37:46 -08:00
Anthony J. Thibault	0860c50a49	Allow Hifi.SoundEffect to be used in all qml ... Including webEntities, webOverlays and the system tablet. We might want to add this to enable spatial sound effects for the web keyboard.	2017-01-06 14:01:13 -08:00
Anthony J. Thibault	3c2f9acd39	Hooked up EventBridge to TabletScriptingInterface.	2017-01-03 15:43:21 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Davis	e5e9ab42ea	Encapsulate AnimPose members for easier optimizations	2016-12-28 12:11:24 -08:00
Anthony J. Thibault	01a96347a5	Updated Web3dOverlay.cpp to work with TabletRoot.qml	2016-12-20 14:40:29 -08:00
Anthony J. Thibault	ec38c4e319	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2016-12-20 13:43:06 -08:00
Anthony J. Thibault	84db58dbc6	Make tablet.qml work on Web3DOverlay	2016-12-20 12:16:11 -08:00
Brad Davis	d0d6b1f87e	tracing polish	2016-12-20 07:45:35 -08:00
Andrew Meadows	e03e57a480	adding profile stats relating to avatar CPU costs	2016-12-20 07:45:35 -08:00
Ryan Huffman	21bab49f79	Add chrome tracing support	2016-12-20 07:45:35 -08:00
David Rowe	5b8a9c0bcd	Add extra logging for Clara.io asset resizing	2016-12-20 07:43:48 -08:00
David Rowe	e85bc50333	Tidying	2016-12-20 07:38:25 -08:00
David Rowe	e0922cdf4d	Add missing entity hover signal	2016-12-20 07:38:25 -08:00
Brad Hefta-Gaub	c65471e880	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam ... Conflicts: libraries/script-engine/src/FileScriptingInterface.cpp	2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Anthony J. Thibault	a791ddcc22	Tablet can switch to a web url. ... Help button has been updated to switch to the help.html. It doesn't look good because the content was authored expecting landscape window, not portrait. The API is by no means final. But it exposes two methods to JS. * Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will hooked up to the tablet button. * Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url. tabletTest.js and help.js have been updated to use this functionality.	2016-12-19 17:52:19 -08:00
Anthony J. Thibault	856791c11d	Made TabletRoot.qml the main tablet qml file. ... This file uses a Loader node to load, Tablet.qml.	2016-12-19 15:15:16 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Andrew Meadows	ee6a9f4506	adding profile stats relating to avatar CPU costs	2016-12-16 13:41:31 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Anthony J. Thibault	5d1ccfbccc	Tablet#removeButton now works properly	2016-12-15 15:49:37 -08:00
Anthony J. Thibault	d2c4417b24	Hook up Help button to the new Tablet interface	2016-12-14 17:05:47 -08:00
Anthony J. Thibault	d4f9d21ce8	Pass tablet QQuickItem to TabletScriptingInterface ... Also, moved TabletScriptingInterface to script-engine library for easy access, baby.	2016-12-14 14:04:48 -08:00
David Rowe	aefa116207	Add extra logging for Clara.io asset resizing	2016-12-13 17:55:22 +13:00
Seth Alves	819e3dc41d	remove some unneeded html special-casing	2016-12-09 10:18:30 -08:00
Seth Alves	6c99b5e9ca	code review	2016-12-09 06:50:10 -08:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
Anthony J. Thibault	319bb9ce78	Prototype of Tablet.qml hacked to appear on ALL web entities.	2016-12-08 15:31:00 -08:00
David Rowe	2f42f4cfa5	Merge branch 'master' into 21089	2016-12-05 18:33:38 +13:00
David Rowe	71de106594	Tidying	2016-12-04 15:14:47 +13:00
David Rowe	c6f19b1c4e	Add missing entity hover signal	2016-12-03 20:37:47 +13:00
Brad Davis	12ccbdac0b	Actually render polylines	2016-12-01 19:46:08 -08:00
Brad Davis	5bade2ef9a	Add locking around the code that reads polyline entity data and builds GPU structures for them	2016-12-01 14:14:17 -08:00
samcake	9478f242d8	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-23 10:35:32 -08:00
samcake	3d0b557af6	Fix the bad binding for polyline	2016-11-22 13:01:02 -08:00
samcake	dfc0b7beac	adressed reveiw comments	2016-11-22 10:15:49 -08:00
samcake	31232a1078	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-21 11:30:26 -08:00
Seth Alves	8ee1fac367	don't try to render until mesh is ready	2016-11-18 16:33:48 -08:00
Seth Alves	b2a28147c0	more time	2016-11-18 15:36:29 -08:00
Seth Alves	47062d29f5	cleanups	2016-11-18 15:27:45 -08:00
Seth Alves	3278478a60	cleanups	2016-11-18 15:26:16 -08:00
Seth Alves	a66a1d392e	hack to avoid crash	2016-11-18 15:24:19 -08:00
Seth Alves	1714d4fe06	fix build	2016-11-18 05:40:57 -08:00
samcake	a07523ca31	Merge with Upstream	2016-11-17 18:31:05 -08:00
Seth Alves	8530156227	experimenting	2016-11-17 16:06:35 -08:00
Seth Alves	028be0f830	Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size	2016-11-17 14:14:08 -08:00
Seth Alves	1eb17b9786	fix bug that caused polyvox rendering to mishandle its gpu buffers	2016-11-17 14:11:09 -08:00
Brad Hefta-Gaub	36d8e6d64d	Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix ... Bug fix for blank webEntities during long sessions	2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub	91f90400a9	Merge pull request #9088 from sethalves/fix-polyvox-memory-leak ... fix polyvox memory leak	2016-11-17 12:23:13 -08:00
Seth Alves	1f9598f295	Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak	2016-11-17 08:44:52 -08:00
samcake	7c003ce865	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-16 19:13:22 -08:00
Seth Alves	697369dece	avoid crash on startup	2016-11-16 16:11:17 -08:00
Seth Alves	a14ff22df3	update render-land bounds when polyvox moves	2016-11-16 15:10:43 -08:00
Seth Alves	d097fa7982	fix polyvox memory leak	2016-11-16 14:10:50 -08:00
Anthony J. Thibault	066ddad25a	Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20.	2016-11-16 09:39:55 -08:00
Brad Davis	fda2cde006	Fix buffer leak in line entity	2016-11-15 14:16:54 -08:00
Anthony J. Thibault	eb401c125a	Bug fix for blank webEntities during long sessions ... In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized. The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext. The early return did not properly take this into account. Instead we move the increment after the early return and right before the _webSurface is actually created.	2016-11-14 18:01:47 -08:00
samcake	00addcad9e	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-10 17:57:34 -08:00
samcake	e12040a98a	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-04 14:54:18 -07:00
Seth Alves	689fdfb35f	implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame	2016-11-04 11:44:42 -07:00
Seth Alves	e41fa94958	implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame	2016-11-04 11:42:31 -07:00
Seth Alves	727fe4bc21	Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name	2016-11-04 10:04:56 -07:00
Brad Hefta-Gaub	961e17bc48	Merge pull request #8989 from sethalves/fix-polyvox-bitrot ... fix a couple of minor polyvox problems	2016-11-03 13:43:52 -07:00
Seth Alves	339d6a55cf	getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation	2016-11-03 10:06:07 -07:00
Andrew Meadows	cd5826e2ce	load model of new entity with unknown dimensions	2016-11-03 09:03:04 -07:00
samcake	6926cd274c	Merge with upstream	2016-11-02 18:15:08 -07:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
Seth Alves	844cc03dcb	fix names of model-entity joint setters	2016-11-02 10:24:01 -07:00
Seth Alves	3ad748cfe2	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 16:41:39 -07:00
Zach Pomerantz	be23668ca8	delete websurfaces on shutdown	2016-10-28 14:29:52 -07:00
Seth Alves	e15043754c	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 11:36:09 -07:00
Anthony J. Thibault	1fc310434e	Fix for crash in QtWebEngineCore when rapidly switching domains ... Call stop on the QWebEngineView before destroying OffscreenQMLSurface.	2016-10-27 18:55:24 -07:00
Seth Alves	f47aeae2a7	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07: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
Brad Davis	9523660027	Fix offscreen QML texture leak, improve texture sharing for same size surfaces	2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub	bf732127ca	Merge pull request #8856 from jherico/geometry_ids ... Remove the use of implicit ids in geometry cache	2016-10-20 08:14:49 -07:00
Brad Davis	2705ee7030	Remove the use of implicit ids in geometry cache	2016-10-19 11:18:25 -07:00
Brad Davis	61e5e2861e	Rate limit QML web surfaces	2016-10-18 19:29:11 -07:00
David Rowe	e269a84d0e	Add placeholder "FIXME"s for making Web entity keyboard HMD-only	2016-10-13 09:35:39 +13:00
samcake	5bb26fdb7f	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-10 15:56:37 -07:00
Brad Hefta-Gaub	798a5cfc9d	Merge pull request #8768 from ZappoMan/nestedSkyboxes ... fix skybox changing when going between zones	2016-10-10 15:13:33 -07:00
Anthony J. Thibault	e76a7fc577	Crash fix for RenderableWebEntityItem::buildWebSurface ... Gracefully handle the absence of a gl context. We will continue to retry every render call.	2016-10-10 13:57:54 -07:00
Brad Hefta-Gaub	db5edb530a	fix skybox changing when going between zones	2016-10-09 15:22:35 -07:00
samcake	8a44140e6b	cleaning up the comments from review and trying something to adress the issue that showed up on i5	2016-10-07 16:04:19 -07:00
samcake	92d71a2e37	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-07 10:13:24 -07:00
Ryan Downe Karpf	ed2571704f	Merge pull request #8735 from huffman/feat/teleport-improvements ... Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces	2016-10-07 09:56:30 -07:00
David Rowe	1a745094e2	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-06 09:29:09 +13:00
samcake	e6572a42e3	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-05 09:31:55 -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 Davis	8c5028158f	Fix crash on destroying web entities and overlays	2016-10-03 18:02:21 -07:00
Brad Davis	ca3572f991	Support external GL textures with proper fencing	2016-10-03 17:09:10 -07:00
David Rowe	caf1a93354	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp	2016-10-04 10:51:14 +13:00
sam	bda835361a	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-03 02:54:11 -07:00
sam	6f2452815c	pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader	2016-10-03 00:08:30 -07:00
Anthony Thibault	a79485f8c2	Fix for crash bug in web entities ... Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper. These pointers can go null if the webEntity is deleted on the main thread. Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds due to frustum culling.	2016-10-01 13:43:49 -07:00
samcake	9b94a025fc	Refining the voxelization of the sphere in the view frustum grid	2016-09-26 18:41:53 -07:00
Seth Alves	dc5e63c4f1	re-enable web entity-items on linux	2016-09-22 10:25:26 -07:00
Seth Alves	8899c0b790	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-10 10:43:07 -07:00
samcake	3bcea4310d	Fixing the vizualisation shader for world to cluster space	2016-09-10 10:41:18 -07:00
samcake	108910052a	Adding the reverse transformation	2016-09-09 19:00:54 -07:00
Seth Alves	dd39d46883	fold WebEntityAPIHelper members into OffscreenQmlSurface	2016-09-09 13:41:09 -07:00
Seth Alves	123ac541ea	started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface	2016-09-09 11:31:48 -07:00
Seth Alves	02dba2fe49	started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface	2016-09-09 11:23:37 -07:00
Seth Alves	ef8c2a2888	started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface	2016-09-09 10:46:54 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Anthony J. Thibault	594640f8b4	coding standard fixes	2016-09-08 11:53:23 -07:00
Anthony J. Thibault	ebb4c0990b	Removed local copy of qtwebchannel.js, use qt resource version instead	2016-09-07 17:14:33 -07:00
Anthony J. Thibault	41e0b8732f	fix for occasional crash when deleting web entity	2016-09-07 10:59:16 -07:00
Anthony J. Thibault	774509ba9e	Changed punctuation button to &123	2016-09-06 17:41:56 -07:00
Anthony J. Thibault	28162915fd	Re-styled keyboard, now with working shift key	2016-09-06 15:21:58 -07:00
samcake	0c45627d94	CLeaning up the code for the RenderableLightEntityItem	2016-09-06 12:39:48 -07:00
Anthony J. Thibault	787bb58c1a	osx warning fix	2016-09-02 17:22:13 -07:00
Anthony J. Thibault	9122a33fff	only raise the webEntity virtual keyboard in HMD mode	2016-09-02 16:53:40 -07:00
Anthony J. Thibault	a54c3bf8c0	support for backspace, carriage return, space and period.	2016-09-02 16:23:46 -07:00
Anthony J. Thibault	0128d7c61b	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-02 12:16:25 -07:00
Anthony J. Thibault	3d5e8fc213	First pass of keyboard raising and lowering	2016-09-02 12:15:30 -07:00
samcake	7b68f1439f	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-02 09:28:35 -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
Brad Hefta-Gaub	e3bad8e8f4	Merge pull request #8556 from ZappoMan/renderStats ... add support for renderInfo properties to model entities	2016-09-02 09:04:56 -07:00
Anthony J. Thibault	21bf931559	eventBridge for web entities.	2016-09-01 16:32:06 -07:00
samcake	ed12b5ffb9	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-01 12:10:40 -07:00
Anthony J. Thibault	823420ae0a	Working web entity keyboard ... * Missing many keys * Does not dynamically appear and disappear	2016-08-31 17:57:13 -07:00
Brad Hefta-Gaub	e1845e2c3f	add support for renderInfo properties to model entities	2016-08-31 15:00:21 -07:00
samcake	b563e280e4	Commuting the LIghtEntityItem changes correctly to the LightRenderItem	2016-08-31 13:55:41 -07:00
Anthony J. Thibault	2c5bdecca9	Bug fix for touch event crash in qt. ... This was due to a missing touchDevice(). Also, touch events work for non-full screen qml widgets.	2016-08-31 11:11:49 -07:00
Andrew Meadows	e5b63aa18f	remove cruft from updateModel() arguments	2016-08-31 10:54:02 -07:00
Zach Pomerantz	0e9ff04c4c	fix layered zone applications	2016-08-30 17:00:02 -07:00
Zach Pomerantz	bb39cdafda	fix applyPartial for last zone	2016-08-30 17:00:02 -07:00
Zach Pomerantz	abde84b068	fix async skybox tex loading	2016-08-30 17:00:02 -07:00
samcake	3755a3fc32	Add batch timing information vs gpu	2016-08-29 17:54:17 -07:00
Zach Pomerantz	f30308b68c	add deeply nested skyboxes	2016-08-29 13:57:14 -07:00
samcake	165cb8bc39	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-08-29 09:42:33 -07:00
samcake	4bf93f66df	Cleaning up the lights and the light stage	2016-08-26 17:47:20 -07:00
Brad Hefta-Gaub	3d6691f3d1	Merge pull request #8527 from zzmp/fix/skybox-default-color ... fix skybox default	2016-08-26 15:14:44 -07:00
Zach Pomerantz	996346980d	clear the skybox between scenes	2016-08-25 18:08:22 -07:00
Brad Hefta-Gaub	10c465f591	Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering ... Improved web entity rendering	2016-08-25 16:49:00 -07:00
Anthony J. Thibault	e82f6a90af	Improved web entity rendering ... * fading now works properly * web browsers are now fully opaque.	2016-08-25 11:04:23 -07:00
Andrew Meadows	b95cb566cd	fix collision mesh for non-trivial registration	2016-08-24 22:26:56 -07:00
Andrew Meadows	e4317adcf1	remove cruft	2016-08-24 22:26:56 -07:00
Andrew Meadows	2f16aca114	remove cruft and fix typo in rebase	2016-08-24 22:26:56 -07:00
Andrew Meadows	83426fd5a8	handle transitions to/from STATIC_MESH ... when rendering collision geometry	2016-08-24 22:26:56 -07:00
Andrew Meadows	68dd66daec	create collision render geometry only when needed	2016-08-24 22:26:56 -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
Andrew Meadows	191b7f0f39	variable namechange: Hull --> Mesh	2016-08-24 22:26:56 -07:00
Andrew Meadows	6b0ae654ba	cleanup logic around creating RenderItems	2016-08-24 22:26:56 -07:00
Andrew Meadows	726928c14c	creae collision Geometry from mesh	2016-08-24 22:25:45 -07:00
Andrew Meadows	499150bbed	finish hook alert for new entity collision shape	2016-08-24 22:25:45 -07:00
Andrew Meadows	b2dfa49a6f	stubbery for alerting entity that shape changed	2016-08-24 22:25:45 -07:00
Anthony J. Thibault	b2dff8aa77	Easier to click buttons on web entities with shaky hand controllers ... There is an angular and time dead spot on webEntity for scrolling vs clicking. Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE * Fix for warnings when clicking on window.open() links in WebEntity	2016-08-23 10:19:49 -07:00
Anthony J. Thibault	d607abc8f7	Add dpi to edit.js ... Also, cap the maximum webEntity texture size to 4096	2016-08-23 10:10:27 -07:00
Anthony J. Thibault	6704ae9ad4	Added dpi parameter to userData (this is temporary)	2016-08-23 10:09:17 -07:00
Brad Hefta-Gaub	21bc06f154	Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration ... handControllerGrab and web entity input integration	2016-08-23 09:59:25 -07:00
Brad Hefta-Gaub	0397c6b6ca	Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data ... workaround bad FBXMesh data rather than assert	2016-08-22 14:21:48 -07:00
Anthony J. Thibault	d015c5cfb5	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-22 14:13:17 -07:00
Anthony J. Thibault	8bb6bb7c6f	generalized keyboard focus interface ... Removed dynamic casts to RenderableWebEntityItem, instead virtual methods were added to EntityItem to facilitate this. * bool wantsKeyboardFocus() * void setProxyWindow() * QObject* getEventHandler()	2016-08-19 10:56:52 -07:00
Andrew Meadows	c3f165d9da	BufferView::Iterator doesn't support operator<	2016-08-19 10:15:37 -07:00
Andrew Meadows	2ba35e6398	skip non-existant meshes	2016-08-18 11:48:56 -07:00
Seth Alves	15ce40ecf4	merge from upstream	2016-08-18 11:46:02 -07:00
Andrew Meadows	cb9a5466d5	workaround bad FBXMesh data rather than assert	2016-08-18 11:09:48 -07:00
Clément Brisset	d1fb723b01	Merge pull request #8444 from zzmp/fix/skybox ... fix flashing in default skybox, and allow skybox lighting without textures	2016-08-18 11:07:09 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Anthony J. Thibault	7b248b440a	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-17 13:55:12 -07:00
Anthony J. Thibault	7de8cc6422	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-16 16:49:57 -07:00
Ryan Huffman	dae8461773	Fix transparency on procedural shapes	2016-08-16 15:42:17 -07:00
Anthony J. Thibault	c407818d63	send pointer events from handControllerGrab.js to webEntities	2016-08-16 15:26:14 -07:00
Zach Pomerantz	d6d9871a96	unused var nits	2016-08-16 14:36:54 -07:00
Zach Pomerantz	8c559bc65d	use lights from nontextured skyboxes	2016-08-16 13:27:22 -07:00
Brad Davis	d548da02d9	Expose whether nsight is running to the app, disable some stuff under nsight	2016-08-12 22:28:50 -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
James B. Pollack	6da2ea1932	Merge pull request #8409 from SamGondelman/loadingFade ... Fix procedural entity transparency	2016-08-11 12:02:57 -07:00
SamGondelman	d8545bc7a3	fix procedural transparency	2016-08-10 13:49:35 -07:00
Anthony J. Thibault	8dac45c99e	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
SamGondelman	36d9f92101	performance optimization to minimize calling usecTimestampNow	2016-08-09 13:10:02 -07:00
Ryan Huffman	35ea9908cd	Add default skybox	2016-08-08 16:00:58 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -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
SamGondelman	b23d3cd35a	fixed messed up transparency on edit selection of shapes	2016-08-05 18:35:16 -07:00
SamGondelman	dd51e0e38f	merge from master	2016-08-05 17:04:45 -07:00
SamGondelman	771e105fa2	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-05 16:52:01 -07:00
Sam Gondelman	debda37567	Merge pull request #8379 from SamGondelman/loadingFade ... fixed procedural entity fade	2016-08-05 16:48:51 -07:00
SamGondelman	b794259b7d	fixed procedural entity fade	2016-08-05 16:15:10 -07:00
Sam Gondelman	84b7f9b186	Merge pull request #8375 from SamGondelman/loadingFade ... remove polyvox fade, fix web fade, add light fade	2016-08-05 11:53:15 -07:00
SamGondelman	f2ee57f2de	light fade	2016-08-05 11:17:02 -07:00
SamGondelman	b13edc7b6a	fixed web fade fo' real	2016-08-05 10:48:09 -07:00
SamGondelman	130e64aaba	remove polyvox fade, possibly fix web fade	2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub	83280aa3f2	implement support for updating the render items of models when they finish their fade	2016-08-05 10:11:07 -07:00
SamGondelman	3107d63ad8	one more warning	2016-08-04 14:31:44 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -07:00
SamGondelman	004b0158a4	fix warnings on osx	2016-08-04 13:09:09 -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
SamGondelman	6604c27f23	polyvox fade WIP	2016-08-04 10:55:37 -07:00
SamGondelman	d521315475	fade polylines (needs testing)	2016-08-03 17:03:52 -07:00
SamGondelman	d7052f6250	try to make text entities fade	2016-08-03 16:27:51 -07:00
SamGondelman	7713c1f4bf	try to fade in web entities	2016-08-03 15:56:41 -07:00
SamGondelman	27bacc9165	try to fade in procedural shapes	2016-08-03 14:33:05 -07:00
Anthony J. Thibault	713bee84c3	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-03 14:06:43 -07:00
SamGondelman	2eb0c7735f	working on fading shape entities	2016-08-03 13:30:05 -07:00
Seth Alves	ad4fc8c656	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
Anthony J. Thibault	75b88b0794	WebEntities now support custom hifi url handling ... WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml. marketplace urls and hifi urls should work properly in web entities.	2016-08-03 10:20:15 -07:00
SamGondelman	d63a0ef08f	working on making other entities transparent	2016-08-02 18:09:42 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
Anthony J. Thibault	6d768d8327	hand controllers send touch events instead of mouse events to web entities ... This gives a much better experience when scrolling web content.	2016-08-02 15:23:46 -07:00
Anthony Thibault	cf7450beb7	handControllerGrab and web entity input integration	2016-07-29 17:50:45 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Anthony Thibault	8e3bc97ef9	fix for unused variable warnings	2016-07-29 08:10:10 -07:00
Anthony Thibault	ea310bcc43	Web Entities now render correctly as well	2016-07-28 14:11:19 -07:00
Ryan Downe Karpf	91714aaca6	Merge pull request #8258 from AlexanderOtavka/edit-model-ui ... Edit model dialog improvements	2016-07-22 17:11:52 -07:00
Brad Hefta-Gaub	566e0f5dbf	Merge pull request #8287 from AndrewMeadows/fix-simple-compound ... fix bug breaking simple-compound shape type	2016-07-21 18:18:04 -07:00
Andrew Meadows	20eebb90f8	fix build -- remove some accidental changes	2016-07-20 14:08:25 -07:00
Andrew Meadows	3fdfc0db14	fix bug breaking simple-compound shape type	2016-07-20 12:55:13 -07:00
Andrew Meadows	2afd65467a	fix bug where model is not yet ready for col shape	2016-07-19 18:01:22 -07:00
samcake	a44aee84ce	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-18 10:16:55 -07:00
samcake	744474982d	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-17 13:28:03 -07:00
Brad Davis	03cb6175ab	Support triangle and hexagon shapes, add shape support to overlays.	2016-07-15 22:02:17 -07:00
Andrew Meadows	25fdea6bac	fix for change of API after rebase	2016-07-13 15:13:35 -07:00
samcake	8acc18ae8b	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-13 11:42:07 -07:00
Andrew Meadows	72175ae09e	fix warnings about implicit casts	2016-07-09 22:55:55 -07:00
Andrew Meadows	207ddcea38	wrap hull about each mesh part	2016-07-09 22:25:28 -07:00
samcake	ed67fe4051	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub	5f71f77445	Merge pull request #8192 from AndrewMeadows/simple-hull-shapes ... experimental ModelEntityItem collision shape options (no visual debugging)	2016-07-08 08:55:11 -07:00
Andrew Meadows	e4828b03b1	fix crash when building shape before model loaded	2016-07-07 13:32:30 -07:00
Brad Davis	c7382ea886	Optimize updateModelBounds	2016-07-07 11:11:26 -07:00
Brad Davis	5220b52cd9	Don't trigger entity scripts without scripting interface	2016-07-06 18:13:15 -07:00
Andrew Meadows	3c4f9f8016	refert debug hack	2016-07-06 15:51:17 -07:00
Andrew Meadows	15ff7bc731	final hack tweak	2016-07-06 14:35:57 -07:00
Andrew Meadows	301a9f4434	improved hack logging	2016-07-06 14:31:43 -07:00
Andrew Meadows	11ef245671	temp hack for debugging	2016-07-06 14:28:09 -07:00
Andrew Meadows	5659d57ac3	fix shape generation for SIMPLE_COMPOUND	2016-07-06 13:00:57 -07:00
Andrew Meadows	6cbc566a77	remove debug cruft	2016-07-06 11:53:26 -07:00
Andrew Meadows	33d732c446	construct geometry for new shape types	2016-07-06 10:51:15 -07:00
samcake	9281b28d43	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-01 13:39:12 -07:00
Andrew Meadows	74781c0786	boxify static meshes with too many vertices	2016-06-28 16:36:10 -07:00
samcake	ec68eba3cb	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-06-24 09:37:52 -07:00
Andrew Meadows	e88b264864	revert compound hull shape generation	2016-06-22 09:30:44 -07:00
Andrew Meadows	937bd0c1be	SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH	2016-06-21 13:54:21 -07:00
samcake	0c882832bf	Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)	2016-06-20 17:58:35 -07:00
Andrew Meadows	f22a5613bd	fix static mesh for model with per-mesh transforms	2016-06-20 17:29:20 -07:00
Andrew Meadows	5484b6fbb7	more correct extraction from triangle strips	2016-06-20 17:29:20 -07:00
Andrew Meadows	c0c77e9027	optimize/cleanup compound/mesh shape computation	2016-06-20 17:29:20 -07:00
Andrew Meadows	f444b70fdc	fix collision shape for scaled models	2016-06-20 17:29:20 -07:00
Andrew Meadows	ab3548cac0	fix crash	2016-06-20 17:29:20 -07:00
Andrew Meadows	d1752211e6	make implicit casts explict	2016-06-20 17:29:20 -07:00
Andrew Meadows	a519b77ae7	add SHAPE_TYPE_MESH and build mesh shapes	2016-06-20 17:29:20 -07:00
Andrew Meadows	9fc77ccfa2	use reference to avoid big copy	2016-06-20 17:29:20 -07:00
Andrew Meadows	d64729372a	ShapeInfo name changes	2016-06-20 17:29:20 -07:00
SamGondelman	53435fc730	removed extra argument	2016-06-10 14:04:33 -07:00
SamGondelman	da98ee0916	reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition	2016-06-10 13:42:19 -07:00
SamGondelman	24e5000aeb	exposed orientation and eye position to procedural entity shaders	2016-06-08 18:26:54 -07:00
Andrew Meadows	2a3da60ed4	remove some magic numbers	2016-06-03 10:47:54 -07:00
Andrew Meadows	eff59d3fd3	build compound sub meshes shapes with less copying	2016-06-03 10:47:54 -07:00
Andrew Meadows	7858ef84b3	don't copy points onto itself	2016-06-03 10:47:54 -07:00
Andrew Meadows	654468619c	swap order of if-else blocks	2016-06-03 10:47:54 -07:00
Andrew Meadows	d591561a88	remove RenderableModelEntityItem::_points ... use ShapeInfo::_points instead	2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub	c85923c69b	Merge pull request #7956 from jherico/web_entity_crash ... fix crash on click on non-visible web-entity	2016-06-03 10:29:55 -07:00
Brad Davis	cc85ce9c01	fix crash on click on non-visible web-entity	2016-06-02 16:37:45 -07:00
samcake	1dca62f752	Introducing a new technique for normal packing and fixing a bug on the normal buffer format	2016-06-01 17:51:53 -07:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
Seth Alves	76f4a25694	move code that clears old scale and registration to after model is loaded	2016-05-20 11:40:46 -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
Seth Alves	3380b2a668	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-17 19:10:33 -07:00
Chris Collins	b2ece6f4a7	Merge pull request #7882 from zzmp/fix/script-thread-dtor ... Wait and cleanly exit the scripting thread	2016-05-16 16:52:54 -07:00
Seth Alves	a0c3224705	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-16 10:56:09 -07:00
Seth Alves	2a5efd3b82	Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta	2016-05-16 10:53:39 -07:00
Zach Pomerantz	7d4276d15f	Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor	2016-05-16 10:51:23 -07:00
Zach Pomerantz	61fbb7022c	Mv entities script engine deleter to fn	2016-05-16 10:40:11 -07:00
Seth Alves	3876a8037c	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-16 09:51:20 -07:00
Brad Davis	9509e32928	PR feedback	2016-05-14 08:28:51 -07:00
Zach Pomerantz	2140dc77b3	Rename wait and unload in best thread	2016-05-13 16:14:22 -07:00
Seth Alves	bfac7c6f68	Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3	2016-05-13 13:33:39 -07:00
Seth Alves	ceb6aa582f	don't crash when a moving model entity is deleted	2016-05-13 13:32:45 -07:00
Seth Alves	970e7ca17d	don't crash when a moving model entity is deleted	2016-05-13 13:32:00 -07:00
Seth Alves	81af0d0a47	Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3	2016-05-13 09:41:56 -07:00
Seth Alves	574709824e	oops	2016-05-13 09:41:19 -07:00
Seth Alves	dabecb7cc2	merge from other branch	2016-05-13 07:11:57 -07:00
Seth Alves	79141e3869	dry up some code	2016-05-13 07:06:25 -07:00
Seth Alves	eb19c5be13	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-13 07:04:58 -07:00
Seth Alves	dd2a29aace	when a ModelEntityItem moves, also update its meta-render-item	2016-05-12 18:05:28 -07:00
Seth Alves	30fb9349c4	dry up some code	2016-05-12 17:52:40 -07:00
Zach Pomerantz	806d06b552	Wait on old entity script engines in threadpool	2016-05-12 17:51:40 -07:00
Zach Pomerantz	7e82494a66	Add cap on entities scripting thread stop time	2016-05-12 17:51:37 -07:00
Zach Pomerantz	f40fe88ee7	Clean up entity script engine deletion	2016-05-12 17:51:36 -07:00
Seth Alves	c9c619916c	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-11 19:37:57 -07:00
samcake	99dcfef5a8	Merge branch 'master' of https://github.com/highfidelity/hifi into lemon	2016-05-11 10:47:38 -07:00
samcake	1ec9ef560e	Fixing the srgb color format conversion for web entities	2016-05-11 10:46:54 -07:00
Seth Alves	356ccdba26	debug icon for clientOnly	2016-05-10 16:16:06 -07:00
Seth Alves	f90b9ec65d	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub	350743454b	Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 ... use smart pointers for entity simulations	2016-05-10 11:35:57 -07:00
Seth Alves	4c1f815870	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub	d7eee98acc	Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum ... resurrection of threadsafe ViewFrustum	2016-05-10 09:06:38 -07:00
Seth Alves	b761ecf44f	merge from upstream	2016-05-10 08:18:45 -07:00
Andrew Meadows	59c6a6dfea	Merge pull request #7825 from sethalves/linux-qol ... Linux qol	2016-05-09 15:34:10 -07:00
Brad Hefta-Gaub	2c0204b0d6	Merge pull request #7821 from Atlante45/fix/collision-sound ... Fix avatar/entity collision sound	2016-05-09 14:24:19 -07:00
Seth Alves	0ab0409979	revert accidental change	2016-05-07 17:48:37 -07:00
Seth Alves	91ff851bf8	fix call to queueEditEntityMessage	2016-05-07 16:59:54 -07:00
Seth Alves	0e6d9a1eec	avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.	2016-05-07 14:48:31 -07:00
Seth Alves	a0771f8ee5	use smart pointers for entity simulations	2016-05-07 09:14:33 -07:00
Seth Alves	073d845bb5	show with debug icons when someone else is the simulation owner	2016-05-05 18:33:01 -07:00
Andrew Meadows	bcf2cc8074	use references not pointers for ViewFrustums ... also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft	2016-05-05 18:28:27 -07:00
Seth Alves	cb523a3a71	disable webSurface differently	2016-05-05 16:01:05 -07:00
Seth Alves	b5a3baf322	Merge branch 'master' of github.com:highfidelity/hifi into linux-qol	2016-05-05 15:55:37 -07:00
Atlante45	07adef9465	Fix entities collision sounds	2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub	49d02b802a	Merge pull request #7719 from zzmp/feat/resource-prefetch ... Add prefetching to exposed caches	2016-05-02 18:04:26 -07:00
Seth Alves	ef85cc7803	hook up zone flyingAllowed flag to character controller	2016-05-01 14:47:12 -07:00
Zach Pomerantz	13945aa4d9	Annotate all virtual fns with override	2016-04-30 13:48:59 -07:00
Zach Pomerantz	bc8a171fde	Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch	2016-04-27 11:55:24 -07:00
Andrew Meadows	b5ad989811	more optimized uses of EntityItem::getDimensions()	2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub	b597f7001b	fix auto resize	2016-04-26 15:13:11 -07:00
Seth Alves	c9df446879	web-entities don't yet work right on Linux	2016-04-24 08:15:10 -07:00
Seth Alves	e2025b0d1f	lock entity-tree before accessing entities	2016-04-21 15:27:15 -07:00
Zach Pomerantz	c096b0dfa1	Add TextureType to NetworkTexture for reflection	2016-04-20 20:18:22 -07:00
Howard Stearns	9ff9682b2a	Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange ... Reset entities script engine on domain change	2016-04-19 11:14:28 -07:00
samcake	cadb53b703	Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more	2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub	55010cebb7	remove unhelpful comment	2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub	374ba10524	more CR feedback	2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub	0d20f2468e	CR feedback	2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub	c26115cf2e	one small tweak	2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub	f6c75d0530	cleanup	2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub	d1f6b371c9	cleanup	2016-04-18 10:27:12 -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	87078b1ea2	first cut at resetting entities script engine on domain change	2016-04-16 11:09:23 -07:00
Brad Hefta-Gaub	91334d6a39	Merge pull request #7664 from ZappoMan/reduceJointProperties ... only export joint values if they've been explicitly set by scripts	2016-04-14 15:30:04 -07:00
Brad Hefta-Gaub	b48503a82d	only export joint values if they've been explicitly set by scripts	2016-04-13 19:52:50 -07:00
Zach Pomerantz	7a15339631	Use AnimationCache for models	2016-04-13 15:44:47 -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
Brad Davis	8e1e11a6f8	Merge pull request #7615 from zzmp/fix/amd-particles ... Add explicit layout to textured particle shader	2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub	7ba08dd137	Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix ... Reading animation properties without an entityTree lock is considered harmful	2016-04-08 10:37:17 -07:00
Zach Pomerantz	4e3ab73941	layout std140 in particle shader	2016-04-07 17:27:51 -07:00
Anthony J. Thibault	8f530ceaf9	Reading animation properties without an entityTree lock is considered harmful ... In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock. In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.	2016-04-07 13:42:40 -07:00
Zach Pomerantz	1e710712cc	Check entities scripting thread before signaling it	2016-04-06 11:19:07 -07:00
Anthony J. Thibault	6a7a572b53	Model: Toggling Physics > Draw Collision Hulls works again ... Collision renderItems were never getting removed when shouldShowCollisionHull became false.	2016-04-05 11:06:24 -07:00
Zach Pomerantz	0e9b783ca3	Release skybox texs when not rendering	2016-04-01 14:46:50 -07:00
Zach Pomerantz	e4cba14333	Avoid recreating model items when adding to scene	2016-03-31 10:46:51 -07:00
Zach Pomerantz	377a20e983	Use default texs for empty json	2016-03-31 10:46:51 -07:00
Zach Pomerantz	984bacdae3	Rearrange model entity render to reduce flicker	2016-03-31 10:46:51 -07:00
Zach Pomerantz	3de5f73a1f	Fixup model on tex load	2016-03-31 10:46:51 -07:00
Brad Hefta-Gaub	03f9a2b46f	more optimization in find best zone	2016-03-31 09:36:51 -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
Zach Pomerantz	01db2be6b8	Avoid JSON parsing texs every render cycle	2016-03-30 14:48:57 -07:00
Zach Pomerantz	e4f12c81e0	Get remap textures through getter	2016-03-30 14:11:36 -07:00
Brad Hefta-Gaub	32308c7810	Merge pull request #7501 from zzmp/fix/parse-tex ... Respond to error from free in texture parsing	2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub	8a47c5a35f	Merge pull request #7504 from zzmp/log/building-web-surface ... Log OffscreenQml lifetime	2016-03-29 18:11:16 -07:00
Zach Pomerantz	ad9027f9d6	Log OffscreenQml lifetime	2016-03-29 15:26:22 -07:00
Zach Pomerantz	6c7b6cd62e	Return parsed tex directly as variant	2016-03-29 14:16:22 -07:00
Zach Pomerantz	848e7703ee	Test textures emptiness correctly	2016-03-29 10:50:27 -07:00
Zach Pomerantz	29dedd5524	Update model URL on render thread	2016-03-29 10:42:40 -07:00
Zach Pomerantz	2de94e672b	Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching	2016-03-28 14:08:30 -07:00
Philip Rosedale	dfb09f134a	Merge pull request #7476 from ZappoMan/bugFixes ... fix a couple of model bugs	2016-03-25 15:58:52 -07:00
Seth Alves	f3ba16ab3e	fix locking around polyvox state flags	2016-03-25 14:06:57 -07:00
Seth Alves	d97ab1e2fc	Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking	2016-03-25 13:53:01 -07:00
Brad Hefta-Gaub	4ebb114a8e	also fix joint simulation from 3rd party editors	2016-03-25 11:43:32 -07:00
Brad Hefta-Gaub	759fac228c	fix the doppelganger	2016-03-25 11:29:14 -07:00
Brad Hefta-Gaub	6c6131c7b3	fix the doppelganger	2016-03-25 11:22:54 -07:00
Brad Hefta-Gaub	984d6ae48f	fix model resizing bug	2016-03-25 10:46:14 -07:00
Zach Pomerantz	5d306a74d5	Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching	2016-03-25 10:09:37 -07:00
Seth Alves	ae6d6f4bb3	added comments, minor cleanups	2016-03-24 21:37:46 -07:00
Zach Pomerantz	413c3b88cf	Accept textures as list or json	2016-03-24 19:40:02 -07:00
Seth Alves	1b88284bf7	more threading cleanups	2016-03-24 19:14:25 -07:00
Seth Alves	f8fe7b5868	add back getMesh call	2016-03-24 17:22:34 -07:00
Seth Alves	6abed67c05	cleanups	2016-03-24 15:46:30 -07:00
Seth Alves	7c910fcf5e	further reworking of polyvox threading	2016-03-24 15:28:19 -07:00
Zach Pomerantz	3e9e083df5	Update users of NetworkGeometry	2016-03-24 11:35:41 -07:00
Seth Alves	bd178640f1	Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking	2016-03-24 09:51:31 -07:00
Seth Alves	462da3aaf3	don't call getMesh from render	2016-03-23 22:46:43 -07:00
Seth Alves	2d7f32a554	redo polyvox locking	2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub	3fa3b40f43	fix non-animated motor proteins	2016-03-23 15:56:31 -07:00
Brad Hefta-Gaub	492e71345a	Revert "Revert "Fix ModelBlender crash"" ... This reverts commit f274cdcc7f.	2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub	f274cdcc7f	Revert "Fix ModelBlender crash"	2016-03-21 10:47:31 -07:00
Andrew Meadows	d7d428d1b2	Merge pull request #7387 from ZappoMan/fixBlenderCrash ... Fix ModelBlender crash	2016-03-21 09:14:11 -07:00
Seth Alves	f8b8877369	coding standard	2016-03-20 17:37:06 -07:00