oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

began transition rewrite

Browse Source
This commit is contained in:
itsmattkc
2019-02-17 01:18:03 -08:00
parent 4b5cd8bd26
commit 059e2a1fe8
23 changed files with 2446 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
effects/internal/crossdissolvetransition.cpp
+2 -2
View File
@@ -29,8 +29,8 @@ CrossDissolveTransition::CrossDissolveTransition(ClipPtr c, ClipPtr s, const Eff
}
void CrossDissolveTransition::process_coords(double progress, GLTextureCoords& coords, int data) {
if (!(data == TA_CLOSING_TRANSITION && secondary_clip != nullptr)) {
if (data == TA_CLOSING_TRANSITION) progress = 1.0 - progress;
if (!(data == kTransitionClosing && secondary_clip != nullptr)) {
if (data == kTransitionClosing) progress = 1.0 - progress;
coords.opacity *= progress;
}
}
effects/internal/exponentialfadetransition.cpp
+2 -2
View File
@@ -41,10 +41,10 @@ void ExponentialFadeTransition::process_audio(double timecode_start, double time
break;
}*/
switch (type) {
case TA_OPENING_TRANSITION:
case kTransitionOpening:
samp *= qPow(timecode_start + (interval * i), 2);
break;
case TA_CLOSING_TRANSITION:
case kTransitionClosing:
samp *= qPow(1 - (timecode_start + (interval * i)), 2);
break;
}
effects/internal/linearfadetransition.cpp
+2 -2
View File
@@ -29,10 +29,10 @@ void LinearFadeTransition::process_audio(double timecode_start, double timecode_
qint16 samp = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
switch (type) {
case TA_OPENING_TRANSITION:
case kTransitionOpening:
samp *= timecode_start + (interval * i);
break;
case TA_CLOSING_TRANSITION:
case kTransitionClosing:
samp *= 1 - (timecode_start + (interval * i));
break;
}
effects/internal/logarithmicfadetransition.cpp
+2 -2
View File
@@ -31,10 +31,10 @@ void LogarithmicFadeTransition::process_audio(double timecode_start, double time
qint16 samp = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
switch (type) {
case TA_OPENING_TRANSITION:
case kTransitionOpening:
samp *= qSqrt(timecode_start + (interval * i));
break;
case TA_CLOSING_TRANSITION:
case kTransitionClosing:
samp *= qSqrt(1 - (timecode_start + (interval * i)));
break;
}