Commit graph

426 commits

Author SHA1 Message Date
SamGondelman
4f03157f39 working on fst material mapping 2019-02-11 10:20:55 -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
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
Sam Gondelman
6ed38ea333
fix build errors 2018-10-10 16:16:56 -07:00
Sam Gondelman
296bd65c9b
fix build errors 2018-10-10 16:05:14 -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
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
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
sam gateau
34203c67b0 Addressing the merge with master 2018-09-26 15:42:13 -07:00
SamGondelman
21cd3948ae improve blender queuing 2018-09-25 12:07:05 -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
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -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
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
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
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
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
2018-02-27 11:33:05 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
humbletim
f824edd04e * remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
humbletim
058e4d1926 CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:12:33 -05: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
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
Anthony J. Thibault
d2c199104e Avatars use Dual Quaternion Skinning and Model Entities do not. 2018-02-13 17:47:49 -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
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
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Anthony J. Thibault
21c1e32490 Bug fix for avatar neck cauterization
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader.  If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.

(cherry picked from commit faf8350369)
2018-01-25 17:47:39 -08:00
samcake
ae6a95ec0d fixing my bugs on vissibility 2018-01-24 18:07:35 -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
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
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
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
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Anthony J. Thibault
b8c88fca3b Dual Quaternion skinning optimization
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
2018-01-04 16:17:23 -08:00