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
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
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
Seth Alves
5ac8558168
flash yellow box when transmitting an edit packet
2015-05-06 17:03:27 -07:00
Atlante45
50ba154615
Correctly wire setDrawZones
2015-05-06 17:04:01 +02:00
Atlante45
52191f922c
Render Sphere/Box zones
2015-05-06 16:57:53 +02:00
Atlante45
6d2fe945af
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-06 09:53:57 +02:00
Seth Alves
4a7fe50084
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4
some debugging on Andrew's refactor
2015-05-05 16:40:10 -07:00
Seth Alves
82828f0b93
print when bullet and local octree don't agree on position of an entity
2015-05-05 13:52:10 -07:00
Seth Alves
1cd93b9ec8
pull andrew's branch, add back in visual indicator of an entity being active in bullet
2015-05-05 13:14:22 -07:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 21:33:55 +02:00
Atlante45
46cd1f458b
Actually call render on zone entities from tree
2015-05-05 17:20:27 +02:00
Atlante45
40295ab04e
Cleanup RenderableZoneEntityItem
2015-05-05 17:19:42 +02:00
Atlante45
34a39250f2
Add basic render to zones
2015-05-05 15:13:00 +02:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
ZappoMan
77232e35f8
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones
2015-05-04 17:16:33 -07:00
ZappoMan
2c02bfdda5
fix build buster
2015-05-04 16:01:50 -07:00
ZappoMan
3827e961a7
hook sunBrightness to keyLightIntensity
2015-05-04 15:31:50 -07:00
ZappoMan
403ed6d77b
wire up sunlocation from keylight direction
2015-05-04 15:20:16 -07:00
ZappoMan
cfe717fe08
only override environment when skyboxMode is atmosphere
2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
Atlante45
12fcb35717
Made RenderArgs a default ctor
2015-05-04 17:22:46 +02:00
Philip Rosedale
0f22b9beb8
Merge pull request #4741 from sethalves/box-stacking-1
...
move common debugging rendering into a new class
2015-05-02 00:34:44 -07:00
Ryan Huffman
51c2a8273e
Add drawZoneBoundaries
2015-05-01 12:52:40 -07:00
Seth Alves
bd1f77b8f3
cleanups
2015-05-01 11:35:14 -07:00
Seth Alves
ea1ec0186e
stop doing useless multiple inheritance
2015-05-01 11:31:58 -07:00
Seth Alves
b47184de78
oops
2015-05-01 11:21:27 -07:00
Seth Alves
452d78805e
oops
2015-05-01 11:20:50 -07:00
Seth Alves
b443ce5d3e
oops
2015-05-01 11:20:34 -07:00
Seth Alves
a31e2dc309
oops
2015-05-01 11:18:56 -07:00
Seth Alves
3765ace7ef
move common debugging rendering into a new class
2015-05-01 11:17:46 -07:00
