Removed more tabs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
3a81b033cd
commit
5a938b4bf9
@ -46,7 +46,7 @@ private:
|
||||
* inner radius. */
|
||||
video::SColor m_ambient_color;
|
||||
public:
|
||||
AmbientLightSphere(CheckManager *check_manager,
|
||||
AmbientLightSphere(CheckManager *check_manager,
|
||||
const XMLNode &node);
|
||||
virtual ~AmbientLightSphere() {};
|
||||
virtual void update(float dt);
|
||||
|
@ -31,29 +31,29 @@ class XMLNode;
|
||||
class BezierCurve
|
||||
{
|
||||
private:
|
||||
/** A data structure to store one bezier control point and
|
||||
* the two handles. */
|
||||
struct BezierData
|
||||
{
|
||||
/** The control point. */
|
||||
Vec3 m_control_point;
|
||||
/** First handle, i.e. the one towards the previous point. */
|
||||
Vec3 m_handle1;
|
||||
/** Second handle, i.e. the one towards the next point. */
|
||||
Vec3 m_handle2;
|
||||
}; // BezierData
|
||||
/** A data structure to store one bezier control point and
|
||||
* the two handles. */
|
||||
struct BezierData
|
||||
{
|
||||
/** The control point. */
|
||||
Vec3 m_control_point;
|
||||
/** First handle, i.e. the one towards the previous point. */
|
||||
Vec3 m_handle1;
|
||||
/** Second handle, i.e. the one towards the next point. */
|
||||
Vec3 m_handle2;
|
||||
}; // BezierData
|
||||
|
||||
/** Overall duration. */
|
||||
float m_time;
|
||||
/** Overall duration. */
|
||||
float m_time;
|
||||
|
||||
/** Vector with all control points and handles. */
|
||||
std::vector<BezierData> m_all_data;
|
||||
/** Vector with all control points and handles. */
|
||||
std::vector<BezierData> m_all_data;
|
||||
public:
|
||||
BezierCurve(const XMLNode &node);
|
||||
Vec3 getXYZ(float t) const;
|
||||
Vec3 getHPR(float t) const;
|
||||
BezierCurve(const XMLNode &node);
|
||||
Vec3 getXYZ(float t) const;
|
||||
Vec3 getHPR(float t) const;
|
||||
|
||||
/** Returns the number of points in this bezier curve. */
|
||||
unsigned int getNumPoints() const {return m_all_data.size(); }
|
||||
/** Returns the number of points in this bezier curve. */
|
||||
unsigned int getNumPoints() const {return m_all_data.size(); }
|
||||
}; // BezierCurve
|
||||
#endif
|
||||
|
@ -38,18 +38,18 @@ class CheckManager;
|
||||
class CheckLine : public CheckStructure
|
||||
{
|
||||
private:
|
||||
/** The line that is tested for being crossed. */
|
||||
/** The line that is tested for being crossed. */
|
||||
core::line2df m_line;
|
||||
|
||||
/** The minimum height of the checkline. */
|
||||
float m_min_height;
|
||||
/** The minimum height of the checkline. */
|
||||
float m_min_height;
|
||||
|
||||
/** Stores the sign (i.e. side) of the previous line to save some
|
||||
* computations. True if the value is >=0, i.e. the point is on
|
||||
* or to the right of the line. */
|
||||
std::vector<bool> m_previous_sign;
|
||||
public:
|
||||
CheckLine(CheckManager *check_manager, const XMLNode &node);
|
||||
CheckLine(CheckManager *check_manager, const XMLNode &node);
|
||||
virtual ~CheckLine() {};
|
||||
virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos, int indx);
|
||||
virtual void reset(const Track &track);
|
||||
|
@ -30,11 +30,11 @@ class Track;
|
||||
class CheckManager
|
||||
{
|
||||
private:
|
||||
std::vector<CheckStructure*> m_all_checks;
|
||||
std::vector<CheckStructure*> m_all_checks;
|
||||
public:
|
||||
CheckManager(const XMLNode &node, Track *track);
|
||||
void update(float dt);
|
||||
void reset(const Track &track);
|
||||
CheckManager(const XMLNode &node, Track *track);
|
||||
void update(float dt);
|
||||
void reset(const Track &track);
|
||||
/** Returns the nth. check structure. */
|
||||
CheckStructure *getCheckStructure(unsigned int n)
|
||||
{ return m_all_checks[n]; }
|
||||
|
@ -47,7 +47,7 @@ private:
|
||||
* This saves some computations. */
|
||||
std::vector<float> m_distance2;
|
||||
public:
|
||||
CheckSphere(CheckManager *check_manager, const XMLNode &node);
|
||||
CheckSphere(CheckManager *check_manager, const XMLNode &node);
|
||||
virtual ~CheckSphere() {};
|
||||
virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
|
||||
int kart_id);
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
enum CheckType {CT_NEW_LAP, CT_ACTIVATE, CT_TOGGLE, CT_AMBIENT_SPHERE};
|
||||
|
||||
protected:
|
||||
/** Stores the previous position of all karts. This is needed to detect
|
||||
/** Stores the previous position of all karts. This is needed to detect
|
||||
* when e.g. a check point is reached the first time, or a checkline is
|
||||
* crossed. */
|
||||
std::vector<Vec3> m_previous_position;
|
||||
|
Loading…
Reference in New Issue
Block a user