比较文本

查找两个文本文件之间的差异

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

工具

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 6 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

28 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

113 lines

//Duik.connector

//Duik.connector "absolute animation" mod

var ctrlLayer = thisComp.layer("C | Slider");

var ctrlLayer =thisComp.layer("C | Slider 2");

var ctrlValue = ctrlLayer.effect("Slider")(18);

var ctrlEffect = ctrlLayer.effect("Value Connector");

Text moved with changes to lines 16-20 (97.3% similarity)

var ctrlMin = ctrlEffect(2).value;

var ctrlMax = ctrlEffect(3).value;

var result = value;

if (numKeys >= 2 && ctrlEffect.enabled)

{

var useVelocity = ctrlEffect(1).value == 2;

if (useVelocity) ctrlValue = ctrlValue.velocity;

else ctrlValue = ctrlValue.value;

var tHasKeys = ctrlLayer.transform.xPosition.numKeys > 1;

function connect(keyF){

Text moved with changes from lines 5-9 (97.3% similarity)

var ctrlMin = ctrlEffect(2).value; //0

var ctrlMax = ctrlEffect(3).value; //100

var result = value;

if (numKeys >= 2 && ctrlEffect.enabled)

{

var t = 0;

var beginTime = key(1).time;

var endTime = key(numKeys).time;

if (ctrlMin > ctrlMax)

{

t = linear(ctrlValue, ctrlMin, ctrlMax, endTime, beginTime);

t = linear(keyF, ctrlMin, ctrlMax, endTime, beginTime);

// t = linear(time, 0, 100, 0.5, 0.0); ????????

}

else

{

t = linear(ctrlValue, ctrlMin, ctrlMax, beginTime, endTime);

t = linear(keyF, ctrlMin, ctrlMax, beginTime, endTime);

}

result = valueAtTime(t);

}

Math.floor(result);

var driver = Math.floor(result);

return driver;

}

sliderController = ctrlLayer.transform.xPosition;

poses = [];

temp = 1;

while ( temp <= thisComp.marker.numKeys ) {

poses.push ( this.value );

i = temp++ ;

}

function getValues(){

var obj_A = sliderController

var ID_A = obj_A.nearestKey(time).index;

var value_A;

var time_A;

var keyF_A;

var keyF_B;

if (obj_A.nearestKey(time).time <= time ){

value_A = obj_A.key(ID_A).value;

time_A = obj_A.key(ID_A).time;

} else {

try{

obj_A.key(ID_A-1).value;

value_A = obj_A.key(ID_A-1).value;

time_A = obj_A.key(ID_A-1).time;

}catch(err){

value_A = obj_A.key(ID_A).value;

time_A = obj_A.key(ID_A).time;

}

var obj_B = sliderController

var ID_B = obj_B.nearestKey(time).index;

var value_B;

var time_B;

if (obj_B.nearestKey(time).time >= time ){

value_B = obj_B.key(ID_B).value;

time_B = obj_B.key(ID_B).time;

} else {

try{

obj_B.key(ID_B+1).value;

value_B = obj_B.key(ID_B+1).value;

time_B = obj_B.key(ID_B+1).time;

}catch(err){

value_B = obj_B.key(ID_B).value;

time_B = obj_B.key(ID_B).time;

}

keyF_A = connect(value_A);

keyF_B = connect(value_B);

return linear(time,time_A, time_B, keyF_A, keyF_B);

// time value can't read the easing from the slider keyframes, I must discover a way to mimic the ctrlEffect + UseVelocity shenanigans from the original code.

}

if(tHasKeys) getValues() else key(1).value;

已保存差异

原始文本

打开文件

更改后文本

打开文件

//Duik.connector "absolute animation" mod
var ctrlLayer =thisComp.layer("C | Slider 2");

var ctrlValue = ctrlLayer.effect("Slider")(18);
var ctrlEffect = ctrlLayer.effect("Value Connector");
var useVelocity = ctrlEffect(1).value == 2;
if (useVelocity) ctrlValue = ctrlValue.velocity;
else ctrlValue = ctrlValue.value;

var tHasKeys = ctrlLayer.transform.xPosition.numKeys > 1;

function connect(keyF){

var ctrlMin = ctrlEffect(2).value; //0
var ctrlMax = ctrlEffect(3).value; //100
var result = value;
if (numKeys >= 2 && ctrlEffect.enabled)
{

var t = 0;
var beginTime = key(1).time;
var endTime = key(numKeys).time;
if (ctrlMin > ctrlMax)
{
t = linear(keyF, ctrlMin, ctrlMax, endTime, beginTime);
// t = linear(time, 0, 100, 0.5, 0.0); ????????
}
else
{
t = linear(keyF, ctrlMin, ctrlMax, beginTime, endTime);
}
result = valueAtTime(t);
}
var driver = Math.floor(result);

//
return driver;
}

sliderController = ctrlLayer.transform.xPosition;

poses = [];
temp = 1;

while ( temp <= thisComp.marker.numKeys ) {
	poses.push ( this.value );
	i = temp++ ;
}

function getValues(){
	
var obj_A = sliderController
var ID_A = obj_A.nearestKey(time).index;
var value_A;
var time_A;
var keyF_A;
var keyF_B;

if (obj_A.nearestKey(time).time <= time ){
 value_A = obj_A.key(ID_A).value;
 time_A = obj_A.key(ID_A).time;  
  
} else {

try{
  obj_A.key(ID_A-1).value;
  value_A = obj_A.key(ID_A-1).value;
  time_A = obj_A.key(ID_A-1).time;  
  
}catch(err){
  value_A = obj_A.key(ID_A).value;
  time_A = obj_A.key(ID_A).time;  
}

}

var obj_B = sliderController
var ID_B = obj_B.nearestKey(time).index;
var value_B;
var time_B;

if (obj_B.nearestKey(time).time >= time ){
 value_B = obj_B.key(ID_B).value;
 time_B = obj_B.key(ID_B).time;
} else {

try{
 obj_B.key(ID_B+1).value;
 value_B = obj_B.key(ID_B+1).value;
 time_B = obj_B.key(ID_B+1).time;
}catch(err){
value_B = obj_B.key(ID_B).value;
time_B = obj_B.key(ID_B).time;
}

}

keyF_A = connect(value_A);
keyF_B = connect(value_B);
return linear(time,time_A, time_B, keyF_A, keyF_B);
// time value can't read the easing from the slider keyframes, I must discover a way to mimic the ctrlEffect + UseVelocity shenanigans from the original code.
}

if(tHasKeys) getValues() else key(1).value;