Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to libraries/render-utils/src/Model.cpp210+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into rigHoward Stearns committed 11 years agob685378
  2. move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shouldersSeth Alves committed 11 years agoc1f777e
  3. FIxed the problem on Mac, by removing all of the gpuConfig includesgit status q :q wqsamcake committed 11 years agofbf21cb
  4. Fix for head cauterization.Anthony J. Thibault committed 11 years agoe52bf2e
  5. Clear translation on root joint.Anthony J. Thibault committed 11 years ago7a10b31
  6. Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2Howard Stearns committed 11 years agoa9f7632
  7. Merge howard/rig into andrew/caesiumAndrew Meadows committed 11 years ago2c66af6
  8. remove legacy shapesAndrew Meadows committed 11 years ago0a5ada3
  9. compile on linux with GLEWAndrew Meadows committed 11 years ago77a12eb
  10. Remove cauterize code from Rig and move it back into Model.Anthony J. Thibault committed 11 years agob06485c
  11. Fix NPC animations.Howard Stearns committed 11 years ago4754615
  12. merge from upstreamSeth Alves committed 11 years ago6e5aca6
  13. add some javascript callable stuff back to MyAvatarSeth Alves committed 11 years ago5ae15d4
  14. Kill warnings.Howard Stearns committed 11 years ago1bb734a
  15. Merge pull request #8 from AndrewMeadows/cadmiumHoward Stearns committed 11 years agoef52c07
  16. Pass correct position/velocity/orientation to Rig simulation.Howard Stearns committed 11 years ago990f0d6
  17. remove unused legacy Shapes from Model and friendsAndrew Meadows committed 11 years ago73ac941
  18. Start of state.Howard Stearns committed 11 years agodac6667
  19. Merge branch 'master' of github.com:highfidelity/hifi into rigSeth Alves committed 11 years ago1e19e46
  20. get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshesSeth Alves committed 11 years ago33c97a1
  21. move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protectedSeth Alves committed 11 years ago4566d16
  22. remove non-batch versions of GeometryCache renderXYZ() methodsZappoMan committed 11 years agoc2113ea
  23. JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.Seth Alves committed 11 years agoee334ff
  24. back out some changes to Model.cpp, change how rig pointer is delivered to model initilizerSeth Alves committed 11 years ago7c8d52c
  25. merge from upstreamSeth Alves committed 11 years agofecdc08
  26. merge from upstreamSeth Alves committed 11 years agocdc2652
  27. whenever Model class uses _jointState, use the Rig version if there is a Rig.Seth Alves committed 11 years agoabfe60a
  28. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago59acfc9
  29. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years agofc29563
  30. Removing GL headers from most files, and some naked GL from application.cppBrad Davis committed 11 years agod68618e
  31. Fix some more smart pointerAtlante45 committed 11 years ago052c3c9
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago256c786
  33. give SkeletonModel created by MyAvatar a Rig pointerSeth Alves committed 11 years agod287817
  34. move AnimationHandle from render-utils to animation. give Rig some jointstates and animation listsSeth Alves committed 11 years agobcd6b30
  35. Clearing Model.cpp from naked gl call referencesSam Gateau committed 11 years ago9657d14