Changeset 677 for Daodan/src/daodan_gl.c

Timestamp:

Mar 3, 2013, 12:46:33 AM (12 years ago)

Author:

alloc

Message:

Daodan: Updated src to work with MinGW

File:

• Daodan/src/daodan_gl.c (modified) (8 diffs)

Daodan/src/daodan_gl.c

@@ -5 +5 @@
 #include "Oni_Persistence.h"
 #include "Daodan_Utility.h"
-
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include "Daodan_Win32.h"
 #include "BFW_Utility.h"
 
@@ -45 +47 @@
         { 1920, 1440, 0, 0 },
 };
-
-short daodan_resdepths[] = { 16, 32 };
-
+//Just going to always use 32 bits for now...
+//short daodan_resdepths[] = { 16, 32 };
+short daodan_resdepths[] = { 32 };
 DEVMODE orig_devmode, cur_devmode, new_devmode;
 
@@ -83 +85 @@
 {
         unsigned int vmodes = 0;
-        unsigned int screen_x = orig_devmode.dmPelsWidth;
-        unsigned int screen_y = orig_devmode.dmPelsHeight;
-        
-        int i, j;
+        unsigned int screen_x = GetSystemMetrics(SM_CXSCREEN);
+        unsigned int screen_y = GetSystemMetrics(SM_CYSCREEN);
+        
+        uint16_t i, j;
         
         DDrStartupMessage("listing display modes");
-        
+        /*
         if (!M3gResolutionSwitch)
                 daodan_resdepths[0] = orig_devmode.dmBitsPerPel;
-        
+        */
         for (i = 0; i < builtin_depths; i ++)
         {
@@ -179 +181 @@
                 
                 update_cdmode();
-                gl->DisplayMode.Width = cur_devmode.dmPelsWidth;
-                gl->DisplayMode.Height = cur_devmode.dmPelsHeight;
+                gl_eng->DisplayMode.Width = cur_devmode.dmPelsWidth;
+                gl_eng->DisplayMode.Height = cur_devmode.dmPelsHeight;
                 if (cur_devmode.dmBitsPerPel > depth)
-                        gl->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
+                        gl_eng->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
         }
         else
@@ -188 +190 @@
                 update_cdmode();
                 if (cur_devmode.dmBitsPerPel > depth)
-                        gl->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
+                        gl_eng->DisplayMode.Depth = cur_devmode.dmBitsPerPel;
         }
         return 1;
 }
-
-void daodan_set_gamma(float gamma)
-{
-        WORD ramp[3][256];
-        int i;
-
-        if (!gl_gamma_ramp_valid)
-                return;
-
-        gamma = (1.0f - gamma) * 1.2f + 0.4f;
-
-        for (i = 0; i < 256; i++) 
-        {
-                int value = (int)(pow(gl_gamma_ramp[i] / 65535.0f, gamma) * 65535.0f);
-
-                if (value < 0)
-                        value = 0;
-                else if (value > 65535)
-                        value = 65535;
-
-                ramp[0][i] = ramp[1][i] = ramp[2][i] = value;
-        }
-        
-        if (gl_api->wglSetDeviceGammaRamp3DFX)
-                gl_api->wglSetDeviceGammaRamp3DFX(gl->HDC, ramp);
-        else
-                SetDeviceGammaRamp(gl->HDC, ramp);
-}
-
 int ONICALL daodangl_platform_initialize()
 {
         static M3tDisplayMode lastmode = {0, 0, 0, 0};
         
-        if (lastmode.Width != gl->DisplayMode.Width || lastmode.Height != gl->DisplayMode.Height || lastmode.Depth != gl->DisplayMode.Depth)
-                if (!daodan_set_display_mode(gl->DisplayMode.Width, gl->DisplayMode.Height, gl->DisplayMode.Depth))
-                        if (gl->DisplayMode.Width != 640 || gl->DisplayMode.Height != 480 || gl->DisplayMode.Depth != 16)
+        if (lastmode.Width != gl_eng->DisplayMode.Width || lastmode.Height != gl_eng->DisplayMode.Height || lastmode.Depth != gl_eng->DisplayMode.Depth)
+                if (!daodan_set_display_mode(gl_eng->DisplayMode.Width, gl_eng->DisplayMode.Height, gl_eng->DisplayMode.Depth))
+                        if (gl_eng->DisplayMode.Width != 640 || gl_eng->DisplayMode.Height != 480 || gl_eng->DisplayMode.Depth != 16)
                         {
-                                gl->DisplayMode.Width = 640;
-                                gl->DisplayMode.Height = 480;
+                                gl_eng->DisplayMode.Width = 640;
+                                gl_eng->DisplayMode.Height = 480;
                                 if (!daodan_set_display_mode(640, 480, 16))
                                         goto exit_err;
                         }
 
-        if (lastmode.Width != gl->DisplayMode.Width || lastmode.Height != gl->DisplayMode.Height)
+        if (lastmode.Width != gl_eng->DisplayMode.Width || lastmode.Height != gl_eng->DisplayMode.Height)
         {
                 RECT Rect;
-                Rect.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (gl->DisplayMode.Width / 2);
-                Rect.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (gl->DisplayMode.Height / 2);
-                Rect.right = Rect.left + gl->DisplayMode.Width;
-                Rect.bottom = Rect.top + gl->DisplayMode.Height;
+                Rect.left = (GetSystemMetrics(SM_CXSCREEN) / 2) - (gl_eng->DisplayMode.Width / 2);
+                Rect.top = (GetSystemMetrics(SM_CYSCREEN) / 2) - (gl_eng->DisplayMode.Height / 2);
+                Rect.right = Rect.left + gl_eng->DisplayMode.Width;
+                Rect.bottom = Rect.top + gl_eng->DisplayMode.Height;
                 AdjustWindowRect(&Rect, WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_CAPTION |WS_TILEDWINDOW , FALSE);
                 
@@ -247 +220 @@
         }
 
-        if (gl->HDC == NULL)
-                if ((gl->HDC = GetDC(ONgPlatformData.Window)) == NULL)
+        if (gl_eng->HDC == NULL)
+                if ((gl_eng->HDC = GetDC(ONgPlatformData.Window)) == NULL)
                         goto exit_err;
         
@@ -255 +228 @@
                 DDrStartupMessage("Using 3DFX gamma adjustment");
 
-                if (gl_api->wglGetDeviceGammaRamp3DFX(gl->HDC, gl_gamma_ramp))
+                if (gl_api->wglGetDeviceGammaRamp3DFX(gl_eng->HDC, gl_gamma_ramp))
                         gl_gamma_ramp_valid = 1;
         }
@@ -262 +235 @@
                 DDrStartupMessage("Using standard Windows gamma adjustment");
 
-                if (GetDeviceGammaRamp(gl->HDC, gl_gamma_ramp))
+                if (GetDeviceGammaRamp(gl_eng->HDC, gl_gamma_ramp))
                         gl_gamma_ramp_valid = 1;
         }
-        
+        /*
         if (gl_gamma_ramp_valid)
                 daodan_set_gamma(ONrPersist_GetGamma());  
-        else
+        else*/
                 DDrStartupMessage("gamma adjustment not supported");
         
-        if (!gl_platform_set_pixel_format(gl->HDC))
-                if (gl->DisplayMode.Depth != 16)
+        if (!gl_platform_set_pixel_format(gl_eng->HDC))
+                if (gl_eng->DisplayMode.Depth != 16)
                 {
-                        if (!daodan_set_display_mode(gl->DisplayMode.Width, gl->DisplayMode.Height, 16))
+                        if (!daodan_set_display_mode(gl_eng->DisplayMode.Width, gl_eng->DisplayMode.Height, 16))
                                 goto exit_err;
                         
-                        if (!gl_platform_set_pixel_format(gl->HDC))
+                        if (!gl_platform_set_pixel_format(gl_eng->HDC))
                                 goto exit_err;
                 }
 
-        lastmode.Width = gl->DisplayMode.Width;
-        lastmode.Height = gl->DisplayMode.Height;
-        lastmode.Depth = gl->DisplayMode.Depth;
+        lastmode.Width = gl_eng->DisplayMode.Width;
+        lastmode.Height = gl_eng->DisplayMode.Height;
+        lastmode.Depth = gl_eng->DisplayMode.Depth;
         return 1;