ZappoMan
b0cc536f53
debug cleanup
2015-05-27 16:55:02 -07:00
ZappoMan
37a291275d
more work on rendering in engine
2015-05-27 16:46:44 -07:00
ZappoMan
8c9cf480f3
more hacking
2015-05-27 13:23:59 -07:00
ZappoMan
007aed7a0a
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-27 10:51:50 -07:00
ZappoMan
1a7c6eb316
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 10:41:01 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
ZappoMan
25823bedd1
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-26 15:51:46 -07:00
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
samcake
84525aabec
Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer
...
TEAM TEACHING BRANCH - Entity Smart Pointers
2015-05-26 13:56:47 -07:00
Howard Stearns
bbdf9f1d9f
Remove changingEntityID.
2015-05-26 11:14:23 -07:00
ZappoMan
c4f96b09a2
sam's feedback on shared pointers in master
2015-05-26 09:55:28 -07:00
ZappoMan
5f6978a517
sam's CR feedback, more use of share_ptr<>
2015-05-26 09:41:51 -07:00
Howard Stearns
1b134d60d5
Fix typo that messed up the otherEntity for collisions.
2015-05-25 15:46:55 -07:00
Howard Stearns
1dd2b7275e
Simpler and more uniform version that handles all the standard entity-script events.
2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4
Working experimental first version.
2015-05-23 13:35:35 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Ryan Huffman
822ae800c5
Update Model::endScene to require RenderArgs
2015-05-22 16:17:01 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
ZappoMan
160898ce96
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-22 14:55:29 -07:00
ZappoMan
d9ed1e061c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-22 14:54:47 -07:00
ZappoMan
4bdeef7610
checkpoint
2015-05-22 14:54:30 -07:00
David Rowe
a01830f8f8
Fix some double to float conversion warnings in Windows builds
2015-05-22 12:32:02 -07:00
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02: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
0d9f0f609b
first cut at RenderableEnitityItem payload
2015-05-21 16:22:23 -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
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
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07: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
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
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
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
