mirror of
https://github.com/ENSL/NS.git
synced 2024-11-22 20:51:35 +00:00
cl_cross macos update
This commit is contained in:
parent
9a4a291b41
commit
086c9a4aa6
3 changed files with 16 additions and 16 deletions
|
@ -25,12 +25,12 @@ class CHudCrosshairs : public CHudBase
|
|||
cvar_t* cl_cross_line_left;
|
||||
cvar_t* cl_cross_line_right;
|
||||
|
||||
#ifdef __APPLE__
|
||||
//Remove when OSX builds with c++11
|
||||
#else
|
||||
//#ifdef __APPLE__
|
||||
// //Remove when OSX builds with c++11
|
||||
//#else
|
||||
float old_circle_radius;
|
||||
std::vector<Vector2D> circle_points;
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
public:
|
||||
virtual int Init();
|
||||
|
|
|
@ -75,9 +75,9 @@ void HudGL::rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const
|
|||
glEnd();
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
//Remove when OSX builds with c++11
|
||||
#else
|
||||
//#ifdef __APPLE__
|
||||
////Remove when OSX builds with c++11
|
||||
//#else
|
||||
std::vector<Vector2D> HudGL::compute_circle(float radius) {
|
||||
// Maximum allowed distance between the circle and the rendered line segment.
|
||||
const float MAX_ERROR = 0.1f;
|
||||
|
@ -94,4 +94,4 @@ std::vector<Vector2D> HudGL::compute_circle(float radius) {
|
|||
|
||||
return points;
|
||||
}
|
||||
#endif
|
||||
//#endif
|
|
@ -9,16 +9,16 @@ public:
|
|||
void color(unsigned char r, unsigned char g, unsigned char b, unsigned char a) const;
|
||||
void line_width(float width) const;
|
||||
void line(const Vector2D& start, const Vector2D& end) const;
|
||||
#ifdef __APPLE__
|
||||
//Remove when OSX builds with c++11
|
||||
#else
|
||||
//#ifdef __APPLE__
|
||||
// //Remove when OSX builds with c++11
|
||||
//#else
|
||||
void circle(const Vector2D& center, const std::vector<Vector2D>& points) const;
|
||||
#endif
|
||||
//#endif
|
||||
void rectangle(const Vector2D& corner_a, const Vector2D& corner_b) const;
|
||||
|
||||
#ifdef __APPLE__
|
||||
//Remove when OSX builds with c++11
|
||||
#else
|
||||
//#ifdef __APPLE__
|
||||
// //Remove when OSX builds with c++11
|
||||
//#else
|
||||
static std::vector<Vector2D> compute_circle(float radius);
|
||||
#endif
|
||||
//#endif
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue