852 commits

Author	SHA1	Message	Date
Anthony Thibault	08c6acdf99	Improve blendshape precision for small models ... For avatars authored in meters, the max component length would often be less then 1. In that case, the blendshape offset was not normalized before quantization, resulting in loss of precision. This change will normalize the offset for all cases, except when the max component length is 0.	2019-03-26 11:21:13 -07:00
SamGondelman	c1c45d8a01	revert some now unnecessary changes that were impacting performance ... (cherry picked from commit b6984de16c2fd17f04ea72de7b339c31db6467ab)	2019-03-22 11:55:04 -07:00
SamGondelman	2b32b77bed	handle case when clusterMatrices.size() == 0	2019-03-11 17:32:40 -07:00
SamGondelman	b24b7fed3d	the root node isn't the first onegit add ../.git add ../.	2019-03-11 15:34:41 -07:00
Shannon Romano	8be93fd16c	Merge pull request #14891 from kencooke/glm-pack-normals-speedup ... Case 21114: SIMD optimized blendshape packing	2019-03-07 15:28:40 -08:00
SamGondelman	fd88ec0d16	need to copy meshStates on main thread	2019-03-04 15:25:02 -08:00
SamGondelman	708632ee82	possible fix for model crash	2019-03-04 10:00:26 -08:00
Shannon Romano	5f99158c25	Merge pull request #14977 from SamGondelman/rot ... Case 21354: Add "modelScale" property to fix pal	2019-02-22 16:36:17 -08:00
SamGondelman	6d6cd42adb	fix bound scaling	2019-02-22 12:00:00 -08:00
Anthony Thibault	e54754c4ce	Merge pull request #14926 from luiscuenca/flowCpp ... Cpp implementation of the Flow script	2019-02-21 17:10:05 -08:00
luiscuenca	dcbf57ee0b	Fix linux warning and HMD breaks flow	2019-02-21 16:41:24 -07:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
SamGondelman	fdbcf4b2ea	cleanup and expose mapped materials to getScriptableModel	2019-02-12 12:03:35 -08:00
SamGondelman	f75a3e1a72	it's working!	2019-02-12 11:41:47 -08:00
SamGondelman	61346437da	working on material mapping	2019-02-12 09:22:31 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
SamGondelman	4f03157f39	working on fst material mapping	2019-02-11 10:20:55 -08:00
Ken Cooke	68480f6760	Replace glm::packSnorm3x10_1x2() with fast SIMD implementation	2019-02-09 10:49:18 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
Sam Gateau	3ec9290dca	Merge pull request #14619 from SamGondelman/matTarget ... Case 20240: Better material entity targeting	2019-01-23 15:47:22 -08:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
Andrew Meadows	0072684d98	remove cruft and fix error in transform to mesh frame	2019-01-04 12:37:23 -08:00
SamGondelman	3578df7a0e	material targeting	2018-12-19 13:28:33 -08:00
amantley	c8cd65c3bd	added getter for the orginal cluster bind matrix values in AnimSkeleton	2018-11-15 09:58:10 -08:00
amantley	80ebde1036	started cleanup of pr	2018-11-14 17:27:45 -08:00
amantley	8256c652fc	added the hook to put the copy of the mutated bind poses into tthe skeleton	2018-11-14 17:02:25 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
SamGondelman	47c6825aea	CR	2018-10-18 11:08:53 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
sam gateau	5d0f2e3035	And more changes for better syntax and less useless stuff	2018-10-02 13:09:04 -07:00
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Sam Gateau	c95c736b1f	FOUnd a working path for gl41	2018-10-01 22:50:29 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -07:00
sam gateau	392e2ff535	trying and failing andad trying and rince and repeat	2018-10-01 17:45:16 -07:00
Sam Gateau	5842416ae6	Exploring the possible packing schemes and trying to debug the tangent	2018-09-30 23:11:36 -07:00
sam gateau	1ff4c54c1c	Packing normal and tangents	2018-09-28 17:49:52 -07:00
Sam Gateau	faf489855c	Packing the offsets and catching up performances	2018-09-28 02:13:08 -07:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00
Sam Gateau	8923055e91	Exploring the bad peroformances	2018-09-27 00:15:34 -07:00
sam gateau	34203c67b0	Addressing the merge with master	2018-09-26 15:42:13 -07:00
sam gateau	1e112d3c84	bringing back a bug fix from samuel	2018-09-26 14:15:42 -07:00
SamGondelman	21cd3948ae	improve blender queuing	2018-09-25 12:07:05 -07:00
sam gateau	7cf7eaa7c8	Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape	2018-09-24 17:34:42 -07:00
SamGondelman	d772cdb34a	please	2018-09-24 10:16:35 -07:00
sam gateau	5d80a89094	Apply fix to gl41 backend needed for proper Resource BUffer on gl41	2018-09-20 16:09:08 -07:00
sam gateau	4fc6466250	update shaders	2018-09-19 17:27:58 -07:00
sam gateau	ec6117e9bb	bringing the blendshape in skin shader only work in master	2018-09-18 17:40:29 -07:00
SamGondelman	2b2091290e	fix everything	2018-09-12 15:32:35 -07:00
SamGondelman	1a36693161	I hate blendshapes	2018-09-11 16:58:38 -07:00
SamGondelman	cde2dc2eaa	please work	2018-09-05 17:04:05 -07:00
SamGondelman	028092f803	fix blendshapes one last time	2018-08-31 13:33:45 -07:00
Sam Gondelman	067d7b280d	Merge pull request #13900 from SamGondelman/blendshapeCrash ... Fix blendshape crash	2018-08-30 17:10:24 -07:00
SamGondelman	248c2621a4	fix blendshapes crash	2018-08-29 17:57:54 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
SamGondelman	ff6020e0ef	fix compile errors, maybe	2018-08-24 15:41:25 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
SamGondelman	9ab1fc0500	Merge remote-tracking branch 'upstream/master' into perf	2018-08-20 17:04:42 -07:00
SamGondelman	05ff99a1d2	working on blendshapes	2018-08-20 11:40:25 -07:00
amantley	274bf33318	fix for the avatar scale reset when we re-enter hmd mode	2018-08-07 18:29:51 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
Wayne Chen	8f23fb01a4	removing unused variables	2018-07-10 07:30:02 -07:00
Wayne Chen	bf5cdb0e5f	removing unused variables from lambda capture expressions	2018-07-09 22:31:49 -07:00
SamGondelman	ca5ce888f4	parabola triangle intersection	2018-07-09 18:11:57 -07:00
humbletim	dc5c5c20df	raypick partIndex commit ... include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
sabrina-shanman	79fd3cb181	Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class	2018-06-14 15:49:40 -07:00
sabrina-shanman	3c4050884e	Remove straggler ifdef in Model class	2018-06-14 14:40:22 -07:00
sabrina-shanman	82fddfc31f	Remove unused constant in Model.cpp	2018-06-13 13:03:07 -07:00
sabrina-shanman	440c77905a	Remove functionality for rendering collision meshes directly in the Model class	2018-06-11 11:03:57 -07:00
howard-stearns	df0ecb44a8	fix crash setting model texture ... (cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)	2018-06-07 13:21:45 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -07:00
Sam Gateau	2f94c43968	Removing the getLayer from the meshPArtPayload and check that it s working	2018-05-28 23:20:04 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
samcake	221b513b19	Oh boy	2018-05-25 16:33:34 -07:00
SamGondelman	9f3a431c5d	minimum entity dimension	2018-04-12 14:12:52 -07:00
SamGondelman	444534f4ff	model behaves correctly if missing material ... (cherry picked from commit 1e89debc4e)	2018-03-16 15:51:37 -07:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
SamGondelman	a4b04d9d43	merge	2018-02-27 10:08:30 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
humbletim	d3bae87066	* remove unneeded Q_DECLARE_METATYPEs ... * CR feedback	2018-02-26 19:07:55 -05:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
humbletim	3dbe5d79bb	fix windows punctilious warnings	2018-02-26 06:01:16 -05:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Anthony J. Thibault	86351f19a9	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-22 08:44:21 -08:00
humbletim	010c714abc	restore original Entities.getMeshes	2018-02-22 08:51:54 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
Nissim Hadar	b2a06cdb98	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/ShapeEntityItem.h # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2018-02-19 13:05:57 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
SamGondelman	38290064c1	replace materials by name, hide material mode for now	2018-02-13 13:24:08 -08:00
Anthony J. Thibault	7f5f48bca9	Models can now switch between dual quats and matrix palette skinning. ... but not dynamically, because we still only compile one version of the shader.	2018-02-13 11:37:14 -08:00
Anthony J. Thibault	cf5452313a	WIP check in of making the use of dq or mat dynamic per model	2018-02-12 18:44:24 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, ... and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
humbletim	a08770c816	cleanup	2018-02-09 02:29:20 -05:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion ... update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
samcake	8dfa3aace3	cleaning en route	2018-01-26 17:34:37 -08:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
Seth Alves	7c32d3c536	flip logic back around	2018-01-18 13:49:17 -08:00
Seth Alves	0ad4cdc41b	works now	2018-01-18 13:15:47 -08:00
Seth Alves	fb974b0b9c	attempt to straighten out use of view-visibility masks	2018-01-18 10:09:23 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor ... Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
Bradley Austin Davis	25b778be1d	Tracking down remaining SOX crashes	2018-01-17 12:18:39 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Anthony J. Thibault	bc587bf6d8	Removal of legacy Rig methods	2018-01-16 18:19:35 -08:00
Anthony J. Thibault	576273efe3	Remove Rig::restoreJointPosition and references to it.	2018-01-16 18:01:58 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
Dante Ruiz	645f608814	fixing merge conflict	2018-01-15 10:45:51 -08:00
Dante Ruiz	c76fdd1f5f	adding scale	2018-01-15 10:43:26 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Anthony J. Thibault	7753b8a0b5	Merge branch 'master' into feature/dual-quat	2018-01-11 17:31:29 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Olivier Prat	db9e5fdae8	Merged from master but rendering seems broken	2018-01-09 11:05:34 +01:00