Comparar texto

Encontre a diferença entre dois arquivos de texto

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Ferramentas

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 9 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

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

79 lines

Lines
Total
Added

Words
Total
Added

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

83 lines

// _null = [this, 0, 1] execVM "moveWithWind.sqf"; // Rotate with Wind

// _null = [this, 1, 1] execVM "moveWithWind.sqf"; // Continuous rotation

private ["_obj", "_mod", "_vel", "_dif", "_wdr", "_upd"];

params [

_obj = _this select 0; // The object being affected

"_obj", // The object being affected

_mod = _this select 1; // The mode of movement (0 = wind, 1 = Rotation, 2 = TBD, etc.)

"_mod", // The mode of movement (0 = wind, 1 = Rotation, 2 = TBD, etc.)

_vel = _this select 2; // Movement velocity (1° to 45°)

"_vel" // Movement velocity (1° to 45°)

_upd = 1 / 30; // The object update rate

];

// If this isn't the server then get out

if (!isServer) exitWith {};

private _upd = 1 / 30; // The object update rate

//----------------------------------------------------------------------

// Constrain velocity

if (_mod == 0) then {

_vel = abs _vel;

if (_vel < 1) then {

_vel = 1;

};

if (_vel > 45) then {

_vel = 45;

};

//----------------------------------------------------------------------

if (_mod == 1) then {

if (_vel < -360) then {

_vel = -360;

};

if (_vel > 360) then {

_vel = 360;

};

//----------------------------------------------------------------------

// Do forever...

while {0 != 1} do

while {true} do {

{

//----------------------------------------------------------------------

// Set direction based on wind

if (_mod == 0) then {

// Get current wind direction

_wdr = windDir;

private _wdr = windDir;

// Randomise wind direction

_wdr = _wdr + ((random (_vel * 2))- _vel);

// Get difference in direction

_dif = (_wdr - (getDir _obj));

private _dif = (_wdr - (getDir _obj));

// If difference is greather than 180°

if (abs _dif > 180) then {

// Rotate counter-clockwise

_dif = _vel * -1;

}

} else {

else

{

// Rotate clockwise

_dif = _vel;

};

// Alternatively: _dif = [_vel, _vel * -1] select (abs _dif > 180);

// Calculate rate of change

_dif = _dif * _upd;

// Increment current direction

_dif = (getDir _obj) + _dif;

// Set to new direction

_obj setDir _dif;

};

//----------------------------------------------------------------------

// Rotate object clockwise/counter-clockwise

if (_mod == 1) then {

// Update rotation

_dif = (getDir _obj) + (_vel * _upd);

private _dif = (getDir _obj) + (_vel * _upd);

// Deal with out of range rotations

if (_dif < 0) then {

_dif = _dif + 360;

};

if (_dif > 360) then {

_dif = _dif - 360;

};

// Set to new rotatoin

_obj setDir _dif;

};

//----------------------------------------------------------------------

// Wait for next update time

sleep _upd;

};

Diffs salvos

Texto original

Abrir arquivo

// _null = [this, 0, 1] execVM "moveWithWind.sqf"; // Rotate with Wind
// _null = [this, 1, 1] execVM "moveWithWind.sqf"; // Continuous rotation
private ["_obj", "_mod", "_vel", "_dif", "_wdr", "_upd"];
 
_obj = _this select 0;    // The object being affected
_mod = _this select 1;    // The mode of movement (0 = wind, 1 = Rotation, 2 = TBD, etc.)
_vel = _this select 2;    // Movement velocity (1° to 45°)
_upd = 1 / 30;                    // The object update rate
// If this isn't the server then get out
if (!isServer) exitWith {};
//----------------------------------------------------------------------
// Constrain velocity
if (_mod == 0) then {
    _vel = abs _vel;
    if (_vel < 1) then { 
        _vel = 1; 
    };
    if (_vel > 45) then { 
        _vel = 45; 
    };
};
//----------------------------------------------------------------------
if (_mod == 1) then {
    if (_vel < -360) then { 
        _vel = -360; 
    };
    if (_vel > 360) then { 
        _vel = 360; 
    };
};
//----------------------------------------------------------------------
// Do forever...
while {0 != 1} do 
{
    //----------------------------------------------------------------------
    // Set direction based on wind
    if (_mod == 0) then {
        // Get current wind direction
        _wdr = windDir; 
        // Randomise wind direction
        _wdr = _wdr + ((random (_vel * 2))- _vel);
        // Get difference in direction
        _dif = (_wdr - (getDir _obj));
        // If difference is greather than 180°
        if (abs _dif > 180) then {
            // Rotate counter-clockwise
            _dif = _vel * -1;
        }
        else 
        {
            // Rotate clockwise
            _dif = _vel;
        };
        // Calculate rate of change
        _dif = _dif * _upd;
        // Increment current direction
        _dif = (getDir _obj) + _dif;
        // Set to new direction
        _obj setDir _dif;
    };
    //----------------------------------------------------------------------
    // Rotate object clockwise/counter-clockwise
    if (_mod == 1) then {
        // Update rotation
        _dif = (getDir _obj) + (_vel * _upd);
        // Deal with out of range rotations
        if (_dif < 0) then { 
            _dif = _dif + 360;
        };
        if (_dif > 360) then { 
            _dif = _dif - 360;
        };
        // Set to new rotatoin
        _obj setDir _dif;
    };
    //----------------------------------------------------------------------
    // Wait for next update time
    sleep _upd;
};

Texto alterado

Abrir arquivo

// _null = [this, 0, 1] execVM "moveWithWind.sqf"; // Rotate with Wind
// _null = [this, 1, 1] execVM "moveWithWind.sqf"; // Continuous rotation

params [
    "_obj", // The object being affected
    "_mod", // The mode of movement (0 = wind, 1 = Rotation, 2 = TBD, etc.)
    "_vel" // Movement velocity (1° to 45°)
];

// If this isn't the server then get out
if (!isServer) exitWith {};

private _upd = 1 / 30; // The object update rate

//----------------------------------------------------------------------
// Constrain velocity
if (_mod == 0) then {
    _vel = abs _vel;
    if (_vel < 1) then {
        _vel = 1;
    };
    if (_vel > 45) then {
        _vel = 45;
    };
};
//----------------------------------------------------------------------
if (_mod == 1) then {
    if (_vel < -360) then {
        _vel = -360;
    };
    if (_vel > 360) then {
        _vel = 360;
    };
};
//----------------------------------------------------------------------
// Do forever...
while {true} do {
    //----------------------------------------------------------------------
    // Set direction based on wind
    if (_mod == 0) then {
        // Get current wind direction
        private _wdr = windDir;
        // Randomise wind direction
        _wdr = _wdr + ((random (_vel * 2))- _vel);
        // Get difference in direction
        private _dif = (_wdr - (getDir _obj));
        // If difference is greather than 180°
        if (abs _dif > 180) then {
            // Rotate counter-clockwise
            _dif = _vel * -1;
        } else {
            // Rotate clockwise
            _dif = _vel;
        };
        // Alternatively: _dif = [_vel, _vel * -1] select (abs _dif > 180);

// Calculate rate of change
        _dif = _dif * _upd;
        // Increment current direction
        _dif = (getDir _obj) + _dif;
        // Set to new direction
        _obj setDir _dif;
    };
    //----------------------------------------------------------------------
    // Rotate object clockwise/counter-clockwise
    if (_mod == 1) then {
        // Update rotation
        private _dif = (getDir _obj) + (_vel * _upd);
        // Deal with out of range rotations
        if (_dif < 0) then {
            _dif = _dif + 360;
        };
        if (_dif > 360) then {
            _dif = _dif - 360;
        };
        // Set to new rotatoin
        _obj setDir _dif;
    };
    //----------------------------------------------------------------------
    // Wait for next update time
    sleep _upd;
};