Code

History

Commits on master to libraries/render-utils/src/Model.cpp455+
  1. merge from masterSamGondelman committed 10 years agodd51e0e
  2. Merge remote-tracking branch 'upstream/master' into loadingFadeSamGondelman committed 10 years ago771e105
  3. implement support for updating the render items of models when they finish their fadeBrad Hefta-Gaub committed 10 years ago83280aa
  4. merge from masterSamGondelman committed 10 years agob6e73e0
  5. use loadCollisionModelURLFinished when collisions model is finishedSeth Alves committed 10 years agoc743cf3
  6. merge from upstream, don't hold up enabling of physics if a collision hull fails to loadSeth Alves committed 10 years agoad4fc8c
  7. make failed geomtetry request not hold physicsStephen Birarda committed 10 years ago5d3e125
  8. when an avatar URL fails, switch to the defaultSeth Alves committed 10 years agob953e6f
  9. fade on texture loadSamGondelman committed 10 years ago313ba87
  10. release geometry refs in Model::deleteGeometry()Andrew Meadows committed 10 years agod876251
  11. setCollisionModelURL() more symmetric with setURL()Andrew Meadows committed 10 years ago3e43859
  12. namechange: fetchResource --> getGeometryResourceAndrew Meadows committed 10 years ago4bebb68
  13. NetworkGeometry --> GeometryResourceWatcherAndrew Meadows committed 10 years ago9f7d2cf
  14. pick against avatar's capsule and then against the T-pose meshSeth Alves committed 10 years ago11542ae
  15. trying to take joint information into account when raypicking against modelsSeth Alves committed 10 years ago5f9c7b6
  16. experimentingSeth Alves committed 10 years agod53c7ae
  17. fix commentAndrew Meadows committed 10 years ago5d5dc28
  18. use many colors for collision hull renderingAndrew Meadows committed 10 years agoc73757f
  19. Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precisionBrad Hefta-Gaub committed 10 years ago06cb625
  20. quiet gcc 5 warningsSeth Alves committed 10 years ago40e862c
  21. Convert JointData from relative frame to absolute.Anthony J. Thibault committed 10 years ago55b0060
  22. Eye tracking bug fix and debug rendering improvementAnthony J. Thibault committed 10 years ago641e152
  23. Model: fixed two crash issues when changing avatarsAnthony Thibault committed 10 years ago865a77a
  24. Merge branch 'master' into tony/culling-fixesAnthony J. Thibault committed 10 years ago5e81ccc
  25. Model: update renderItems when items are added to the scene.Anthony J. Thibault committed 10 years agobc967f0
  26. Avoid recreating model items when adding to sceneZach Pomerantz committed 10 years agoe4cba14
  27. Fixup model on tex loadZach Pomerantz committed 10 years ago3de5f73
  28. Merge pull request #7519 from zzmp/fix/avatar-crashBrad Hefta-Gaub committed 10 years agoa7f93aa
  29. Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fixAnthony Thibault committed 10 years ago26b9469
  30. Guard updateClusterMatrices from unloaded geoZach Pomerantz committed 10 years ago6e0d6ee
  31. Guard against reset model geo on scene updateZach Pomerantz committed 10 years ago00db095
  32. Model: Fix for equipped models not updating their matricesAnthony J. Thibault committed 10 years agof6344c3
  33. Model: fix for crash when displaying collision mesh.Anthony J. Thibault committed 10 years ago1032574
  34. Update after merge changes to NetworkGeometry.Anthony J. Thibault committed 10 years ago24ca5b3
  35. Merge branch 'master' into tony/animated-cullingAnthony J. Thibault committed 10 years ago940f3e6