Seth Alves
fea60499d4
rename poorly named variable
2016-02-19 11:32:59 -08:00
Seth Alves
ee5a82f9b8
call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible
2016-02-19 10:05:22 -08:00
samcake
b03f639e2c
Renaming and rearranging the material fields to support PBR fbx materials
2016-02-16 17:20:23 -08:00
samcake
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -08:00
howard-stearns
2e7f1cbb3f
Align avatar animation with LOD visibility.
2016-01-26 11:59:18 -08:00
Zach Pomerantz
4ff2b85e1a
Replace ShapePipelineLib abstract with ShapePlumber instanced class
2016-01-11 16:00:08 -08:00
Zach Pomerantz
56aba41299
Rename ShapeRender to DeferredPipelineLib
2016-01-08 14:02:49 -08:00
Zach Pomerantz
63444aac72
Back to shapeContext, compiling
2016-01-05 17:20:08 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Anthony J. Thibault
6b5b272cd7
Added SoftAttachmentModel class.
...
Is a subclass of Model, it overrides the updateClusterMatrices so it will pull
the actual joint matrices from a different rig override.
For the avatar soft attachment system, this override will be the Avatar::_skeletonModel rig.
This will give us the ability for an avatar to "wear" non-rigid attachments, such as clothing.
2015-12-18 09:52:11 -08:00
Seth Alves
0003c607ea
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 18:46:21 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
samcake
94b6ca4450
FIxing the bad lambda capture for local variables
2015-12-11 10:48:58 -08:00
samcake
20f3d6abe1
REmoving comments
2015-12-10 16:52:03 -08:00
samcake
dffb83a488
Potentially working correctly
2015-12-10 16:31:00 -08:00
samcake
5805cc8f2b
Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry
2015-12-10 14:59:04 -08:00
Anthony J. Thibault
652ce5501f
Expose Avatar default pose to JavaScript
...
New JavaScript API to get the avatar's default pose.
MyAvatar.getDefaultJointRotation(index);
MyAvatar.getDefaultJointTranslation(index);
See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -08:00
samcake
f9269523a1
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-09 16:58:56 -08:00
samcake
9eb40bcd65
Trying to redner the collision geometry correctly but still an issue with the bounding box i get
2015-12-09 16:58:14 -08:00
samcake
1adf2cc8ba
Repesenting the collision meshes of a Model correctly
2015-12-08 16:45:12 -08:00
Seth Alves
dffa37c0e7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-08 09:44:50 -08:00
samcake
b24af06589
Fixing the display of the collision hull mesh
2015-12-07 18:26:55 -08:00
Stephen Birarda
6dbff93bbd
fix assert on model URL change from _renderItemsSet
2015-12-07 16:24:26 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Anthony J. Thibault
2f37335d77
Warning fixes
2015-11-20 14:50:42 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Stephen Birarda
429a4d51d5
Merge pull request #6375 from Atlante45/resize
...
Fix models resizing
2015-11-13 10:23:05 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
Brad Hefta-Gaub
eefe26d96a
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:24:49 -08:00
Atlante45
954391ae3e
Fix models resizing
...
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
2015-11-11 18:33:26 -08:00
Anthony J. Thibault
e698d3c1e8
Isolate JointStates within the Rig class
...
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig. Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.
This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
2015-11-11 18:23:58 -08:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
Brad Hefta-Gaub
021a6e689d
added some asserts to test future mistakes that would cause render item leaks
2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200
fix render item leak on Model::reset()
2015-11-09 16:41:40 -08:00
Seth Alves
6cb195b335
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-20 15:53:56 -07:00
Seth Alves
bc99ef778c
change how render engine is told about model position changes
2015-10-20 12:04:29 -07:00
Seth Alves
4903db45b1
give other avatars an anim-skeleton
2015-10-15 14:21:06 -07:00
samcake
0a351a8a0c
FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture
2015-10-07 14:26:33 -07:00
samcake
c92a6d58ab
Dispatch classes in their properly named files to appease the coding standard gods
2015-10-06 09:46:32 -07:00
samcake
59afbf1a04
Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render()
2015-10-06 01:15:53 -07:00
samcake
fc7f0c77a5
Rename ModelRenderPayload files to ModelRenderItem
2015-10-06 00:20:51 -07:00
samcake
12fedb6ff0
Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer
2015-10-05 18:31:05 -07:00
samcake
9e393ced46
MOving rednering code of Model into ModelRenderPayload.h/cpp
2015-10-05 09:17:16 -07:00
samcake
fd232b7d32
ONe more file to deal with the Model rendering
2015-10-04 22:27:48 -07:00
samcake
1799322c67
Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp
2015-10-04 18:46:35 -07:00
samcake
55f5ab3732
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-04 18:31:56 -07:00
samcake
48416262a1
Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced
2015-10-04 18:31:19 -07:00
samcake
edaa8f998a
Migrating to the new mesh for rendering and having problems with multi part mesh
2015-10-02 18:12:16 -07:00
samcake
edb485cb0f
working on getting the Model payload to use model::Mesh
2015-10-02 12:24:41 -07:00
Anthony J. Thibault
fc7b6dee84
Merge branch 'master' into transmit-joint-translation
2015-10-02 11:40:33 -07:00
samcake
b8ea83099a
Debuggging
2015-10-01 21:13:22 -07:00
samcake
4478ca79ca
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-10-01 19:55:14 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
samcake
840f92bd06
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c
merging
2015-09-29 10:53:56 -07:00
samcake
202d2944ab
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-28 17:24:59 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
samcake
d7d332acd4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
...
t :wq
2015-09-23 09:51:31 -07:00
samcake
518f5fe17c
Starting to clean the mesh part of the RenderItem....
2015-09-22 18:21:36 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
samcake
8941741508
Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap
2015-09-18 18:47:18 -07:00
Sam Gateau
d45547aa1a
Merge and update
2015-09-16 13:46:07 -07:00
Brad Davis
f4818c17cf
Fix avatar and other model animations
2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3
Don't do an O(N^2) operation on cluster matrices
2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Brad Davis
35e4440c4f
Don't do an O(N^2) operation on cluster matrices
2015-09-14 16:09:13 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
27f4bca0a4
Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread!
...
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
2015-09-08 14:49:58 -07:00
Howard Stearns
efeaf21305
Checkpoint smoother.
2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
Howard Stearns
8cf71f285d
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-01 16:03:40 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
