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
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
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
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Howard Stearns
51a29bdba6
Put back the script-fix that belongs in this branch.
2015-05-11 11:53:48 -07:00
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
ZappoMan
0b6a815a20
moved zone stage properties into a group
2015-05-08 20:17:01 -07:00
ZappoMan
1936f4c114
fix zone:nothing bug
2015-05-08 14:03:58 -07:00
Sam Gateau
deb303838d
Cleaning code
2015-05-07 17:15:45 -07:00
Sam Gateau
351b92627a
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-07 17:06:41 -07:00
Sam Gateau
ce5295a55f
THese is not final but we have a basic working framework so let's try to share
2015-05-07 17:06:15 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
Seth Alves
867fe18472
put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked
2015-05-07 10:11:36 -07:00
Seth Alves
fe14202f51
add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated
2015-05-07 09:53:39 -07:00
