Thijs Wenker
712aff7ad6
base scale attachment on the natural dimensions
2017-05-23 17:53:08 +02:00
Chris Collins
207c13c3c3
Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer
...
MeshPartPayload keeps weak pointer to Model
2017-05-22 21:54:40 -07:00
Andrew Meadows
f7db877b7f
payload keeps weak pointer to Model
2017-05-22 17:29:15 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Andrew Meadows
17b6cf29df
check for valid resource pointer before use
2017-05-18 15:12:59 -07:00
Andrew Meadows
8d3285f733
verify _rig is valid in Model::deleteGeometry()
2017-05-18 11:11:50 -07:00
Brad Hefta-Gaub
36c7821e1e
Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
...
TriangleSet optimizations - ~80% improvement in Ray picking against models
2017-05-16 20:47:50 -07:00
Ryan Huffman
8eacf0ad4b
Remove unnecessary assert in Model.cpp
...
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
2017-05-16 10:56:33 -07:00
ZappoMan
eb3b27849c
only keep one copy of Triangles
2017-05-12 17:07:47 -07:00
ZappoMan
a15c5999b5
first cut at octree storage of Triangle Set
2017-05-10 16:58:51 -07:00
Anthony J. Thibault
e992d6703a
WIP: debug render joint constraints.
2017-05-08 15:06:28 -07:00
Andrew Meadows
f11d6eff92
fix typos: RenderItemsMap not RenderItems
2017-05-04 15:43:44 -07:00
samcake
c36f8da4c0
Fixing build on mac
2017-04-24 10:46:29 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
trent
36619cd2e4
Fixed issue with duplicate physics status icons per sub-object.
2017-03-22 15:07:29 -04:00
Andrew Meadows
d3fa28d4bc
remove cruft and fix indentation
2017-03-15 16:17:59 -07:00
Andrew Meadows
f250c0d298
simpler bindTransform() for ModelMeshPartPayload
2017-03-15 14:41:13 -07:00
Brad Hefta-Gaub
87934ee82d
fix bugs in some meshes
2017-03-06 21:50:32 -08:00
Brad Hefta-Gaub
f27475613f
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
2017-03-06 12:53:59 -08:00
ZappoMan
af97e9bdd9
CR feedback
2017-03-06 10:49:38 -08:00
ZappoMan
2a663cbcb1
cleanup
2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409
cleanup use of triangleSet for picking
2017-03-05 19:23:55 -08:00
ZappoMan
32add6635d
checkpoint on reducing raypicking recalcs
2017-03-04 23:33:17 -08:00
Ken Cooke
a5571bd49d
redo unsafe optimization
2017-03-04 16:02:39 -08:00
ZappoMan
9908723bb9
fist cut at basic TriangleSet class
2017-03-03 22:27:38 -08:00
Atlante45
1201932ee9
Fix SSE2 macros for Macos
2017-02-14 14:10:53 -08:00
samcake
c864e57855
first pass on a working image class and the mip generation
2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -08:00
Seth Alves
ab8be15ce0
Merge pull request #9570 from highfidelity/tablet-ui
...
Tablet ui
2017-02-01 09:38:13 -08:00
samcake
04d5173328
Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
...
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Andrew Meadows
489fbc6299
compute Model's local bounds outside render lambda
2017-01-27 09:35:36 -08:00
Seth Alves
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
Andrew Meadows
09707217ec
remove Model::simulateInternal()
2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f
add and remove some profile data points
2017-01-26 08:35:25 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Andrew Meadows
3dd8fd838b
move cauterization out of Model class
2017-01-19 12:56:07 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
samcake
0b9b5d595c
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Andrew Meadows
fd28457807
fix cauterization hack
2017-01-16 15:13:28 -08:00
Seth Alves
5a81dface9
avoid filling log with bogus warning
2017-01-13 12:00:51 -08:00
Seth Alves
e9422cbf1e
fix model scales
2017-01-12 16:38:27 -08:00
Seth Alves
5fa379fea2
fix model scales
2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00