Brad Hefta-Gaub
20a733b9f5
prevent sending signals in the entities script engine
2015-09-11 10:06:06 -07:00
Brad Hefta-Gaub
b9d5412aad
prevent sending signals in the entities script engine
2015-09-11 09:48:42 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Hefta-Gaub
92a5a999c6
quiet some debug
2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56
quiet some debug
2015-09-10 19:48:41 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
8a60bba4eb
Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers
2015-09-08 15:28:46 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9
Merge pull request #5735 from hyperlogic/tony/no-particle-fix
...
Fix for RenderableParticleffectEntityItem assert.
2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
David Rowe
45ff118249
Add new radiusSpread entity particle property
2015-09-03 14:55:08 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Seth Alves
2fe6e9c317
use AABox's ray intersection code rather than the goofed-up version that was here
2015-09-02 16:30:11 -07:00
Seth Alves
16ee5199e8
change how polyvox neighbors are notified of updates
2015-09-02 09:30:32 -07:00
Seth Alves
8608e4f2b0
small bug-fixes
2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15
rebake mesh when a neighbor changes
2015-09-01 16:21:12 -07:00
Seth Alves
264d39aa9b
have knitted polyvoxes keep track of low-axis neighbors as well as high
2015-09-01 14:49:17 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Seth Alves
930c5cefc9
fix setSphere to create a world-space sphere rather than a voxel-space one
2015-09-01 11:10:21 -07:00
Seth Alves
7369ca19e9
allow setting cuboid voxel spaces. clean up some locking
2015-08-31 18:01:15 -07:00
Seth Alves
54ddcf2841
fix normals in shader
2015-08-31 15:24:30 -07:00
Seth Alves
4d06890d90
lock/unlock less
2015-08-31 15:24:15 -07:00
Seth Alves
376a6bbb21
don't reload textures if the url didn't change
2015-08-31 11:48:08 -07:00
Seth Alves
41a2ff2fff
working on stitching marching-cube polyvoxs together
2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3
attempting to stitch polyvox entites together
2015-08-30 09:59:33 -07:00
Seth Alves
7614cababb
adjust whitespace
2015-08-28 13:21:34 -07:00
Seth Alves
540af4afcb
remove unneeded call to computeShapeInfoWorker
2015-08-28 12:47:04 -07:00
Seth Alves
a5cd3ff046
release _threadRunning if decompressVolumeDataAsync exits early
2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44
if someone else changes a polyvox, we need to localy recompute the collision shape
2015-08-28 10:39:23 -07:00
Seth Alves
0bcd6b8ec5
remove no-longer-used #define
2015-08-28 10:30:56 -07:00
Stephen Birarda
8ee27bca2b
remove urlAsString from Model
2015-08-27 16:00:21 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Brad Hefta-Gaub
7b2f944f48
Merge pull request #5561 from ericrius1/particleExtensions
...
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
Seth Alves
b09de4ff65
fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.
2015-08-26 21:51:28 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Seth Alves
6f46832069
clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct
2015-08-25 21:30:38 -07:00
Seth Alves
da6a1c958b
clean up debugging prints
2015-08-25 16:40:58 -07:00
Seth Alves
3c35d90908
don't recompute meshes if nothing changed
2015-08-25 13:13:01 -07:00
Seth Alves
f6c440756c
do slow polyvox operations on a thread
2015-08-25 11:46:51 -07:00
Seth Alves
7cb9968864
more work on polyvox threading
2015-08-25 05:53:36 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07: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
ericrius1
5fa27a7cf1
added back computeAndUpdate mmethod for particles, and now handling parsing old streams
2015-08-24 10:59:38 -07:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Seth Alves
9937416729
attempt to move some time-consuming polyvox stuff off of the main thread
2015-08-21 11:23:13 -07:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -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
f9fb65bb4b
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-20 10:15:16 -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
Seth Alves
f563b2aeba
clean up debugging prints
2015-08-19 19:15:04 -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
ericrius1
b8a6105a03
Merge branch 'master' into particleExtensions
2015-08-14 08:56:59 -07:00
ericrius1
81844a82e8
fixed spacing issues and removed dead line
2015-08-12 16:25:56 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
ericrius1
36ca0c54fc
acceleration spread working properly
2015-08-12 16:13:00 -07:00
ericrius1
16279bd415
emitters trail particles now
2015-08-12 14:01:42 -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
