Menu
▾
▴
[Epfl-cvs] tgengine AUTHORS,1.1,1.2 Changelog,1.1,1.2 d3map.cc,1.1,1.2 gldefs.h,1.6,1.7 texture.cc,1.12,1.13 tgglext.cc,1.3,1.4 tgglext.h,1.3,1.4 vshader.h,1.3,1.4
|
From: Seb <whi...@us...> - 2004-09-27 19:03:50
|
Update of /cvsroot/epfl/tgengine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17168 Modified Files: AUTHORS Changelog d3map.cc gldefs.h texture.cc tgglext.cc tgglext.h vshader.h Log Message: Compile sur OS X Index: AUTHORS =================================================================== RCS file: /cvsroot/epfl/tgengine/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AUTHORS 23 Jun 2004 21:30:35 -0000 1.1 --- AUTHORS 27 Sep 2004 19:03:37 -0000 1.2 *************** *** 1,2 **** --- 1,4 ---- Julien "silver" Rebetez : julien.rebetez *chez* epfl.ch + Mac OS X: Sebastien "Seb" Samyn: sebatien.samyn *chez* epfl.ch + Index: tgglext.cc =================================================================== RCS file: /cvsroot/epfl/tgengine/tgglext.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tgglext.cc 25 Sep 2004 11:40:21 -0000 1.3 --- tgglext.cc 27 Sep 2004 19:03:37 -0000 1.4 *************** *** 39,43 **** #define GETARBPOINTER(var,type,name) var = (type)SDL_GL_GetProcAddress(name); #endif ! void InitARBFunctions() --- 39,45 ---- #define GETARBPOINTER(var,type,name) var = (type)SDL_GL_GetProcAddress(name); #endif ! #ifdef TGOSX ! #define GETARBPOINTER(var,type,name) var = (type)SDL_GL_GetProcAddress(name); ! #endif void InitARBFunctions() Index: Changelog =================================================================== RCS file: /cvsroot/epfl/tgengine/Changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Changelog 11 Jul 2004 15:43:55 -0000 1.1 --- Changelog 27 Sep 2004 19:03:37 -0000 1.2 *************** *** 1,3 **** --- 1,8 ---- --------------- + 27 Sept. 2004 + --------------- + * Compile sur Mac OS X + + --------------- 23 juin 2004 --------------- Index: d3map.cc =================================================================== RCS file: /cvsroot/epfl/tgengine/d3map.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** d3map.cc 25 Sep 2004 11:40:21 -0000 1.1 --- d3map.cc 27 Sep 2004 19:03:37 -0000 1.2 *************** *** 18,22 **** } ! getline (&buffer, &size, fp); Log ("%s", buffer); --- 18,22 ---- } ! //getline (&buffer, &size, fp); Log ("%s", buffer); Index: gldefs.h =================================================================== RCS file: /cvsroot/epfl/tgengine/gldefs.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gldefs.h 25 Sep 2004 11:40:21 -0000 1.6 --- gldefs.h 27 Sep 2004 19:03:37 -0000 1.7 *************** *** 2,9 **** #define _TGGLDEFS_H #include <GL/gl.h> #include <GL/glu.h> - #include <SDL/SDL.h> #include <GL/glext.h> #define TG_CUBEMAP GL_TEXTURE1 --- 2,16 ---- #define _TGGLDEFS_H + #if defined (TGOSX) + #include <OpenGL/gl.h> + #include <OpenGL/glu.h> + #include <OpenGL/glext.h> + #else #include <GL/gl.h> #include <GL/glu.h> #include <GL/glext.h> + #endif + + #include <SDL.h> #define TG_CUBEMAP GL_TEXTURE1 Index: tgglext.h =================================================================== RCS file: /cvsroot/epfl/tgengine/tgglext.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tgglext.h 25 Sep 2004 11:40:21 -0000 1.3 --- tgglext.h 27 Sep 2004 19:03:37 -0000 1.4 *************** *** 4,13 **** #include "gldefs.h" //#define GL_GLEXT_PROTOTYPES - #include <GL/glext.h> //#undef GL_GLEXT_PROTOTYPES namespace tg { extern PFNGLACTIVETEXTUREPROC _glActiveTextureARB; extern PFNGLMULTITEXCOORD3FARBPROC _glMultiTexCoord3fARB; --- 4,46 ---- #include "gldefs.h" //#define GL_GLEXT_PROTOTYPES //#undef GL_GLEXT_PROTOTYPES + #ifndef APIENTRY + #define APIENTRY + #endif + namespace tg { + typedef void (APIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture); + typedef void (APIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); + + typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); + typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); + typedef void (APIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); + typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); + + typedef void (APIENTRY * PFNGLBINDBUFFERARBPROC)(GLenum target, GLuint buffer); + typedef void (APIENTRY * PFNGLDELETEBUFFERSARBPROC)(GLsizei n, const GLuint *buffers); + typedef void (APIENTRY * PFNGLGENBUFFERSARBPROC)(GLsizei n, GLuint *buffers); + typedef void (APIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, int size, const GLvoid *data, GLenum usage); + + typedef void (APIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); + typedef void (APIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); + typedef void (APIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string); + typedef void (APIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + + typedef void (APIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); + typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); + typedef void (APIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); + typedef void (APIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); + typedef void (APIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); + + typedef void (APIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); + typedef void (APIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); + typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); + typedef void (APIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); + typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + extern PFNGLACTIVETEXTUREPROC _glActiveTextureARB; extern PFNGLMULTITEXCOORD3FARBPROC _glMultiTexCoord3fARB; *************** *** 39,42 **** --- 72,80 ---- extern PFNGLPROGRAMPARAMETER4FNVPROC _glProgramParameter4fNV; + #define GL_VERTEX_PROGRAM_NV 0x8620 + #define GL_PROGRAM_ERROR_POSITION_NV 0x864B + #define GL_IDENTITY_NV 0x862A + #define GL_MODELVIEW_PROJECTION_NV 0x8629 + void InitARBFunctions (); Index: texture.cc =================================================================== RCS file: /cvsroot/epfl/tgengine/texture.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** texture.cc 25 Sep 2004 11:40:21 -0000 1.12 --- texture.cc 27 Sep 2004 19:03:37 -0000 1.13 *************** *** 2,10 **** #include <stdlib.h> //TODO: remove ! #include "GL/gl.h" ! #include "GL/glu.h" #include "engine.h" - namespace tg { --- 2,14 ---- #include <stdlib.h> //TODO: remove ! #if defined (TGOSX) ! #include <OpenGL/gl.h> ! #include <OpenGL/glu.h> ! #else ! #include <GL/gl.h> ! #include <GL/glu.h> ! #endif #include "engine.h" namespace tg { Index: vshader.h =================================================================== RCS file: /cvsroot/epfl/tgengine/vshader.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vshader.h 25 Sep 2004 11:40:21 -0000 1.3 --- vshader.h 27 Sep 2004 19:03:37 -0000 1.4 *************** *** 20,24 **** void SetParams(const float* value, ...); protected: ! GLhandleARB shader; }; --- 20,24 ---- void SetParams(const float* value, ...); protected: ! //GLhandleARB shader; }; |
