Permalink
Browse files

removed dos line endings.

  • Loading branch information...
1 parent 2ed5770 commit 7d9145292da8d54f9e7ab27f2cb467d3b8a3c1f2 alexr committed May 14, 2010
Showing with 5,152 additions and 5,105 deletions.
  1. +1 −1 include/ai.h
  2. +9 −9 include/bezier.h
  3. +31 −31 include/camera.h
  4. +22 −22 include/camera_chase.h
  5. +25 −25 include/camera_fixed.h
  6. +13 −13 include/camera_free.h
  7. +28 −28 include/camera_mount.h
  8. +15 −15 include/camera_orbit.h
  9. +32 −32 include/camera_simplemount.h
  10. +32 −32 include/camera_system.h
  11. +3 −3 include/car.h
  12. +11 −11 include/carclutch.h
  13. +7 −7 include/cardynamics.h
  14. +33 −33 include/carsuspension.h
  15. +5 −5 include/cartelemetry.h
  16. +83 −83 include/collision_contact.h
  17. +61 −61 include/collision_world.h
  18. +3 −3 include/configfile.h
  19. +9 −9 include/crashdetection.h
  20. +121 −121 include/drawable.h
  21. +13 −13 include/drawable_container.h
  22. +6 −6 include/enginesoundinfo.h
  23. +6 −6 include/font.h
  24. +9 −9 include/game.h
  25. +3 −3 include/graphics.h
  26. +2 −2 include/graphics_renderers.h
  27. +32 −32 include/gui.h
  28. +12 −12 include/guipage.h
  29. +12 −12 include/httpget.h
  30. +9 −9 include/hud.h
  31. +2 −2 include/linearframe.h
  32. +4 −4 include/loadingscreen.h
  33. +30 −30 include/matrix3.h
  34. +3 −3 include/mesh_gen.h
  35. +1 −1 include/model.h
  36. +103 −103 include/objectloader.h
  37. +68 −68 include/objectmanager.h
  38. +6 −6 include/particle.h
  39. +908 −908 include/quickprof.h
  40. +11 −11 include/replay.h
  41. +1 −1 include/rigidbody.h
  42. +65 −65 include/roadpatch.h
  43. +50 −50 include/roadstrip.h
  44. +97 −97 include/scenenode.h
  45. +40 −40 include/settings.h
  46. +1 −1 include/signalprocessing.h
  47. +58 −58 include/sky.h
  48. +6 −6 include/spline.h
  49. +3 −3 include/sprite2d.h
  50. +3 −3 include/staticdrawables.h
  51. +20 −20 include/suspensionbumpdetection.h
  52. +14 −14 include/texture.h
  53. +67 −67 include/textureinfo.h
  54. +51 −51 include/texturemanager.h
  55. +26 −26 include/tobullet.h
  56. +9 −9 include/track.h
  57. +20 −20 include/track_object.h
  58. +16 −16 include/trackmap.h
  59. +49 −49 include/tracksurface.h
  60. +12 −12 include/transform.h
  61. +310 −310 include/unittest.h
  62. +3 −3 include/widget.h
  63. +2 −2 include/widget_button.h
  64. +1 −1 include/widget_controlgrab.h
  65. +1 −1 include/widget_doublestringwheel.h
  66. +12 −12 include/widget_multiimage.h
  67. +34 −34 include/widget_slider.h
  68. +27 −27 include/widget_stringwheel.h
  69. +1 −1 include/widget_toggle.h
  70. +2 −2 src/bezier.cpp
  71. +24 −24 src/camera.cpp
  72. +11 −11 src/camera_chase.cpp
  73. +19 −19 src/camera_fixed.cpp
  74. +17 −17 src/camera_free.cpp
  75. +27 −27 src/camera_mount.cpp
  76. +21 −21 src/camera_orbit.cpp
  77. +7 −7 src/camera_simplemount.cpp
  78. +44 −44 src/camera_system.cpp
  79. +10 −10 src/car.cpp
  80. +307 −307 src/collision_world.cpp
  81. +1 −1 src/configfile.cpp
  82. +15 −15 src/crashdetection.cpp
  83. +9 −9 src/font.cpp
  84. +2 −2 src/graphics.cpp
  85. +79 −79 src/guipage.cpp
  86. +34 −36 src/httpget.cpp
  87. +15 −15 src/hud.cpp
  88. +5 −0 src/main.cpp
  89. +494 −494 src/mesh_gen.cpp
  90. +4 −4 src/model.cpp
  91. +289 −289 src/objectloader.cpp
  92. +3 −3 src/opengl_utility.cpp
  93. +13 −13 src/particle.cpp
  94. +8 −8 src/performance_testing.cpp
  95. +3 −3 src/replay.cpp
  96. +131 −89 src/roadpatch.cpp
  97. +140 −138 src/roadstrip.cpp
  98. +3 −3 src/scenenode.cpp
  99. +17 −17 src/settings.cpp
  100. +153 −153 src/sky.cpp
  101. +12 −12 src/suspensionbumpdetection.cpp
  102. +25 −25 src/texture.cpp
  103. +11 −11 src/track.cpp
  104. +24 −24 src/trackmap.cpp
  105. +64 −64 src/widget_slider.cpp
  106. +279 −279 src/widget_spinningcar.cpp
  107. +47 −47 src/widget_stringwheel.cpp
View
@@ -2,7 +2,7 @@
#define _AI_H
#include "carinput.h"
-#include "reseatable_reference.h"
+#include "reseatable_reference.h"
#include "scenenode.h"
#include <vector>
View
@@ -14,17 +14,17 @@ class BEZIER
{
friend class AI;
friend class TRACK;
-friend class ROADPATCH;
-
+friend class ROADPATCH;
+
public:
BEZIER();
~BEZIER();
BEZIER(const BEZIER & other) {CopyFrom(other);}
BEZIER & operator=(const BEZIER & other) {return CopyFrom(other);}
BEZIER & CopyFrom(const BEZIER &other);
-
+
float GetDistFromStart() const {return dist_from_start;}
- void ResetDistFromStart() {dist_from_start = 0.0f;}
+ void ResetDistFromStart() {dist_from_start = 0.0f;}
void ResetNextPatch() {next_patch = NULL;}
///initialize this bezier to the quad defined by the given corner points
@@ -96,7 +96,7 @@ friend class ROADPATCH;
bool HasRacingline() const
{
return have_racingline;
- }
+ }
private:
///return the bernstein given the normalized coordinate u (zero to one) and an array of four points p
@@ -113,12 +113,12 @@ friend class ROADPATCH;
///return true if the ray at orig with direction dir intersects the given quadrilateral.
/// also put the collision depth in t and the collision coordinates in u,v
- bool IntersectQuadrilateralF(
- const MATHVECTOR <float, 3> & orig,
+ bool IntersectQuadrilateralF(
+ const MATHVECTOR <float, 3> & orig,
const MATHVECTOR <float, 3> & dir,
- const MATHVECTOR <float, 3> & v_00,
+ const MATHVECTOR <float, 3> & v_00,
const MATHVECTOR <float, 3> & v_10,
- const MATHVECTOR <float, 3> & v_11,
+ const MATHVECTOR <float, 3> & v_11,
const MATHVECTOR <float, 3> & v_01,
float &t, float &u, float &v) const;
View
@@ -1,41 +1,41 @@
#ifndef _CAMERA_H
#define _CAMERA_H
-
-#include <string>
+
+#include <string>
#include "mathvector.h"
-#include "quaternion.h"
-
+#include "quaternion.h"
+
///base class for a camera
class CAMERA
-{
-public:
- CAMERA(const std::string & camera_name) : name(camera_name)
- {
-
- }
-
- const std::string & GetName() const
- {
- return name;
+{
+public:
+ CAMERA(const std::string & camera_name) : name(camera_name)
+ {
+
}
-
+
+ const std::string & GetName() const
+ {
+ return name;
+ }
+
virtual MATHVECTOR <float, 3> GetPosition() const = 0;
-
- virtual QUATERNION <float> GetOrientation() const = 0;
-
- // reset position, orientation
- virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
-
- // update position, orientation
- virtual void Update(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat, const MATHVECTOR <float, 3> & accel, float dt);
-
- // move relative to current position, orientation
- virtual void Move(float dx, float dy, float dz);
-
- // rotate relative to current position, orientation
- virtual void Rotate(float up, float left);
-
-protected:
+
+ virtual QUATERNION <float> GetOrientation() const = 0;
+
+ // reset position, orientation
+ virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
+
+ // update position, orientation
+ virtual void Update(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat, const MATHVECTOR <float, 3> & accel, float dt);
+
+ // move relative to current position, orientation
+ virtual void Move(float dx, float dy, float dz);
+
+ // rotate relative to current position, orientation
+ virtual void Rotate(float up, float left);
+
+protected:
const std::string name;
};
View
@@ -1,31 +1,31 @@
-#ifndef _CAMERA_CHASE_H
-#define _CAMERA_CHASE_H
-
-#include "camera.h"
+#ifndef _CAMERA_CHASE_H
+#define _CAMERA_CHASE_H
+
+#include "camera.h"
class CAMERA_CHASE : public CAMERA
{
public:
- CAMERA_CHASE(const std::string & name);
-
- virtual MATHVECTOR <float, 3> GetPosition() const
- {
- return position;
+ CAMERA_CHASE(const std::string & name);
+
+ virtual MATHVECTOR <float, 3> GetPosition() const
+ {
+ return position;
}
-
- virtual QUATERNION <float> GetOrientation() const
- {
- return orientation;
+
+ virtual QUATERNION <float> GetOrientation() const
+ {
+ return orientation;
}
-
- virtual void Reset(const MATHVECTOR <float, 3> & newfocus, const QUATERNION <float> & focus_facing);
+
+ virtual void Reset(const MATHVECTOR <float, 3> & newfocus, const QUATERNION <float> & focus_facing);
virtual void Update(const MATHVECTOR <float, 3> & newfocus, const QUATERNION <float> & focus_facing, const MATHVECTOR <float, 3> & accel, float dt);
-
+
void SetChaseDistance ( float value )
{
chase_distance = value;
- }
+ }
void SetChaseHeight ( float value )
{
@@ -35,8 +35,8 @@ class CAMERA_CHASE : public CAMERA
void SetPositionBlending ( bool value )
{
posblend_on = value;
- }
-
+ }
+
private:
MATHVECTOR <float, 3> position;
MATHVECTOR <float, 3> focus;
@@ -49,6 +49,6 @@ class CAMERA_CHASE : public CAMERA
float AngleBetween(MATHVECTOR <float, 3> vec1, MATHVECTOR <float, 3> vec2);
void LookAt(MATHVECTOR <float, 3> eye, MATHVECTOR <float, 3> center, MATHVECTOR <float, 3> up);
-};
-
-#endif // _CAMERA_CHASE_H
+};
+
+#endif // _CAMERA_CHASE_H
View
@@ -1,33 +1,33 @@
-#ifndef _CAMERA_FIXED_H
-#define _CAMERA_FIXED_H
-
-#include "camera.h"
-
+#ifndef _CAMERA_FIXED_H
+#define _CAMERA_FIXED_H
+
+#include "camera.h"
+
class CAMERA_FIXED : public CAMERA
-{
-public:
+{
+public:
CAMERA_FIXED(const std::string & name);
-
- virtual MATHVECTOR <float, 3> GetPosition() const
- {
- return position;
+
+ virtual MATHVECTOR <float, 3> GetPosition() const
+ {
+ return position;
+ }
+
+ virtual QUATERNION <float> GetOrientation() const
+ {
+ return orientation;
}
-
- virtual QUATERNION <float> GetOrientation() const
- {
- return orientation;
- }
-
- virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
+
+ virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
- virtual void Update(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat, const MATHVECTOR <float, 3> & accel, float dt);
-
- void SetOffset(float x, float y, float z);
+ virtual void Update(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat, const MATHVECTOR <float, 3> & accel, float dt);
+
+ void SetOffset(float x, float y, float z);
private:
- MATHVECTOR <float, 3> position;
+ MATHVECTOR <float, 3> position;
MATHVECTOR <float, 3> offset;
QUATERNION <float> orientation;
-};
-
-#endif // _CAMERA_FIXED_H
+};
+
+#endif // _CAMERA_FIXED_H
View
@@ -1,28 +1,28 @@
-#ifndef _CAMERA_FREE_H
-#define _CAMERA_FREE_H
-
-#include "camera.h"
-
+#ifndef _CAMERA_FREE_H
+#define _CAMERA_FREE_H
+
+#include "camera.h"
+
class CAMERA_FREE : public CAMERA
-{
+{
public:
CAMERA_FREE(const std::string & name);
virtual MATHVECTOR <float, 3> GetPosition() const;
-
- virtual QUATERNION <float> GetOrientation() const;
+
+ virtual QUATERNION <float> GetOrientation() const;
virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
virtual void Rotate(float up, float left);
- virtual void Move(float dx, float dy, float dz);
+ virtual void Move(float dx, float dy, float dz);
private:
- MATHVECTOR <float, 3> position;
+ MATHVECTOR <float, 3> position;
MATHVECTOR <float, 3> offset;
float leftright_rotation;
float updown_rotation;
-};
-
-#endif // _CAMERA_FREE_H
+};
+
+#endif // _CAMERA_FREE_H
View
@@ -1,33 +1,33 @@
-#ifndef _CAMERA_MOUNT_H
-#define _CAMERA_MOUNT_H
-
-#include "camera.h"
-#include "rigidbody.h"
-#include "random.h"
-
+#ifndef _CAMERA_MOUNT_H
+#define _CAMERA_MOUNT_H
+
+#include "camera.h"
+#include "rigidbody.h"
+#include "random.h"
+
class CAMERA_MOUNT : public CAMERA
{
public:
CAMERA_MOUNT(const std::string & name);
- virtual MATHVECTOR <float, 3> GetPosition() const;
+ virtual MATHVECTOR <float, 3> GetPosition() const;
- virtual QUATERNION <float> GetOrientation() const;
+ virtual QUATERNION <float> GetOrientation() const;
- virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
+ virtual void Reset(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newquat);
virtual void Update(const MATHVECTOR <float, 3> & newpos, const QUATERNION <float> & newdir, const MATHVECTOR <float, 3> & accel, float dt);
-
- void SetOffset(MATHVECTOR <float, 3> value)
- {
- offset = value;
- }
-
- void SetRotation(float up, float left)
- {
- rotation.Rotate(up, 0, 1, 0);
- rotation.Rotate(left, 0, 0, 1);
- }
+
+ void SetOffset(MATHVECTOR <float, 3> value)
+ {
+ offset = value;
+ }
+
+ void SetRotation(float up, float left)
+ {
+ rotation.Rotate(up, 0, 1, 0);
+ rotation.Rotate(left, 0, 0, 1);
+ }
void SetStiffness ( float value )
{
@@ -37,19 +37,19 @@ class CAMERA_MOUNT : public CAMERA
void SetEffectStrength ( float value )
{
offset_effect_strength = value;
- }
-
+ }
+
private:
RIGIDBODY <float> body;
- MATHVECTOR <float, 3> anchor;
- MATHVECTOR <float, 3> offset; // offset relative car(center of mass)
+ MATHVECTOR <float, 3> anchor;
+ MATHVECTOR <float, 3> offset; // offset relative car(center of mass)
QUATERNION<float> rotation; // camera rotation relative to car
float effect;
DETERMINISTICRANDOM randgen;
float stiffness; ///< where 0.0 is nominal stiffness for a sports car and 1.0 is a formula 1 car
float offset_effect_strength; ///< where 1.0 is normal effect strength
-};
-
-#endif // _CAMERA_MOUNT_H
+};
+
+#endif // _CAMERA_MOUNT_H
Oops, something went wrong.

0 comments on commit 7d91452

Please sign in to comment.