phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix build for gcc 4.6. Patch by Vladislav

Browse Source 
This was SVN commit r18032.
This commit is contained in:
sanderd17 2016-04-14 16:36:12 +00:00
parent a57bfc829e
commit ec3fb36602
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/maths/NUSpline.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games. /* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -49,6 +49,8 @@ RNSpline::RNSpline()
{ {
} }
RNSpline::~RNSpline() = default;
// adds node and updates segment length // adds node and updates segment length
void RNSpline::AddNode(const CFixedVector3D& pos) void RNSpline::AddNode(const CFixedVector3D& pos)
{ {
@ -154,6 +156,8 @@ CVector3D RNSpline::GetEndVelocity(int index)
/*********************************** S N S **************************************************/ /*********************************** S N S **************************************************/
SNSpline::~SNSpline() = default;
void SNSpline::BuildSpline() void SNSpline::BuildSpline()
{ {
RNSpline::BuildSpline(); RNSpline::BuildSpline();
@ -183,6 +187,8 @@ void SNSpline::Smooth()
/*********************************** T N S **************************************************/ /*********************************** T N S **************************************************/
TNSpline::~TNSpline() = default;
// as with RNSpline but use timePeriod in place of actual node spacing // as with RNSpline but use timePeriod in place of actual node spacing
// ie time period is time from last node to this node // ie time period is time from last node to this node
void TNSpline::AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod) void TNSpline::AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod)

8
source/maths/NUSpline.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games. /* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -52,7 +52,7 @@ class RNSpline
public: public:
RNSpline(); RNSpline();
virtual ~RNSpline() = default; virtual ~RNSpline();
void AddNode(const CFixedVector3D& pos); void AddNode(const CFixedVector3D& pos);
void BuildSpline(); void BuildSpline();
@ -78,7 +78,7 @@ protected:
class SNSpline : public RNSpline class SNSpline : public RNSpline
{ {
public: public:
virtual ~SNSpline() = default; virtual ~SNSpline();
void BuildSpline(); void BuildSpline();
void Smooth(); void Smooth();
@ -91,7 +91,7 @@ public:
class TNSpline : public SNSpline class TNSpline : public SNSpline
{ {
public: public:
virtual ~TNSpline() = default; virtual ~TNSpline();
void AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod); void AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod);
void InsertNode(const int index, const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod); void InsertNode(const int index, const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod);