Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Anthony J. Thibault
47b8ab373c
Fix for RenderableParticleEffectEntity crash.
...
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Seth Alves
2dc2757eca
code review
2015-08-18 13:03:54 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
ZappoMan
ae9ccb79ed
cleanup debugging and dead code
2015-08-17 15:58:51 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
Seth Alves
1a71c3cc04
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-17 10:17:58 -07:00
Seth Alves
af11e97daa
fix broken optimisation for skipping internal voxels when making collision hull
2015-08-17 08:49:00 -07:00
Brad Davis
db4d98ccb5
Polyvox shader fix
2015-08-16 23:21:45 -07:00
Seth Alves
1ee773a532
don't include interrior voxels in cubic collision hull
2015-08-16 14:11:37 -07:00
Seth Alves
c60a8e7dfc
minecraft style voxel editing largely works
2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c
ray-picks against cubic-voxels seem right, now
2015-08-16 11:51:04 -07:00
Seth Alves
0230d9397c
attempt to find exact ray intersection with cubic polyvox -- not working right, yet.
2015-08-16 11:04:52 -07:00
Seth Alves
b129c2a933
in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript
2015-08-16 09:36:54 -07:00
Seth Alves
c6530c4cec
fix newly created polyvox collision-hull bug
2015-08-15 16:16:27 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
Seth Alves
09a9deabdb
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 12:55:24 -07:00
Seth Alves
79a7755cdb
add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style
2015-08-15 12:18:36 -07:00
Seth Alves
27e5322cb4
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 11:25:27 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
Seth Alves
b26d6d2b9c
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
...
Renderable model entity item optimizations
2015-08-10 15:10:12 -07:00
ericrius1
8e7398ac7d
small comment change
2015-08-10 13:41:30 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
59dc6c9cca
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 11:47:54 -07:00
Andrew Meadows
5acd1e7d58
Merge pull request #5467 from sethalves/polyvox
...
Polyvox improvements (Warning: protocol change)
2015-08-10 11:12:10 -07:00
ericrius1
c299d77c92
fixed implicit double to float casting and incorrect header author attribution
2015-08-10 10:57:53 -07:00
ZappoMan
942958c4f1
only setJointState() if animation frame actually changed
2015-08-09 16:07:56 -07:00
ericrius1
19e645fc65
fixed the way colors are handled to work with new core profile changes
2015-08-07 16:26:52 -07:00
ericrius1
205a2d53b6
no longer returning early on NaN
2015-08-07 16:15:51 -07:00
Bradley Austin Davis
cd6667303e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:32:33 -07:00
Seth Alves
732f9ceca5
pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges
2015-08-07 14:21:20 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
Seth Alves
f9685efa4b
set payload bounds for polyvoxs
2015-08-07 13:43:34 -07:00
Seth Alves
fcb30dbbe7
hook textures up to polyvoxs
2015-08-07 13:33:00 -07:00
ZappoMan
f4c3c30f6a
quick optimization to RenderableModelEntityItem::render()
2015-08-07 12:49:48 -07:00
ericrius1
d735c85806
moving polyLineEntity over to core profile
2015-08-07 11:41:55 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Seth Alves
19aec4a3e7
update polyvox shader
2015-08-07 09:07:54 -07:00
Seth Alves
c07119c30b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-07 07:37:25 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
Seth Alves
80909b4531
work toward getting textures on polyvox entities
2015-08-04 17:53:47 -07:00
Seth Alves
56c0f9c814
work toward getting textures on polyvox entities
2015-08-04 17:37:15 -07:00
Seth Alves
419caccd8e
unmangle merge
2015-08-04 17:06:17 -07:00
