diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-02 12:37:17 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-02 12:37:17 +0000 |
| commit | 97b5f227669651bc71328296e95df386a31ddf7b (patch) | |
| tree | e3807571db7468ff3ac716fbad6cf74d974292d4 /Game/Code/lib/projectM | |
| parent | ff5d59edfcccefe52285091937d1a3337fb38694 (diff) | |
| download | usdx-97b5f227669651bc71328296e95df386a31ddf7b.tar.gz usdx-97b5f227669651bc71328296e95df386a31ddf7b.tar.xz usdx-97b5f227669651bc71328296e95df386a31ddf7b.zip | |
Replaced OpenGL12 with SDL's gl/glu/glext units because OpenGL12 was removed from SDL (several years ago? Last update was done in 2004). In addition OpenGL12 was very buggy (see last commit). The new units support OpenGL up to version 2.0 (extensions must be loaded first, see UGraphic.LoadOpenGLExtensions). At the moment, only 1.2 extensions are loaded. Some constants, that were introduced in OpenGL 1.2 and above (like GL_BGR or GL_CLAMP_TO_EDGE) are in glext.pas, so check this file first for missing constants.
The MacOS build depends on OpenGL12.pas but has its own file in the MacOSX/Wrapper folder instead of using the JEDI-SDL one. Sorry, that I broke MacOSX build for now but it should be no problem to get this working again.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1052 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/lib/projectM')
| -rw-r--r-- | Game/Code/lib/projectM/projectM-0_9.inc | 2 | ||||
| -rw-r--r-- | Game/Code/lib/projectM/projectM.pas | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Game/Code/lib/projectM/projectM-0_9.inc b/Game/Code/lib/projectM/projectM-0_9.inc index 612e92c7..24d83700 100644 --- a/Game/Code/lib/projectM/projectM-0_9.inc +++ b/Game/Code/lib/projectM/projectM-0_9.inc @@ -49,7 +49,7 @@ type {$endif} { Render target texture ID for non-pbuffer systems } - textureID: array[0..2] of TGLuint; + textureID: array[0..2] of GLuint; end; _PProjectM = ^_TProjectM; diff --git a/Game/Code/lib/projectM/projectM.pas b/Game/Code/lib/projectM/projectM.pas index 998b9b0c..0eec9638 100644 --- a/Game/Code/lib/projectM/projectM.pas +++ b/Game/Code/lib/projectM/projectM.pas @@ -12,7 +12,7 @@ interface uses SysUtils, - OpenGL12, + gl, UConfig; type |