diff options
| author | UbitUmarov | 2019-01-10 18:24:29 +0000 |
|---|---|---|
| committer | UbitUmarov | 2019-01-10 18:24:29 +0000 |
| commit | c0c91f3773cc06c98863e9498a4613f35d9a3084 (patch) | |
| tree | fbd297faf5b77bda6c0b4cc9c5768c2bb6886893 | |
| parent | update libovm (diff) | |
| download | opensim-SC-c0c91f3773cc06c98863e9498a4613f35d9a3084.zip opensim-SC-c0c91f3773cc06c98863e9498a4613f35d9a3084.tar.gz opensim-SC-c0c91f3773cc06c98863e9498a4613f35d9a3084.tar.bz2 opensim-SC-c0c91f3773cc06c98863e9498a4613f35d9a3084.tar.xz | |
file that depends on libomv changes
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs index def993f..748d14d 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs | |||
| @@ -409,20 +409,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 409 | for (int j = 0; j < keycount; j++) | 409 | for (int j = 0; j < keycount; j++) |
| 410 | { | 410 | { |
| 411 | binBVHJointKey pJKey = new binBVHJointKey(); | 411 | binBVHJointKey pJKey = new binBVHJointKey(); |
| 412 | if (!BitConverter.IsLittleEndian) | 412 | pJKey.time = Utils.BytesUInt16ToFloat(data, i, InPoint, OutPoint); i += 2; |
| 413 | { | 413 | x = Utils.BytesUInt16ToFloat(data, i, min, max); i += 2; |
| 414 | pJKey.time = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, InPoint, OutPoint); i += 2; | 414 | y = Utils.BytesUInt16ToFloat(data, i, min, max); i += 2; |
| 415 | x = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2; | 415 | z = Utils.BytesUInt16ToFloat(data, i, min, max); i += 2; |
| 416 | y = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2; | 416 | |
| 417 | z = Utils.UInt16ToFloat(BinBVHUtil.EndianSwap(data, i, 2), 0, min, max); i += 2; | ||
| 418 | } | ||
| 419 | else | ||
| 420 | { | ||
| 421 | pJKey.time = Utils.UInt16ToFloat(data, i, InPoint, OutPoint); i += 2; | ||
| 422 | x = Utils.UInt16ToFloat(data, i, min, max); i += 2; | ||
| 423 | y = Utils.UInt16ToFloat(data, i, min, max); i += 2; | ||
| 424 | z = Utils.UInt16ToFloat(data, i, min, max); i += 2; | ||
| 425 | } | ||
| 426 | pJKey.key_element = new Vector3(x, y, z); | 417 | pJKey.key_element = new Vector3(x, y, z); |
| 427 | m_keys[j] = pJKey; | 418 | m_keys[j] = pJKey; |
| 428 | } | 419 | } |