mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-29 16:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12632] Revert previous commit (see Notes)

Browse source
This commit is contained in:
billy1arm 2013-05-31 13:50:57 +01:00 • committed by Antz
parent 1cd806c02e
commit ef445ea523
1462 changed files with 9689 additions and 7080 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dep/include/g3dlite/G3D/Spline.h
View file

@ -1,4 +1,4 @@
/**
/*
@file Spline.h
@author Morgan McGuire, http://graphics.cs.williams.edu
@ -60,7 +60,7 @@ protected:
public:
/**
/*
Given a time @a s, finds @a i and 0 <= @a u < 1 such that
@a s = time[@a i] * @a u + time[@a i + 1] * (1 - @a u). Note that
@a i may be outside the bounds of the time and control arrays;
@ -77,7 +77,7 @@ public:
};
/**
/*
Smooth parameteric curve implemented using a piecewise 3rd-order
Catmull-Rom spline curve. The spline is considered infinite and may
either continue linearly from the specified control points or cycle
@ -100,7 +100,7 @@ public:
See Real Time Rendering, 2nd edition, ch 12 for a general discussion
of splines and their properties.
@sa G3D::UprightSpline, G3D::QuatSpline
\sa G3D::UprightSpline
*/
template<typename Control>
class Spline : public SplineBase {
@ -269,8 +269,8 @@ protected:
ensureShortestPath(A, N);
}
/**
Mutates the array of N control points. It is useful to override this
/*
Mutates the array of N control points that begins at \a A. It is useful to override this
method by one that wraps the values if they are angles or quaternions
for which "shortest path" interpolation is significant.
*/
@ -282,7 +282,7 @@ protected:
public:
/**
/*
Return the position at time s. The spline is defined outside
of the time samples by extrapolation or cycling.
*/
@ -333,10 +333,6 @@ public:
const Control& p2 = p[2];
const Control& p3 = p[3];
const Control& dp0 = p1 + (p0*-1.0f);
const Control& dp1 = p2 + (p1*-1.0f);
const Control& dp2 = p3 + (p2*-1.0f);
// The factor of 1/2 from averaging two time intervals is
// already factored into the basis
@ -346,12 +342,17 @@ public:
float n0 = x / dt0;
float n1 = x / dt1;
float n2 = x / dt2;
const Control& dp0 = p1 + (p0*-1.0f);
const Control& dp1 = p2 + (p1*-1.0f);
const Control& dp2 = p3 + (p2*-1.0f);
const Control& dp1n1 = dp1 * n1;
const Control& tan1 = dp0 * n0 + dp1n1;
const Control& tan2 = dp1n1 + dp2 * n2;
sum =
tan1 * weights[0]+
tan1 * weights[0] +
p1 * weights[1] +
p2 * weights[2] +
tan2 * weights[3];