Andrew Meadows
|
68dd66daec
|
create collision render geometry only when needed
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
eb65be5478
|
remove cruft argument from allocateModel()
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
b0a0293e6e
|
move compoundResource out of Model class
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
ef597265d7
|
remove unimplemented declaration
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
fe4198530f
|
don't render raw compound collision geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
191b7f0f39
|
variable namechange: Hull --> Mesh
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
329c5432ed
|
_showCollisionHull --> _showCollisionGeometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
1f84ef3053
|
compute normals for collision mesh geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
481d6990a3
|
trigger collision shape render mesh creation
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
3b772d2fe6
|
fallback to SIMPLE_COMPOUND when can't do COMPOUND
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
26f5d3cfaa
|
fix render geometry for collision shapes
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
daff897fc4
|
const shapes, and use *MotionState::setShape()
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
25fb7aacad
|
ShapeManager hands out const shape pointers
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
6b0ae654ba
|
cleanup logic around creating RenderItems
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
d8fa0d1dd1
|
segregateMeshGroups() --> createRenderItems()
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
726928c14c
|
creae collision Geometry from mesh
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
499150bbed
|
finish hook alert for new entity collision shape
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
b2dfa49a6f
|
stubbery for alerting entity that shape changed
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
1ed76ae442
|
added virtual ObjectMotionState::setShape()
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
cbacb02010
|
more unit tests for CollisionRenderMeshCache
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
0d84e6ece5
|
first CollisionRenderMeshCache unit test
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
c1216cbcaf
|
stubbery for CollisionRenderMeshCacheTests
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
e473edff4a
|
fix shapeManagerTests
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
b79af55e16
|
fix ref accounting for garbage collection
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
06d40afeac
|
don't forget to use the transform of child shapes
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
1e95e489cb
|
make mesh around btConvexShape, copy to model::Mesh
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
d0295f3876
|
remove cruft include
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
d59c997e64
|
remove stubbery, make physics lib depend on model
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
8d3f592e68
|
rename class to be more correct
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
9f26836b43
|
added basic CollisionGeometryCache container
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
af1be8ccd4
|
remove whitespace
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
e086792eac
|
enforce coding standards
|
2016-08-24 22:25:45 -07:00 |
|
Brad Davis
|
479d90a462
|
Merge remote-tracking branch 'upstream/stable'
|
2016-08-24 19:31:11 -07:00 |
|
Chris Collins
|
2c5a672c2a
|
Merge pull request #8521 from jherico/hotfix_fade_fix
Make sure we start fade in once an item becomes ready
|
2016-08-24 19:29:02 -07:00 |
|
James B. Pollack
|
f7697c88ae
|
Merge pull request #8476 from zzmp/fix/vive-ati
fix vive crash in AMD driver
|
2016-08-24 18:06:18 -07:00 |
|
Brad Davis
|
5cdb30357f
|
Add checking for failed downloads in the textures
|
2016-08-24 18:03:56 -07:00 |
|
Anthony Thibault
|
f971b4b041
|
Merge pull request #8457 from hyperlogic/feature/handheld-marketplace
Handheld Marketplace Tablet
|
2016-08-24 17:59:39 -07:00 |
|
Anthony J. Thibault
|
c234f1b65d
|
marketplace.js: merge fix for WebTablet.js path
|
2016-08-24 16:26:53 -07:00 |
|
Anthony J. Thibault
|
c2af948e25
|
Merge branch 'master' into feature/handheld-marketplace
|
2016-08-24 16:07:04 -07:00 |
|
Brad Davis
|
c5628b615c
|
Make sure we start fade in once an item becomes ready
|
2016-08-24 16:05:22 -07:00 |
|
Brad Hefta-Gaub
|
99ea180f09
|
Merge pull request #8495 from AndrewMeadows/faster-spherical-harmonics
speed up spherical harmonics calculation with minimal error
|
2016-08-24 15:57:42 -07:00 |
|
James B. Pollack
|
d9ebad7976
|
Merge pull request #8372 from elisa-lj11/zip_project
Added Clara.io to the marketplace
|
2016-08-24 15:53:58 -07:00 |
|
Ryan Huffman
|
4897d721c3
|
Merge pull request #8505 from imgntn/json_editor
New Editor for UserData JSON
|
2016-08-24 15:49:32 -07:00 |
|
Anthony J. Thibault
|
fce207ba5d
|
eslint fix
|
2016-08-24 15:31:13 -07:00 |
|
James B. Pollack
|
af2fb5d7ed
|
beautify more html
|
2016-08-24 14:54:00 -07:00 |
|
James B. Pollack
|
5305ec7feb
|
html beautify
|
2016-08-24 14:51:15 -07:00 |
|
James B. Pollack
|
384c3dd543
|
cleanup and handle a bug when changing from normal text userdata to another field
|
2016-08-24 14:49:41 -07:00 |
|
James B. Pollack
|
45e3f926a1
|
removed unused prints and cleanup
|
2016-08-24 14:19:27 -07:00 |
|
Brad Davis
|
211fb3f3df
|
Merge pull request #8520 from highfidelity/stable
Stable to Master
|
2016-08-24 12:20:29 -07:00 |
|
Chris Collins
|
2514587899
|
Merge pull request #8508 from highfidelity/RC-19
Beta Release 19 - Includes up to Developer Release 5298
|
2016-08-24 11:40:41 -07:00 |
|