Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 02:16:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38361 commits 74 branches 59 tags 1.2 GiB
Commit graph

61 commits

Author SHA1 Message Date
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
samcake
aef748b894 Adding linear color in Particule system 2015-12-21 10:40:29 -08:00
ericrius1
dca83a054e Changed additiveBlending to emitterShouldTrail 2015-12-15 10:30:57 -08:00
Atlante45
1d513cfbba Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-09 15:09:19 -08:00
Atlante45
c8ab95bb53 Spacing 2015-12-03 15:01:18 -08:00
Atlante45
0f316e6ae1 Remove particles emiter bounds compute 2015-11-24 11:51:56 -08:00
Atlante45
e25ea122d8 Start moving update to shader 2015-11-24 11:51:56 -08:00
Atlante45
ca17c75631 Save one array traversal 2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1 First pass at new particle shader 2015-11-24 11:51:56 -08:00
Atlante45
7d0a5677fa More code cleanup 2015-11-24 11:51:56 -08:00
Atlante45
964ac5bad6 More cleanup 2015-11-24 11:51:56 -08:00
Atlante45
c33b6205a8 Some cleanup 2015-11-24 11:51:56 -08:00
Atlante45
a71ed7b166 Implement particle bounds with Extents 2015-11-24 11:51:56 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
ericrius1
4e5b806934 particle effect entities no longer intersect with rays 2015-11-04 16:05:29 -08:00
ericrius1
0ed868077d Added additive blending as option for particle effect 2015-11-03 10:02:51 -08:00
Seth Alves
61269c3ce8 fix up entity constructors so that setProperties isn't called during the constructor 2015-10-23 13:52:50 -07:00
Atlante45
bcd148cb87 Construct entity properties at definition 2015-10-09 12:23:19 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
57cc7adbfe standardize somethingChanged - CR feedback 2015-10-07 12:27:12 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Eric Levin
c72c87b59c Revert "QA for 20699 - Sanitize particle property values when set" 2015-10-05 13:35:58 -07:00
David Rowe
510065fe5c Fix particle property maxParticles not being able to be set properly 2015-10-03 09:16:07 -07:00
David Rowe
88937318d8 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/ParticleEffectEntityItem.h
 2015-10-02 18:39:50 -07:00
David Rowe
67a497cda3 Sanitize particle properties and their use 
Excluding animationSetings because it's unused and will be removed.
 2015-10-02 17:37:59 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
6aa9ef9910 first cut at migrating animation settings into a property group 2015-09-30 20:51:25 -07:00
David Rowe
e2bee8ec08 Fix particle radius, color, and alpha starts/finishes 2015-09-29 15:40:46 -07:00
David Rowe
812ab9b7c6 Merge branch 'master' into 20681 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-09-18 16:44:04 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
David Rowe
c992107363 Add particle properties ready to use for emitting from a spheroid 2015-09-16 18:07:18 -07:00
Brad Hefta-Gaub
e1cb041576 first cut at adding desiredProperties to getProperties 2015-09-16 15:00:42 -07:00
David Rowe
d51cab3e3d Replace particle velocity with speed and orientation 2015-09-16 14:51:08 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
David Rowe
fa959c4554 Move cubic interpolation method to shared library 2015-09-10 08:53:16 -07:00
David Rowe
99c1e06201 Code tidying 2015-09-08 13:25:15 -07:00
David Rowe
cdd5e68815 Add colorStart and colorFinish entity particle properties 2015-09-08 11:28:53 -07:00
David Rowe
cb9468c311 Add colorSpread entity particle property 2015-09-07 16:27:42 -07:00
David Rowe
47b27a3280 Add alphaStart and alphaFinish entity particle properties 2015-09-05 16:30:01 -07:00
David Rowe
042384b5b0 Tidy and finish alpha and alphaSpread 2015-09-05 14:51:48 -07:00
David Rowe
1b3d125cb3 Add alphaSpread entity particle property 2015-09-05 14:39:10 -07:00
David Rowe
8d85309925 Use cubic interpolation instead of cosine 2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5 Add alpha property support to ParticleEffect entities 
Add at same "level" as color so that it's available for other entity
types to use in the future.
 2015-09-05 10:23:27 -07:00
David Rowe
c910da7179 Add radiusStart and radiusFinish entity particle properties 2015-09-04 12:27:18 -07:00
David Rowe
45ff118249 Add new radiusSpread entity particle property 2015-09-03 14:55:08 -07:00
ericrius1
5fa27a7cf1 added back computeAndUpdate mmethod for particles, and now handling parsing old streams 2015-08-24 10:59:38 -07:00
ericrius1
d38d29e0f5 fixed argument signatues and optimized particle position calculations 2015-08-13 10:35:32 -07:00
ericrius1
36ca0c54fc acceleration spread working properly 2015-08-12 16:13:00 -07:00