Brad Davis
|
03cb6175ab
|
Support triangle and hexagon shapes, add shape support to overlays.
|
2016-07-15 22:02:17 -07:00 |
|
Andrew Meadows
|
25fdea6bac
|
fix for change of API after rebase
|
2016-07-13 15:13:35 -07:00 |
|
Andrew Meadows
|
72175ae09e
|
fix warnings about implicit casts
|
2016-07-09 22:55:55 -07:00 |
|
Andrew Meadows
|
207ddcea38
|
wrap hull about each mesh part
|
2016-07-09 22:25:28 -07:00 |
|
Brad Hefta-Gaub
|
5f71f77445
|
Merge pull request #8192 from AndrewMeadows/simple-hull-shapes
experimental ModelEntityItem collision shape options (no visual debugging)
|
2016-07-08 08:55:11 -07:00 |
|
Andrew Meadows
|
e4828b03b1
|
fix crash when building shape before model loaded
|
2016-07-07 13:32:30 -07:00 |
|
Brad Davis
|
c7382ea886
|
Optimize updateModelBounds
|
2016-07-07 11:11:26 -07:00 |
|
Brad Davis
|
5220b52cd9
|
Don't trigger entity scripts without scripting interface
|
2016-07-06 18:13:15 -07:00 |
|
Andrew Meadows
|
3c4f9f8016
|
refert debug hack
|
2016-07-06 15:51:17 -07:00 |
|
Andrew Meadows
|
15ff7bc731
|
final hack tweak
|
2016-07-06 14:35:57 -07:00 |
|
Andrew Meadows
|
301a9f4434
|
improved hack logging
|
2016-07-06 14:31:43 -07:00 |
|
Andrew Meadows
|
11ef245671
|
temp hack for debugging
|
2016-07-06 14:28:09 -07:00 |
|
Andrew Meadows
|
5659d57ac3
|
fix shape generation for SIMPLE_COMPOUND
|
2016-07-06 13:00:57 -07:00 |
|
Andrew Meadows
|
6cbc566a77
|
remove debug cruft
|
2016-07-06 11:53:26 -07:00 |
|
Andrew Meadows
|
33d732c446
|
construct geometry for new shape types
|
2016-07-06 10:51:15 -07:00 |
|
Andrew Meadows
|
74781c0786
|
boxify static meshes with too many vertices
|
2016-06-28 16:36:10 -07:00 |
|
Andrew Meadows
|
e88b264864
|
revert compound hull shape generation
|
2016-06-22 09:30:44 -07:00 |
|
Andrew Meadows
|
937bd0c1be
|
SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH
|
2016-06-21 13:54:21 -07:00 |
|
Andrew Meadows
|
f22a5613bd
|
fix static mesh for model with per-mesh transforms
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
5484b6fbb7
|
more correct extraction from triangle strips
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
c0c77e9027
|
optimize/cleanup compound/mesh shape computation
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
f444b70fdc
|
fix collision shape for scaled models
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
ab3548cac0
|
fix crash
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
d1752211e6
|
make implicit casts explict
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
a519b77ae7
|
add SHAPE_TYPE_MESH and build mesh shapes
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
9fc77ccfa2
|
use reference to avoid big copy
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
d64729372a
|
ShapeInfo name changes
|
2016-06-20 17:29:20 -07:00 |
|
SamGondelman
|
8a682450a9
|
still trying to fix cmake errors
|
2016-06-10 17:01:22 -07:00 |
|
SamGondelman
|
53435fc730
|
removed extra argument
|
2016-06-10 14:04:33 -07:00 |
|
SamGondelman
|
da98ee0916
|
reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition
|
2016-06-10 13:42:19 -07:00 |
|
SamGondelman
|
24e5000aeb
|
exposed orientation and eye position to procedural entity shaders
|
2016-06-08 18:26:54 -07:00 |
|
Andrew Meadows
|
2a3da60ed4
|
remove some magic numbers
|
2016-06-03 10:47:54 -07:00 |
|
Andrew Meadows
|
eff59d3fd3
|
build compound sub meshes shapes with less copying
|
2016-06-03 10:47:54 -07:00 |
|
Andrew Meadows
|
7858ef84b3
|
don't copy points onto itself
|
2016-06-03 10:47:54 -07:00 |
|
Andrew Meadows
|
654468619c
|
swap order of if-else blocks
|
2016-06-03 10:47:54 -07:00 |
|
Andrew Meadows
|
d591561a88
|
remove RenderableModelEntityItem::_points
use ShapeInfo::_points instead
|
2016-06-03 10:47:54 -07:00 |
|
Brad Hefta-Gaub
|
c85923c69b
|
Merge pull request #7956 from jherico/web_entity_crash
fix crash on click on non-visible web-entity
|
2016-06-03 10:29:55 -07:00 |
|
Brad Davis
|
cc85ce9c01
|
fix crash on click on non-visible web-entity
|
2016-06-02 16:37:45 -07:00 |
|
samcake
|
1dca62f752
|
Introducing a new technique for normal packing and fixing a bug on the normal buffer format
|
2016-06-01 17:51:53 -07:00 |
|
Brad Davis
|
2c703e963c
|
More shapes
|
2016-05-22 19:48:59 -07:00 |
|
Brad Davis
|
cd1e910844
|
Add a generic shape primitive
|
2016-05-21 23:46:44 -07:00 |
|
Seth Alves
|
f91a2403be
|
merge from upstream
|
2016-05-20 17:07:34 -07:00 |
|
Brad Hefta-Gaub
|
18613908df
|
Merge pull request #7800 from sethalves/no-fly-zones
No fly zones
|
2016-05-20 16:59:55 -07:00 |
|
Seth Alves
|
ff36b39067
|
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
|
2016-05-20 14:38:53 -07:00 |
|
Seth Alves
|
76f4a25694
|
move code that clears old scale and registration to after model is loaded
|
2016-05-20 11:40:46 -07:00 |
|
Seth Alves
|
74520f5c92
|
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
|
2016-05-19 09:49:44 -07:00 |
|
Seth Alves
|
419c744bd4
|
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
|
2016-05-19 09:49:18 -07:00 |
|
Brad Hefta-Gaub
|
67891abf17
|
Merge pull request #7877 from Atlante45/fix/asset-client
Fix Asset Client crash
|
2016-05-18 11:37:34 -07:00 |
|
Seth Alves
|
3380b2a668
|
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
|
2016-05-17 19:10:33 -07:00 |
|
Chris Collins
|
b2ece6f4a7
|
Merge pull request #7882 from zzmp/fix/script-thread-dtor
Wait and cleanly exit the scripting thread
|
2016-05-16 16:52:54 -07:00 |
|