Seth Alves
727f457f91
hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version
2015-05-25 21:01:20 -07:00
Seth Alves
9735174036
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-25 15:37:23 -07:00
David Rowe
a01830f8f8
Fix some double to float conversion warnings in Windows builds
2015-05-22 12:32:02 -07:00
Seth Alves
380fed7aee
metersToVoxelCoordinates and voxelCoordinatesToMeters
2015-05-22 10:37:48 -07:00
Seth Alves
1100c832eb
clean up diff
2015-05-21 18:18:04 -07:00
Seth Alves
f85cc89946
clean up diff
2015-05-21 18:17:07 -07:00
Seth Alves
a882fc7fb1
pull out common parts of the two sphere-in-volumes
2015-05-21 18:07:46 -07:00
Seth Alves
8b2d570f3f
clearSphereInVolume
2015-05-21 17:04:57 -07:00
Seth Alves
478cb40135
draws in the right place, now
2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430
added a volex-volume size member variable. drawing transform still isn't quite right
2015-05-21 16:31:01 -07:00
Seth Alves
bbb61a77d9
dodge stride bug in mesh code
2015-05-21 14:47:23 -07:00
Seth Alves
fd19c63449
fix bug in mesh
2015-05-21 14:26:40 -07:00
Seth Alves
fe188f9a43
something draws, now
2015-05-21 10:42:14 -07:00
Seth Alves
72e227eefe
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-21 09:55:14 -07:00
Seth Alves
de6422683a
cleanups, trying to figure out why this doesn't draw
2015-05-20 21:21:39 -07:00
Seth Alves
c3b26b78a0
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-20 18:22:16 -07:00
Seth Alves
138077ede9
hook up mesh renderer
2015-05-20 18:22:07 -07:00
Seth Alves
d7ccd23b07
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-20 18:08:29 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
39ab2f43bf
Merge pull request #4885 from Atlante45/warings
...
Quiet warnings
2015-05-20 14:45:55 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Seth Alves
f2c1c43da3
polyvox code runs, no rendering yet
2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8
derieve PolyVox Entity from Model Entity
2015-05-19 21:40:05 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Atlante45
cb02ef9277
Remove warnings
2015-05-15 21:35:47 +02:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Howard Stearns
b5a28730ea
Filter out low-penetration continuous contact from all entity collision activity including scripts:
...
We don't want sound for these.
This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
COLLISION_MINIMUM_VOLUME 0.01 => 0.001
COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
2015-05-14 14:41:32 -07:00
Brad Davis
a77816617d
Make web entities interactive (via the mouse) if they're not locked.
2015-05-14 01:15:20 -07:00
Brad Hefta-Gaub
5da0a8d7a3
Merge pull request #4860 from howard-stearns/entity-sound
...
Entity sound.
2015-05-13 20:07:44 -07:00
Howard Stearns
6ebeb7a22e
Another constexpr.
2015-05-13 15:47:47 -07:00
Brad Davis
3b7e8a69b5
Attempting to fix threading issues with web entities
2015-05-13 14:00:41 -07:00
Howard Stearns
76e39fc95b
constexpr => const for Windows compiler.
2015-05-13 13:56:10 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
ad5f1214bf
Fix error when deleting web item
2015-05-13 11:58:18 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Seth Alves
500bb13cbb
c++
2015-05-12 15:17:27 -07:00
Seth Alves
4e679c7e3a
use toGlm for color. remove some commented-out code
2015-05-12 15:08:26 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
Seth Alves
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
