Updated test code, updated win32 code a bit (still not complete, but hopefully tonight), and removed the last vestiges of ellipse and polygon drawing support.
This commit is contained in:
Eli Gottlieb
parent
a50bf48eac
commit
9f24e9f619
7 changed files with 88 additions and 225 deletions
|
|
@ -1,92 +0,0 @@
|
|||
/*
|
||||
SDL - Simple DirectMedia Layer
|
||||
Copyright (C) 2010 Eli Gottlieb
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Eli Gottlieb
|
||||
eligottlieb@gmail.com
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file SDL_ellipse.h
|
||||
*
|
||||
* Header file for SDL_ellipse definition and management functions.
|
||||
*/
|
||||
|
||||
#ifndef _SDL_ellipse_h
|
||||
#define _SDL_ellipse_h
|
||||
|
||||
#include "SDL_stdinc.h"
|
||||
#include "SDL_error.h"
|
||||
#include "SDL_pixels.h"
|
||||
#include "SDL_rwops.h"
|
||||
|
||||
#include "begin_code.h"
|
||||
/* Set up for C function definitions, even when using C++ */
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
extern "C" {
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \brief The structure that defines an ellipse.
|
||||
*
|
||||
* \sa SDL_EllipseEmpty
|
||||
* \sa SDL_EllipseEquals
|
||||
* \sa SDL_EllipsesIntersect
|
||||
* \sa SDL_IntersectEllipseAndLine
|
||||
*/
|
||||
typedef struct SDL_Ellipse {
|
||||
int x,y;
|
||||
int a,b;
|
||||
int r;
|
||||
} SDL_Ellipse;
|
||||
|
||||
/**
|
||||
* \brief Returns true if the ellipse has no area.
|
||||
*/
|
||||
#define SDL_EllipseEmpty(X) ((X)->r <= 0)
|
||||
|
||||
/**
|
||||
* \brief Returns true if the two ellipses are equal.
|
||||
*/
|
||||
#define SDL_EllipseEquals(A, B) (((A)->x == (B)->x) && ((A)->y == (B)->y) && \
|
||||
((A)->a == (B)->a) && ((A)->b == (B)->b) && ((A)->r == (B)->r))
|
||||
|
||||
/**
|
||||
* \brief Determine whether two ellipses intersect.
|
||||
*
|
||||
* \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_EllipsesIntersect(const SDL_Ellipse * A,const SDL_Ellipse * B);
|
||||
|
||||
/**
|
||||
* \brief Calculate the intersection of an ellipse and line segment.
|
||||
*
|
||||
* \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_IntersectEllipseAndLine(const SDL_Ellipse *ellipse,int *X1,int *Y1,int *X2,int *Y2);
|
||||
|
||||
/* Ends C function definitions when using C++ */
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
}
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
#include "close_code.h"
|
||||
|
||||
#endif /* _SDL_ellipse_h */
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
/*
|
||||
SDL - Simple DirectMedia Layer
|
||||
Copyright (C) 2010 Eli Gottlieb
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Eli Gottlieb
|
||||
eligottlieb@gmail.com
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file SDL_poly.h
|
||||
*
|
||||
* Header file for SDL_poly definition and management functions.
|
||||
*/
|
||||
|
||||
#ifndef _SDL_poly_h
|
||||
#define _SDL_poly_h
|
||||
|
||||
#include "SDL_stdinc.h"
|
||||
#include "SDL_error.h"
|
||||
#include "SDL_pixels.h"
|
||||
#include "SDL_rwops.h"
|
||||
#include "SDL_rect.h"
|
||||
|
||||
#include "begin_code.h"
|
||||
/* Set up for C function definitions, even when using C++ */
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
extern "C" {
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \brief The structure that defines an polygon.
|
||||
*
|
||||
* \sa SDL_PolyEmpty
|
||||
* \sa SDL_PolyEquals
|
||||
* \sa SDL_PolysIntersect
|
||||
* \sa SDL_IntersectPoly
|
||||
* \sa SDL_WrapPoints
|
||||
* \sa SDL_IntersectPolyAndLine
|
||||
*/
|
||||
typedef struct SDL_Poly {
|
||||
SDL_Point *vertices;
|
||||
int count;
|
||||
} SDL_Poly;
|
||||
|
||||
/**
|
||||
* \brief Returns true if the polygon has no area.
|
||||
*/
|
||||
#define SDL_PolyEmpty(X) (((X)->vertices == NULL) || ((X)->count <= 2))
|
||||
|
||||
/**
|
||||
* \brief Determine whether two polygons are equal.
|
||||
*
|
||||
* \return SDL_TRUE if the polygons are equal, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_PolyEquals(const SDL_Poly *A,const SDL_Poly *B);
|
||||
|
||||
/**
|
||||
* \brief Determine whether two rectangles intersect.
|
||||
*
|
||||
* \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_PolysIntersect(const SDL_Poly * A,const SDL_Poly * B);
|
||||
|
||||
/**
|
||||
* \brief Calculate the intersection of two rectangles.
|
||||
*
|
||||
* \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_IntersectPoly(const SDL_Poly * A,const SDL_Poly * B,SDL_Poly * result);
|
||||
|
||||
/**
|
||||
* \brief Calculate a minimal polygon wrapping a set of points
|
||||
*
|
||||
* \return 0 on success, -1 if the parameters were invalid, and -2 if an insufficient number of points were supplied
|
||||
* in the output polygon.
|
||||
*/
|
||||
extern DECLSPEC int SDLCALL SDL_WrapPoints(const SDL_Point * points,int count,SDL_Poly *result);
|
||||
|
||||
/**
|
||||
* \brief Calculate the intersection of a polygon and line segment.
|
||||
*
|
||||
* \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
|
||||
*/
|
||||
extern DECLSPEC SDL_bool SDLCALL SDL_IntersectPolyAndLine(const SDL_Poly *poly,int *X1,int *Y1,int *X2,int *Y2);
|
||||
|
||||
/* Ends C function definitions when using C++ */
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
}
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
#include "close_code.h"
|
||||
|
||||
#endif /* _SDL_poly_h */
|
||||
|
|
@ -32,8 +32,6 @@
|
|||
#include "SDL_stdinc.h"
|
||||
#include "SDL_pixels.h"
|
||||
#include "SDL_rect.h"
|
||||
#include "SDL_ellipse.h"
|
||||
#include "SDL_poly.h"
|
||||
#include "SDL_surface.h"
|
||||
|
||||
#include "begin_code.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue