Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 617 vs 721 for /trunk/Source Code/Libs/ReCast/DebugUtils/Include/DebugDraw.h

Diff revisions: vs.
  @@ -44,23 +44,23 @@
44 44
45 45 /// Submit a vertex
46 46 /// @param pos [in] position of the verts.
47 - /// @param color [in] color of the verts.
48 - virtual void vertex(const float* pos, unsigned int color) = 0;
47 + /// @param colour [in] colour of the verts.
48 + virtual void vertex(const float* pos, unsigned int colour) = 0;
49 49
50 50 /// Submit a vertex
51 51 /// @param x,y,z [in] position of the verts.
52 - /// @param color [in] color of the verts.
53 - virtual void vertex(const float x, const float y, const float z, unsigned int color) = 0;
52 + /// @param colour [in] colour of the verts.
53 + virtual void vertex(const float x, const float y, const float z, unsigned int colour) = 0;
54 54
55 55 /// Submit a vertex
56 56 /// @param pos [in] position of the verts.
57 - /// @param color [in] color of the verts.
58 - virtual void vertex(const float* pos, unsigned int color, const float* uv) = 0;
57 + /// @param colour [in] colour of the verts.
58 + virtual void vertex(const float* pos, unsigned int colour, const float* uv) = 0;
59 59
60 60 /// Submit a vertex
61 61 /// @param x,y,z [in] position of the verts.
62 - /// @param color [in] color of the verts.
63 - virtual void vertex(const float x, const float y, const float z, unsigned int color, const float u, const float v) = 0;
62 + /// @param colour [in] colour of the verts.
63 + virtual void vertex(const float x, const float y, const float z, unsigned int colour, const float u, const float v) = 0;
64 64
65 65 /// End drawing primitives.
66 66 virtual void end() = 0;
  @@ -121,7 +121,7 @@
121 121 }
122 122
123 123
124 - void duCalcBoxColors(unsigned int* colors, unsigned int colTop, unsigned int colSide);
124 + void duCalcBoxColours(unsigned int* colours, unsigned int colTop, unsigned int colSide);
125 125
126 126 void duDebugDrawCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
127 127 float maxx, float maxy, float maxz, unsigned int col, const float lineWidth);
  @@ -188,7 +188,7 @@
188 188 class duDisplayList : public duDebugDraw
189 189 {
190 190 float* m_pos;
191 - unsigned int* m_color;
191 + unsigned int* m_colour;
192 192 int m_size;
193 193 int m_cap;
194 194
  @@ -201,8 +201,8 @@
201 201 duDisplayList(int cap = 512);
202 202 ~duDisplayList();
203 203 virtual void begin(duDebugDrawPrimitives prim, float size = 1.0f);
204 - virtual void vertex(const float x, const float y, const float z, unsigned int color);
205 - virtual void vertex(const float* pos, unsigned int color);
204 + virtual void vertex(const float x, const float y, const float z, unsigned int colour);
205 + virtual void vertex(const float* pos, unsigned int colour);
206 206 virtual void end();
207 207 void clear();
208 208 void draw(struct duDebugDraw* dd);