a_dinosaur/Lesson10-SDL3
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/Lesson10-SDL3.git synced 2025-02-21 07:19:26 +11:00
Code Issues Packages Projects Releases Wiki Activity

drop glu dependency

Browse Source
This commit is contained in:
a dinosaur
2024-03-11 03:57:43 +11:00
parent 21c51ee0a3
commit 5061d1714d
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -8,7 +8,7 @@ add_executable(Lesson10 Lesson10.cpp)
set_target_properties(Lesson10 PROPERTIES set_target_properties(Lesson10 PROPERTIES
CXX_STANDARD 98 CXX_STANDARD 98
WIN32_EXECUTABLE ON) WIN32_EXECUTABLE ON)
target_link_libraries(Lesson10 SDL3::SDL3 OpenGL::GL OpenGL::GLU) target_link_libraries(Lesson10 SDL3::SDL3 OpenGL::GL)
target_compile_options(Lesson10 PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -pedantic>) target_compile_options(Lesson10 PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -pedantic>)
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")

32
Lesson10.cpp
View File

@@ -9,14 +9,10 @@
#include <math.h> // Math Library Header File #include <math.h> // Math Library Header File
#include <stdio.h> // Header File For Standard Input/Output #include <stdio.h> // Header File For Standard Input/Output
#include <stdlib.h> #include <stdlib.h>
#include <SDL.h> #include <SDL3/SDL.h>
#include <SDL_main.h> #include <SDL3/SDL_main.h>
#include <SDL_opengl.h> // Header File For The OpenGL32 Library #define GL_GLEXT_PROTOTYPES
#ifdef __APPLE__ #include <SDL3/SDL_opengl.h> // Header File For The OpenGL32 Library
#include <OpenGL/glu.h> // Header File For The GLu32 Library
#else
#include <GL/glu.h> // Header File For The GLu32 Library
#endif
SDL_Window* hWnd=NULL; // Holds Our Window Handle SDL_Window* hWnd=NULL; // Holds Our Window Handle
SDL_GLContext hRC=NULL; // Permanent Rendering Context SDL_GLContext hRC=NULL; // Permanent Rendering Context
@@ -171,13 +167,31 @@ int LoadGLTextures() // Load Bitmaps And Conv
glBindTexture(GL_TEXTURE_2D, texture[2]); glBindTexture(GL_TEXTURE_2D, texture[2]);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
gluBuild2DMipmaps(GL_TEXTURE_2D, 3, TextureImage->w, TextureImage->h, GL_BGR, GL_UNSIGNED_BYTE, TextureImage->pixels); glTexImage2D(GL_TEXTURE_2D, 0, 3, TextureImage->w, TextureImage->h, 0, GL_BGR, GL_UNSIGNED_BYTE, TextureImage->pixels);
glGenerateMipmap(GL_TEXTURE_2D);
} }
SDL_DestroySurface(TextureImage); // Free The Image Structure SDL_DestroySurface(TextureImage); // Free The Image Structure
return Status; // Return The Status return Status; // Return The Status
} }
static void gluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar)
{
double h = 1.0 / tan(fovy * (M_PI / 180.0) * 0.5);
double w = h / aspect;
double invcliprng = 1.0 / (zFar - zNear);
double z = -(zFar + zNear) * invcliprng;
double z2 = -(2.0 * zFar * zNear) * invcliprng;
double mtx[16] =
{
w, 0.0, 0.0, 0.0,
0.0, h, 0.0, 0.0,
0.0, 0.0, z, -1.0,
0.0, 0.0, z2, 0.0
};
glLoadMatrixd(mtx);
}
GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window
{ {
if (height==0) // Prevent A Divide By Zero By if (height==0) // Prevent A Divide By Zero By