TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

compile on gcc

Browse Source
This commit is contained in:
David Rose 2005-06-29 23:47:57 +00:00
parent 9d9465a097
commit ea4792ebc5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
panda/src/particlesystem/colorInterpolationManager.cxx
View File

@ -415,23 +415,23 @@ generateColor(const float interpolated_time) {
ColorInterpolationSegment *cur_seg; ColorInterpolationSegment *cur_seg;
pvector<PT(ColorInterpolationSegment)>::iterator iter; pvector<PT(ColorInterpolationSegment)>::iterator iter;
for(iter = _i_segs.begin();iter != _i_segs.end();++iter) { for (iter = _i_segs.begin();iter != _i_segs.end();++iter) {
cur_seg = (*iter); cur_seg = (*iter);
if( cur_seg->is_enabled() && if( cur_seg->is_enabled() &&
interpolated_time >= cur_seg->get_time_begin() interpolated_time >= cur_seg->get_time_begin()
&& interpolated_time <= cur_seg->get_time_end() ) { && interpolated_time <= cur_seg->get_time_end() ) {
segment_found = true; segment_found = true;
out += cur_seg->interpolateColor(interpolated_time); out += cur_seg->interpolateColor(interpolated_time);
out[0] = max(0,min(out[0],1.0f)); out[0] = max(0.0f, min(out[0], 1.0f));
out[1] = max(0,min(out[1],1.0f)); out[1] = max(0.0f, min(out[1], 1.0f));
out[2] = max(0,min(out[2],1.0f)); out[2] = max(0.0f, min(out[2], 1.0f));
out[3] = max(0,min(out[3],1.0f)); out[3] = max(0.0f, min(out[3], 1.0f));
}
} }
}
if(segment_found) { if(segment_found) {
return out; return out;
} }
return _default_color; return _default_color;
} }