v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick fix to make the SimpleOpenGL sample compile with MinGW. 

This commit is cluttered with whitespace fixes, sorry for that.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@839 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
klickverbot 2010-11-10 19:34:40 +00:00
parent c4b8389d6e
commit 7e5e2d7ea1
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View File

@ -56,9 +56,9 @@ GLfloat zrot;
LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc
GLboolean abortGLInit(char*); GLboolean abortGLInit(const char*);
char* windowTitle = "OpenGL Framework"; const char* windowTitle = "OpenGL Framework";
GLfloat LightAmbient[]= { 0.5f, 0.5f, 0.5f, 1.0f }; GLfloat LightAmbient[]= { 0.5f, 0.5f, 0.5f, 1.0f };
GLfloat LightDiffuse[]= { 1.0f, 1.0f, 1.0f, 1.0f }; GLfloat LightDiffuse[]= { 1.0f, 1.0f, 1.0f, 1.0f };
@ -145,7 +145,7 @@ bool Import3DFromFile( const std::string& pFile)
} }
GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window void 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
{ {
@ -276,7 +276,7 @@ int LoadGLTextures(const aiScene* scene)
int InitGL(GLvoid) // All Setup For OpenGL goes here int InitGL() // All Setup For OpenGL goes here
{ {
if (!LoadGLTextures(scene)) if (!LoadGLTextures(scene))
{ {
@ -500,7 +500,7 @@ void drawAiScene(const aiScene* scene)
} }
int DrawGLScene(GLvoid) //Here's where we do all the drawing int DrawGLScene() //Here's where we do all the drawing
{ {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear The Screen And The Depth Buffer glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear The Screen And The Depth Buffer
glLoadIdentity(); // Reset MV Matrix glLoadIdentity(); // Reset MV Matrix
@ -524,7 +524,7 @@ int DrawGLScene(GLvoid) //Here's where we do all the drawing
} }
GLvoid KillGLWindow(GLvoid) // Properly Kill The Window void KillGLWindow() // Properly Kill The Window
{ {
if (fullscreen) // Are We In Fullscreen Mode? if (fullscreen) // Are We In Fullscreen Mode?
{ {
@ -565,14 +565,14 @@ GLvoid KillGLWindow(GLvoid) // Properly Kill The Window
} }
} }
GLboolean abortGLInit(char* abortMessage) GLboolean abortGLInit(const char* abortMessage)
{ {
KillGLWindow(); // Reset Display KillGLWindow(); // Reset Display
MessageBox(NULL, abortMessage, "ERROR", MB_OK|MB_ICONEXCLAMATION); MessageBox(NULL, abortMessage, "ERROR", MB_OK|MB_ICONEXCLAMATION);
return FALSE; // quit and return False return FALSE; // quit and return False
} }
BOOL CreateGLWindow(char* title, int width, int height, int bits, bool fullscreenflag) BOOL CreateGLWindow(const char* title, int width, int height, int bits, bool fullscreenflag)
{ {
GLuint PixelFormat; // Hold the result after searching for a match GLuint PixelFormat; // Hold the result after searching for a match
WNDCLASS wc; // Window Class Structure WNDCLASS wc; // Window Class Structure
@ -798,10 +798,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, // Handles for this Window
} }
int WINAPI WinMain( __in HINSTANCE hInstance, // Instance int WINAPI WinMain( HINSTANCE hInstance, // Instance
__in_opt HINSTANCE hPrevInstance, // Previous Instance HINSTANCE hPrevInstance, // Previous Instance
__in_opt LPSTR lpCmdLine, // Command Line Parameters LPSTR lpCmdLine, // Command Line Parameters
__in int nShowCmd ) // Window Show State int nShowCmd ) // Window Show State
{ {
MSG msg; // Windows Message Structure MSG msg; // Windows Message Structure
BOOL done=FALSE; // Bool Variable To Exit Loop BOOL done=FALSE; // Bool Variable To Exit Loop