Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-10-10 22:36:17 +00:00
parent b850d1ce79
commit 233dd3131e
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Resources/Config/descriptions.plist
View File

@ -762,9 +762,8 @@
);*/
// The following is a test of a complex, multi-contour polygon sprite
// which self-intersects.
// It currently doesn't work, because it requires a combine callback.
// -- Ahruman 2009-10-10
/* (
/*(
(
-1, 3,
1, 3,
@ -777,8 +776,8 @@
3, -3,
-3, -3
)
);
*/
);*/
"oolite-default-mine-icon" =
(
0, 2,

37
src/Core/OOPolygonSprite.m
View File

@ -30,7 +30,7 @@ SOFTWARE.
The polygon data is tesselated (on object creation) using a GLU tesselator.
Although GLU produces a mix of triangles, triangle fans and triangle
strips, we convert those to a single triangle soup since the primitives are
strips, we convert those to a single triangle soup since the polygons are
unlikely to be large enough that using multiple primitives would be a win.
Uniquing vertices and using indices, and using the same vertex array for
@ -46,13 +46,10 @@ SOFTWARE.
#import "OOCollectionExtractors.h"
#import "OOMacroOpenGL.h"
#ifdef OOLITE_HAVE_APPKIT
#define OOVOID_APIENTRY void
#else //windows, and possibly linux
#define OOVOID_APIENTRY void APIENTRY
#endif
#define TESS_TOLERANCE 0.05 // Feature merging factor: higher values merge more features with greater chance of distortion.
#if !OOLITE_WINDOWS
#define APIENTRY
#endif
@interface OOPolygonSprite (Private)
@ -81,11 +78,12 @@ static BOOL GrowTessPolygonData(TessPolygonData *data, size_t capacityHint); //
static BOOL AppendVertex(TessPolygonData *data, NSPoint vertex);
static OOVOID_APIENTRY SolidBeginCallback(GLenum type, void *polygonData);
static OOVOID_APIENTRY SolidVertexCallback(void *vertexData, void *polygonData);
static OOVOID_APIENTRY SolidEndCallback(void *polygonData);
static void APIENTRY SolidBeginCallback(GLenum type, void *polygonData);
static void APIENTRY SolidVertexCallback(void *vertexData, void *polygonData);
static void APIENTRY SolidCombineCallback(GLdouble coords[3], void *vertexData[4], GLfloat weight[4], void **outData, void *polygonData);
static void APIENTRY SolidEndCallback(void *polygonData);
static OOVOID_APIENTRY ErrorCallback(GLenum error, void *polygonData);
static void APIENTRY ErrorCallback(GLenum error, void *polygonData);
@implementation OOPolygonSprite
@ -184,7 +182,7 @@ static OOVOID_APIENTRY ErrorCallback(GLenum error, void *polygonData);
gluTessCallback(tesselator, GLU_TESS_VERTEX_DATA, SolidVertexCallback);
gluTessCallback(tesselator, GLU_TESS_END_DATA, SolidEndCallback);
gluTessCallback(tesselator, GLU_TESS_ERROR_DATA, ErrorCallback);
gluTessProperty(tesselator, GLU_TESS_TOLERANCE, TESS_TOLERANCE);
gluTessCallback(tesselator, GLU_TESS_COMBINE_DATA, SolidCombineCallback);
gluTessBeginPolygon(tesselator, &polygonData);
@ -294,7 +292,7 @@ static BOOL AppendVertex(TessPolygonData *data, NSPoint vertex)
}
static OOVOID_APIENTRY SolidBeginCallback(GLenum type, void *polygonData)
static void APIENTRY SolidBeginCallback(GLenum type, void *polygonData)
{
TessPolygonData *data = polygonData;
NSCParameterAssert(data != NULL);
@ -304,7 +302,7 @@ static OOVOID_APIENTRY SolidBeginCallback(GLenum type, void *polygonData)
}
static OOVOID_APIENTRY SolidVertexCallback(void *vertexData, void *polygonData)
static void APIENTRY SolidVertexCallback(void *vertexData, void *polygonData)
{
TessPolygonData *data = polygonData;
NSValue *vertValue = vertexData;
@ -381,7 +379,14 @@ static OOVOID_APIENTRY SolidVertexCallback(void *vertexData, void *polygonData)
}
static OOVOID_APIENTRY SolidEndCallback(void *polygonData)
static void APIENTRY SolidCombineCallback(GLdouble coords[3], void *vertexData[4], GLfloat weight[4], void **outData, void *polygonData)
{
NSPoint point = { coords[0], coords[1] };
*outData = [NSValue valueWithPoint:point];
}
static void APIENTRY SolidEndCallback(void *polygonData)
{
TessPolygonData *data = polygonData;
NSCParameterAssert(data != NULL);
@ -391,7 +396,7 @@ static OOVOID_APIENTRY SolidEndCallback(void *polygonData)
}
static OOVOID_APIENTRY ErrorCallback(GLenum error, void *polygonData)
static void APIENTRY ErrorCallback(GLenum error, void *polygonData)
{
TessPolygonData *data = polygonData;
NSCParameterAssert(data != NULL);