Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Ryan Huffman
66dc555ba9
Remove context->enqueueBatch from RenderableBoxEntityItem
2015-05-22 09:59:34 -07:00
Ryan Huffman
4a4c9c75fc
Add gpu::context to RenderArgs and start using RenderArgs in place of the flags
2015-05-22 09:50:51 -07:00
ZappoMan
c7fb8fab85
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-21 10:36:22 -07:00
ZappoMan
e1c5c5b12e
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-20 18:42:54 -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
Atlante45
ee4b28b6b9
Other TextRenderer memory leak
2015-05-20 16:56:04 +02:00
Atlante45
9a007ab135
Remove unused method
2015-05-20 16:50:31 +02:00
Atlante45
e5d0851337
Remove unnecessary glPush/Pop
2015-05-20 16:29:43 +02: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
eef87412fd
Particles render in Batch
2015-05-19 15:54:19 +02:00
Atlante45
c847de0a2e
Missing batch args
2015-05-18 16:37:00 +02:00
Atlante45
72bf160845
Proxies render in Batch
2015-05-18 16:36:16 +02:00
Atlante45
ede94e4248
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-18 11:39:17 +02:00
Atlante45
802e963bba
Debug entity render in batch
...
Also removed unnecessary glPush/Pop
2015-05-17 12:42:14 +02:00
Atlante45
16340c0fee
LightEntity debug render in batch
2015-05-17 12:31:14 +02:00
Atlante45
38d3c85664
ZoneEntity wireframes render in batch
2015-05-17 12:21:14 +02:00
Atlante45
58460eb4ba
SphereEntity render in batch
2015-05-17 12:20:52 +02:00
Atlante45
0156ef1700
LineEntity render in batch
2015-05-17 12:20:37 +02:00
Atlante45
dfaa4ab1a3
BoxEntity render in Batch
2015-05-16 05:45:27 +02:00
Atlante45
3436658e45
Add batch to RenderAgrs
2015-05-16 05:42:26 +02:00
Atlante45
4725d5e676
Merge branch 'primitives_batch' into remove_gl_transform
2015-05-16 05:22:12 +02:00
Atlante45
7ff973b94c
Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch
2015-05-16 04:36:05 +02:00
Atlante45
cb02ef9277
Remove warnings
2015-05-15 21:35:47 +02:00
Atlante45
feefcbf40f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-15 20:30:45 +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
Atlante45
c13ad83cc4
Rename getCenter by get CenterPosition
2015-05-15 18:34:28 +02:00
Atlante45
02f89bc680
Remove warnings
2015-05-15 17:36:58 +02:00
Atlante45
d0cd18d6c0
Replace entities pos/rot/dim with transform
...
Removed _position, _rotation, _dimensions
Added Transform _transform
2015-05-15 17:35:24 +02:00
Atlante45
e0ae8597bc
Factor zone code in Model::render
2015-05-15 15:45:31 +02: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
